Skip to content

Commit 3bc0601

Browse files
greenrobotgreenrobot
committed
1.7.0
1 parent 607cb54 commit 3bc0601

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1020
-299
lines changed

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ let package = Package(
1515
targets: [
1616
.binaryTarget(
1717
name: "ObjectBox",
18-
url: "https://github.com/objectbox/objectbox-swift/releases/download/v1.6.0/ObjectBox-xcframework-spm-1.6.0.zip",
19-
checksum: "fef591635817fed6cd695314c0eb6fa43a8feec13da2c998034f7f6d88fe9e17"
18+
url: "https://github.com/objectbox/objectbox-swift/releases/download/v1.7.0/ObjectBox-xcframework-1.7.0.zip",
19+
checksum: "fb842c0ccd86a81b0640bc2dc1eee39d36528fcfc8e0af51396a45e4af7db004"
2020
)
2121
]
2222
)

‎Source/fetch_dependencies.command‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if [ -d "$code_dir" ] && [ "$staging_repo" != "true" ]; then # Do we have an exi
3838
echo "Xcode version: $xcode_version"
3939

4040
pushd "$code_dir" # note: this also "fixed" building into cbuild dir in "our" objectbox-swift dir
41-
build_params="--skip-apple-silicon" # must also part of the cache key
41+
build_params="" # must also part of the cache key
4242
commit_id=$(git rev-parse HEAD)
4343
cache_dir="$HOME/Library/Caches/ObjectBox"
4444
mkdir -p "${cache_dir}"

‎Source/ios-framework/CodeGenTests/ToolTestProject25.swift‎

Lines changed: 53 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
//
2-
// main.swift
3-
// ToolTestProject
4-
//
5-
// Created by Uli Kusterer on 13.12.18.
6-
// Copyright © 2018 Uli Kusterer. All rights reserved.
2+
// Copyright © 2018-2022 ObjectBox. All rights reserved.
73
//
84

95
import ObjectBox
@@ -13,9 +9,9 @@ enum Error: Swift.Error {
139
case NoIdAssignedToNewlyWrittenEntity
1410
case ValueReadDoesntEqualValueWritten(property: String, written: Any, read: Any)
1511
case FailedToReadEntity
12+
case runtimeError(String)
1613
}
1714

18-
1915
class TypeTest: Entity {
2016
var id: EntityId<TypeTest> = 0
2117

@@ -43,6 +39,32 @@ class TypeTest: Entity {
4339
required init() {}
4440
}
4541

42+
class AnnotatedType: Entity {
43+
var id: Id = 0
44+
45+
/// objectbox: type = "flex"
46+
var flexData: Data = Data(count: 4)
47+
48+
/// objectbox: type = "flex"
49+
var flexDataNullable: Data? = nil
50+
51+
/// objectbox: flex
52+
var flexByteArray: [UInt8] = [0,0,0,0]
53+
54+
/// objectbox: type = "date-nano"
55+
var dateValue: Date = Date(timeIntervalSinceReferenceDate: 666.66666666666666666)
56+
57+
/// objectbox: date-nano
58+
var dateNullable: Date? = nil
59+
60+
/// objectbox: date-nano
61+
// TODO Additionally needs ID adjustments: /// objectbox: id-companion
62+
var dateIdCompanion: Date = Date()
63+
64+
required init() {
65+
}
66+
}
67+
4668
func main(_ args: [String]) throws -> Int32 {
4769
let originalTypeTest = TypeTest()
4870

@@ -122,5 +144,30 @@ func main(_ args: [String]) throws -> Int32 {
122144
throw Error.FailedToReadEntity
123145
}
124146

147+
try testAnnotated(store: store)
148+
125149
return 0
126150
}
151+
152+
func testAnnotated(store: Store) throws {
153+
let box = store.box(for: AnnotatedType.self)
154+
let original = AnnotatedType()
155+
let id = try box.put(original)
156+
if (id == 0) { throw Error.runtimeError("ID") }
157+
158+
guard let read = try box.get(id) else { throw Error.runtimeError("get") }
159+
160+
if (abs(original.dateValue.timeIntervalSince(read.dateValue)) > 0.00001) {
161+
throw Error.ValueReadDoesntEqualValueWritten(property: "dateValue", written: original.dateValue, read: read.dateValue)
162+
} else if (abs(original.dateIdCompanion.timeIntervalSince(read.dateIdCompanion)) > 0.00001) {
163+
throw Error.ValueReadDoesntEqualValueWritten(property: "dateIdCompanion", written: original.dateValue, read: read.dateValue)
164+
} else if (original.dateNullable != read.dateNullable) {
165+
throw Error.runtimeError("dateNullable")
166+
} else if (original.flexData != read.flexData) {
167+
throw Error.runtimeError("flexData")
168+
} else if (original.flexDataNullable != read.flexDataNullable) {
169+
throw Error.runtimeError("flexDataNullable")
170+
} else if (original.flexByteArray != read.flexByteArray) {
171+
throw Error.runtimeError("flexByteArray")
172+
}
173+
}

‎Source/ios-framework/CodeGenTests/ToolTestProject30.swift‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
//
2-
// main.swift
3-
// ToolTestProject
4-
//
5-
// Created by Uli Kusterer on 07.12.18.
6-
// Copyright © 2018 Uli Kusterer. All rights reserved.
2+
// Copyright © 2018-2022 ObjectBox. All rights reserved.
73
//
84

95
import Foundation
@@ -15,7 +11,10 @@ class Building: Entity, CustomDebugStringConvertible {
1511
// objectbox: unique
1612
var buildingName: String = ""
1713
var buildingNumber: Int = 0
18-
14+
15+
// objectbox: unique = { "onConflict": "replace" }
16+
var stringId: String = ""
17+
1918
required init() {}
2019

2120
public var debugDescription: String {

‎Source/ios-framework/CodeGenTests/expected/entity-info/EntityInfo.generated1.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ extension BusRoute: ObjectBox.EntityInspectable {
2727

2828
fileprivate static func buildEntity(modelBuilder: ObjectBox.ModelBuilder) throws {
2929
let entityBuilder = try modelBuilder.entityBuilder(for: BusRoute.self, id: 1, uid: 5107964062888457216)
30-
try entityBuilder.addProperty(name: "id", type: EntityId<BusRoute>.entityPropertyType, flags: [.id], id: 1, uid: 7895576389419683840)
31-
try entityBuilder.addProperty(name: "lineName", type: String.entityPropertyType, id: 2, uid: 6687926154759915520)
30+
try entityBuilder.addProperty(name: "id", type: PropertyType.long, flags: [.id], id: 1, uid: 7895576389419683840)
31+
try entityBuilder.addProperty(name: "lineName", type: PropertyType.string, id: 2, uid: 6687926154759915520)
3232

3333
try entityBuilder.lastProperty(id: 2, uid: 6687926154759915520)
3434
}

‎Source/ios-framework/CodeGenTests/expected/entity-info/EntityInfo.generated12.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension BusRoute: ObjectBox.EntityInspectable {
2626

2727
fileprivate static func buildEntity(modelBuilder: ObjectBox.ModelBuilder) throws {
2828
let entityBuilder = try modelBuilder.entityBuilder(for: BusRoute.self, id: 1, uid: 5107964062888457216)
29-
try entityBuilder.addProperty(name: "id", type: EntityId<BusRoute>.entityPropertyType, flags: [.id], id: 1, uid: 7895576389419683840)
29+
try entityBuilder.addProperty(name: "id", type: PropertyType.long, flags: [.id], id: 1, uid: 7895576389419683840)
3030

3131
try entityBuilder.lastProperty(id: 2, uid: 6687926154759915520)
3232
}

‎Source/ios-framework/CodeGenTests/expected/entity-info/EntityInfo.generated13.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extension BusRoute: ObjectBox.EntityInspectable {
2626

2727
fileprivate static func buildEntity(modelBuilder: ObjectBox.ModelBuilder) throws {
2828
let entityBuilder = try modelBuilder.entityBuilder(for: BusRoute.self, id: 1, uid: 5107964062888457216)
29-
try entityBuilder.addProperty(name: "id", type: EntityId<BusRoute>.entityPropertyType, flags: [.id], id: 1, uid: 7895576389419683840)
30-
try entityBuilder.addProperty(name: "newProperty", type: String.entityPropertyType, id: 3, uid: 14592)
29+
try entityBuilder.addProperty(name: "id", type: PropertyType.long, flags: [.id], id: 1, uid: 7895576389419683840)
30+
try entityBuilder.addProperty(name: "newProperty", type: PropertyType.string, id: 3, uid: 14592)
3131

3232
try entityBuilder.lastProperty(id: 3, uid: 14592)
3333
}

‎Source/ios-framework/CodeGenTests/expected/entity-info/EntityInfo.generated14.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extension BusRoute: ObjectBox.EntityInspectable {
2626

2727
fileprivate static func buildEntity(modelBuilder: ObjectBox.ModelBuilder) throws {
2828
let entityBuilder = try modelBuilder.entityBuilder(for: BusRoute.self, id: 1, uid: 5107964062888457216)
29-
try entityBuilder.addProperty(name: "id", type: EntityId<BusRoute>.entityPropertyType, flags: [.id], id: 1, uid: 7895576389419683840)
30-
try entityBuilder.addProperty(name: "newProperty", type: String.entityPropertyType, id: 3, uid: 14592)
29+
try entityBuilder.addProperty(name: "id", type: PropertyType.long, flags: [.id], id: 1, uid: 7895576389419683840)
30+
try entityBuilder.addProperty(name: "newProperty", type: PropertyType.string, id: 3, uid: 14592)
3131

3232
try entityBuilder.lastProperty(id: 3, uid: 14592)
3333
}

‎Source/ios-framework/CodeGenTests/expected/entity-info/EntityInfo.generated15.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ extension BusRoute: ObjectBox.EntityInspectable {
2626

2727
fileprivate static func buildEntity(modelBuilder: ObjectBox.ModelBuilder) throws {
2828
let entityBuilder = try modelBuilder.entityBuilder(for: BusRoute.self, id: 1, uid: 17664)
29-
try entityBuilder.addProperty(name: "id", type: EntityId<BusRoute>.entityPropertyType, flags: [.id], id: 1, uid: 14592)
30-
try entityBuilder.addProperty(name: "lineName", type: String.entityPropertyType, id: 2, uid: 16640)
29+
try entityBuilder.addProperty(name: "id", type: PropertyType.long, flags: [.id], id: 1, uid: 14592)
30+
try entityBuilder.addProperty(name: "lineName", type: PropertyType.string, id: 2, uid: 16640)
3131

3232
try entityBuilder.lastProperty(id: 2, uid: 16640)
3333
}

‎Source/ios-framework/CodeGenTests/expected/entity-info/EntityInfo.generated16.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ extension BusRoute: ObjectBox.EntityInspectable {
2626

2727
fileprivate static func buildEntity(modelBuilder: ObjectBox.ModelBuilder) throws {
2828
let entityBuilder = try modelBuilder.entityBuilder(for: BusRoute.self, id: 1, uid: 17664)
29-
try entityBuilder.addProperty(name: "id", type: EntityId<BusRoute>.entityPropertyType, flags: [.id], id: 1, uid: 14592)
30-
try entityBuilder.addProperty(name: "lineName", type: String.entityPropertyType, id: 2, uid: 16640)
31-
try entityBuilder.addProperty(name: "destinationName", type: String.entityPropertyType, flags: [.indexHash, .indexed], id: 3, uid: 15616, indexId: 2, indexUid: 18688)
29+
try entityBuilder.addProperty(name: "id", type: PropertyType.long, flags: [.id], id: 1, uid: 14592)
30+
try entityBuilder.addProperty(name: "lineName", type: PropertyType.string, id: 2, uid: 16640)
31+
try entityBuilder.addProperty(name: "destinationName", type: PropertyType.string, flags: [.indexHash, .indexed], id: 3, uid: 15616, indexId: 2, indexUid: 18688)
3232

3333
try entityBuilder.lastProperty(id: 3, uid: 15616)
3434
}

0 commit comments

Comments
 (0)