Skip to content

Commit 06a6e89

Browse files
committed
1.8.0
1 parent 8c5724c commit 06a6e89

File tree

20 files changed

+913
-153
lines changed

20 files changed

+913
-153
lines changed

Source/Gemfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ruby "~> 2.3"
1+
ruby "~> 3.0"
22

33
source "https://rubygems.org"
44

5-
gem "jazzy", "~> 0.12"
6-
gem "cocoapods", "~> 1.8"
5+
gem "jazzy", "~> 0.14"
6+
gem "cocoapods", "~> 1.11"

Source/Gemfile.lock

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,123 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.2)
5-
activesupport (4.2.11.3)
6-
i18n (~> 0.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
9-
tzinfo (~> 1.1)
10-
algoliasearch (1.27.3)
4+
CFPropertyList (3.0.5)
5+
rexml
6+
activesupport (6.1.7)
7+
concurrent-ruby (~> 1.0, >= 1.0.2)
8+
i18n (>= 1.6, < 2)
9+
minitest (>= 5.1)
10+
tzinfo (~> 2.0)
11+
zeitwerk (~> 2.3)
12+
addressable (2.8.1)
13+
public_suffix (>= 2.0.2, < 6.0)
14+
algoliasearch (1.27.5)
1115
httpclient (~> 2.8, >= 2.8.3)
1216
json (>= 1.5.1)
1317
atomos (0.1.3)
14-
claide (1.0.3)
15-
cocoapods (1.9.3)
16-
activesupport (>= 4.0.2, < 5)
18+
claide (1.1.0)
19+
cocoapods (1.11.3)
20+
addressable (~> 2.8)
1721
claide (>= 1.0.2, < 2.0)
18-
cocoapods-core (= 1.9.3)
22+
cocoapods-core (= 1.11.3)
1923
cocoapods-deintegrate (>= 1.0.3, < 2.0)
20-
cocoapods-downloader (>= 1.2.2, < 2.0)
24+
cocoapods-downloader (>= 1.4.0, < 2.0)
2125
cocoapods-plugins (>= 1.0.0, < 2.0)
2226
cocoapods-search (>= 1.0.0, < 2.0)
23-
cocoapods-stats (>= 1.0.0, < 2.0)
2427
cocoapods-trunk (>= 1.4.0, < 2.0)
2528
cocoapods-try (>= 1.1.0, < 2.0)
2629
colored2 (~> 3.1)
2730
escape (~> 0.0.4)
2831
fourflusher (>= 2.3.0, < 3.0)
2932
gh_inspector (~> 1.0)
30-
molinillo (~> 0.6.6)
33+
molinillo (~> 0.8.0)
3134
nap (~> 1.0)
32-
ruby-macho (~> 1.4)
33-
xcodeproj (>= 1.14.0, < 2.0)
34-
cocoapods-core (1.9.3)
35-
activesupport (>= 4.0.2, < 6)
35+
ruby-macho (>= 1.0, < 3.0)
36+
xcodeproj (>= 1.21.0, < 2.0)
37+
cocoapods-core (1.11.3)
38+
activesupport (>= 5.0, < 7)
39+
addressable (~> 2.8)
3640
algoliasearch (~> 1.0)
3741
concurrent-ruby (~> 1.1)
3842
fuzzy_match (~> 2.0.4)
3943
nap (~> 1.0)
4044
netrc (~> 0.11)
45+
public_suffix (~> 4.0)
4146
typhoeus (~> 1.0)
42-
cocoapods-deintegrate (1.0.4)
43-
cocoapods-downloader (1.4.0)
47+
cocoapods-deintegrate (1.0.5)
48+
cocoapods-downloader (1.6.3)
4449
cocoapods-plugins (1.0.0)
4550
nap
46-
cocoapods-search (1.0.0)
47-
cocoapods-stats (1.1.0)
48-
cocoapods-trunk (1.5.0)
51+
cocoapods-search (1.0.1)
52+
cocoapods-trunk (1.6.0)
4953
nap (>= 0.8, < 2.0)
5054
netrc (~> 0.11)
5155
cocoapods-try (1.2.0)
5256
colored2 (3.1.2)
53-
concurrent-ruby (1.1.7)
57+
concurrent-ruby (1.1.10)
5458
escape (0.0.4)
55-
ethon (0.12.0)
56-
ffi (>= 1.3.0)
57-
ffi (1.13.1)
59+
ethon (0.16.0)
60+
ffi (>= 1.15.0)
61+
ffi (1.15.5)
5862
fourflusher (2.3.1)
5963
fuzzy_match (2.0.4)
6064
gh_inspector (1.1.3)
6165
httpclient (2.8.3)
62-
i18n (0.9.5)
66+
i18n (1.12.0)
6367
concurrent-ruby (~> 1.0)
64-
jazzy (0.13.5)
68+
jazzy (0.14.3)
6569
cocoapods (~> 1.5)
6670
mustache (~> 1.1)
67-
open4
71+
open4 (~> 1.3)
6872
redcarpet (~> 3.4)
73+
rexml (~> 3.2)
6974
rouge (>= 2.0.6, < 4.0)
7075
sassc (~> 2.1)
7176
sqlite3 (~> 1.3)
7277
xcinvoke (~> 0.3.0)
73-
json (2.3.1)
78+
json (2.6.3)
7479
liferaft (0.0.6)
75-
minitest (5.14.2)
76-
molinillo (0.6.6)
80+
mini_portile2 (2.8.0)
81+
minitest (5.16.3)
82+
molinillo (0.8.0)
7783
mustache (1.1.1)
7884
nanaimo (0.3.0)
7985
nap (1.1.0)
8086
netrc (0.11.0)
8187
open4 (1.3.4)
82-
redcarpet (3.5.0)
83-
rouge (3.22.0)
84-
ruby-macho (1.4.0)
88+
public_suffix (4.0.7)
89+
redcarpet (3.5.1)
90+
rexml (3.2.5)
91+
rouge (3.30.0)
92+
ruby-macho (2.5.1)
8593
sassc (2.4.0)
8694
ffi (~> 1.9)
87-
sqlite3 (1.4.2)
88-
thread_safe (0.3.6)
95+
sqlite3 (1.5.4)
96+
mini_portile2 (~> 2.8.0)
8997
typhoeus (1.4.0)
9098
ethon (>= 0.9.0)
91-
tzinfo (1.2.7)
92-
thread_safe (~> 0.1)
99+
tzinfo (2.0.5)
100+
concurrent-ruby (~> 1.0)
93101
xcinvoke (0.3.0)
94102
liferaft (~> 0.0.6)
95-
xcodeproj (1.18.0)
103+
xcodeproj (1.22.0)
96104
CFPropertyList (>= 2.3.3, < 4.0)
97105
atomos (~> 0.1.3)
98106
claide (>= 1.0.2, < 2.0)
99107
colored2 (~> 3.1)
100108
nanaimo (~> 0.3.0)
109+
rexml (~> 3.2.4)
110+
zeitwerk (2.6.6)
101111

102112
PLATFORMS
103113
ruby
104114

105115
DEPENDENCIES
106-
cocoapods (~> 1.8)
107-
jazzy (~> 0.12)
116+
cocoapods (~> 1.11)
117+
jazzy (~> 0.14)
108118

109119
RUBY VERSION
110-
ruby 2.3.7p456
120+
ruby 3.0.3p157
111121

112122
BUNDLED WITH
113-
2.1.4
123+
2.2.32

Source/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ Repository Contents
1919
- `ios-framework/Makefile`: combines `fetch_dependencies.command` and a Carthage build to create the Swift framework.
2020
- `.gitlab-ci.yml` calls make targets of `ios-framework/Makefile`
2121
- `create-xcframework.sh`: builds the multi-platform archive containing binaries for multiple platforms and architectures.
22+
- `ios-framework/cocoapod/make-release.command`: prepares a Cocoapods deployment.
23+
- Builds ObjectBox Generator (based on Sourcery)
24+
- Builds the Swift framework using `ios-framework/Makefile`
25+
- Creates deployable zips
26+
- Creates ObjectBox.podspec & Package.swift
27+
- Optionally pushes the pod to the Cocoapods repo (staging or trunk)
2228

2329
Tests
2430
-----
@@ -59,6 +65,7 @@ You need to have [jazzy](https://github.com/realm/jazzy) installed to generate d
5965

6066
Distributing the Framework
6167
--------------------------
68+
See also the [how-to release document](docs/how-to-release-objectbox-swift.md).
6269

6370
Distribution of the framework as closed source works across these channels:
6471

Source/ios-framework/.swiftlint-macOS.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ identifier_name:
1818
type_name:
1919
excluded:
2020
- Id
21+
- __EntityRelatable # TODO check this one; can we remove it altogether?

Source/ios-framework/CommonSource/Box.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ where E == E.EntityBindingType.EntityType {
3030

3131
internal init(store: Store) {
3232
self.store = store
33-
self.cBox = obx_box(store.cStore, EntityType.entityInfo.entitySchemaId)
33+
cBox = obx_box(store.cStore, EntityType.entityInfo.entitySchemaId)
3434
}
3535

3636
// MARK: Box Introspection
@@ -489,7 +489,7 @@ extension Box {
489489
if self.store.supportsLargeArrays {
490490
return try store.runInReadOnlyTransaction {
491491
guard let bytesArray = obx_box_get_all(cBox) else {
492-
try checkLastError(); // should always throw
492+
try checkLastError() // should always throw
493493
return ContiguousArray<EntityType>()
494494
}
495495
defer {

Source/ios-framework/CommonSource/Internal/InstanceVisitor.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ import Foundation
2121
/// Helper base class to allow us to pass a generic type through a C function callback.
2222
/// Can't be a subtype of Box or Query as that would make it generic again.
2323
internal class InstanceVisitorBase {
24-
var userError: Swift.Error? ///< Set by subclasses in visit() if an error occurs that needs to be thrown.
25-
24+
/// Set by subclasses in visit() if an error occurs that needs to be thrown.
25+
var userError: Swift.Error?
26+
2627
/// Called by for(_:, in:) and forEach to request creation of the given entity from raw data and to call back its
2728
/// caller with the new object in a type-safe manner. Return false or set userError to abort the loop.
2829
func visit(ptr: UnsafeRawPointer?, size: Int) -> Bool { return false }

0 commit comments

Comments
 (0)