Skip to content

Commit 383c51e

Browse files
tobihagemanntobihagemann
committed
Merge branch 'release/1.12.0'
2 parents 2d84440 + 791650d commit 383c51e

File tree

16 files changed

+51
-51
lines changed

16 files changed

+51
-51
lines changed

‎CryptomatorCloudAccess.xcodeproj/project.pbxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1781,23 +1781,23 @@
17811781
repositoryURL = "https://github.com/google/GTMAppAuth.git";
17821782
requirement = {
17831783
kind = upToNextMinorVersion;
1784-
minimumVersion = 4.0.0;
1784+
minimumVersion = 4.1.0;
17851785
};
17861786
};
17871787
4A567B352615CAAC002C4D82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */ = {
17881788
isa = XCRemoteSwiftPackageReference;
17891789
repositoryURL = "https://github.com/google/gtm-session-fetcher.git";
17901790
requirement = {
17911791
kind = upToNextMinorVersion;
1792-
minimumVersion = 3.1.0;
1792+
minimumVersion = 3.5.0;
17931793
};
17941794
};
17951795
4A567B3A2615CB00002C4D82 /* XCRemoteSwiftPackageReference "AppAuth-iOS" */ = {
17961796
isa = XCRemoteSwiftPackageReference;
17971797
repositoryURL = "https://github.com/openid/AppAuth-iOS.git";
17981798
requirement = {
17991799
kind = upToNextMinorVersion;
1800-
minimumVersion = 1.6.0;
1800+
minimumVersion = 1.7.0;
18011801
};
18021802
};
18031803
4A75E1C228806F5800952FE6 /* XCRemoteSwiftPackageReference "msgraph-sdk-objc-models-spm" */ = {
@@ -1837,7 +1837,7 @@
18371837
repositoryURL = "https://github.com/aws-amplify/aws-sdk-ios-spm.git";
18381838
requirement = {
18391839
kind = upToNextMinorVersion;
1840-
minimumVersion = 2.34.0;
1840+
minimumVersion = 2.35.0;
18411841
};
18421842
};
18431843
740C5877262F800A00F63423 /* XCRemoteSwiftPackageReference "JOSESwift" */ = {
@@ -1853,7 +1853,7 @@
18531853
repositoryURL = "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git";
18541854
requirement = {
18551855
kind = upToNextMinorVersion;
1856-
minimumVersion = 1.3.0;
1856+
minimumVersion = 1.5.0;
18571857
};
18581858
};
18591859
746F090C27BC0932003FCD9F /* XCRemoteSwiftPackageReference "pcloud-sdk-swift" */ = {
@@ -1877,7 +1877,7 @@
18771877
repositoryURL = "https://github.com/groue/GRDB.swift.git";
18781878
requirement = {
18791879
kind = upToNextMinorVersion;
1880-
minimumVersion = 5.26.0;
1880+
minimumVersion = 6.29.1;
18811881
};
18821882
};
18831883
74F93565251F6863001F4ADA /* XCRemoteSwiftPackageReference "promises" */ = {

‎CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
"kind" : "remoteSourceControl",
77
"location" : "https://github.com/openid/AppAuth-iOS.git",
88
"state" : {
9-
"revision" : "71cde449f13d453227e687458144bde372d30fc7",
10-
"version" : "1.6.2"
9+
"revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2",
10+
"version" : "1.7.5"
1111
}
1212
},
1313
{
1414
"identity" : "aws-sdk-ios-spm",
1515
"kind" : "remoteSourceControl",
1616
"location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
1717
"state" : {
18-
"revision" : "8ff8bebfe24271f7b16c5abaeb78daf82bee3a80",
19-
"version" : "2.34.2"
18+
"revision" : "6e23b91609f9ddf988fda58bf711896a6062d4ff",
19+
"version" : "2.35.0"
2020
}
2121
},
2222
{
@@ -78,26 +78,26 @@
7878
"kind" : "remoteSourceControl",
7979
"location" : "https://github.com/groue/GRDB.swift.git",
8080
"state" : {
81-
"revision" : "dd7e7f39e8e4d7a22d258d9809a882f914690b01",
82-
"version" : "5.26.1"
81+
"revision" : "2cf6c756e1e5ef6901ebae16576a7e4e4b834622",
82+
"version" : "6.29.3"
8383
}
8484
},
8585
{
8686
"identity" : "gtm-session-fetcher",
8787
"kind" : "remoteSourceControl",
8888
"location" : "https://github.com/google/gtm-session-fetcher.git",
8989
"state" : {
90-
"revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
91-
"version" : "3.1.1"
90+
"revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
91+
"version" : "3.5.0"
9292
}
9393
},
9494
{
9595
"identity" : "gtmappauth",
9696
"kind" : "remoteSourceControl",
9797
"location" : "https://github.com/google/GTMAppAuth.git",
9898
"state" : {
99-
"revision" : "41aba100f28395ebe842cd66e5d371cdd46c6792",
100-
"version" : "4.0.0"
99+
"revision" : "5d7d66f647400952b1758b230e019b07c0b4b22a",
100+
"version" : "4.1.1"
101101
}
102102
},
103103
{
@@ -114,8 +114,8 @@
114114
"kind" : "remoteSourceControl",
115115
"location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
116116
"state" : {
117-
"revision" : "d2f81ded070ac6452b2a6acb5bc45eb566427fe7",
118-
"version" : "1.3.3"
117+
"revision" : "b8733236bfd16e10849f4752a4d1c4621e4bf930",
118+
"version" : "1.5.0"
119119
}
120120
},
121121
{

‎Package.resolved

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/openid/AppAuth-iOS.git",
77
"state" : {
8-
"revision" : "71cde449f13d453227e687458144bde372d30fc7",
9-
"version" : "1.6.2"
8+
"revision" : "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2",
9+
"version" : "1.7.5"
1010
}
1111
},
1212
{
1313
"identity" : "aws-sdk-ios-spm",
1414
"kind" : "remoteSourceControl",
1515
"location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
1616
"state" : {
17-
"revision" : "8ff8bebfe24271f7b16c5abaeb78daf82bee3a80",
18-
"version" : "2.34.2"
17+
"revision" : "6e23b91609f9ddf988fda58bf711896a6062d4ff",
18+
"version" : "2.35.0"
1919
}
2020
},
2121
{
@@ -77,26 +77,26 @@
7777
"kind" : "remoteSourceControl",
7878
"location" : "https://github.com/groue/GRDB.swift.git",
7979
"state" : {
80-
"revision" : "dd7e7f39e8e4d7a22d258d9809a882f914690b01",
81-
"version" : "5.26.1"
80+
"revision" : "2cf6c756e1e5ef6901ebae16576a7e4e4b834622",
81+
"version" : "6.29.3"
8282
}
8383
},
8484
{
8585
"identity" : "gtm-session-fetcher",
8686
"kind" : "remoteSourceControl",
8787
"location" : "https://github.com/google/gtm-session-fetcher.git",
8888
"state" : {
89-
"revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
90-
"version" : "3.1.1"
89+
"revision" : "a2ab612cb980066ee56d90d60d8462992c07f24b",
90+
"version" : "3.5.0"
9191
}
9292
},
9393
{
9494
"identity" : "gtmappauth",
9595
"kind" : "remoteSourceControl",
9696
"location" : "https://github.com/google/GTMAppAuth.git",
9797
"state" : {
98-
"revision" : "41aba100f28395ebe842cd66e5d371cdd46c6792",
99-
"version" : "4.0.0"
98+
"revision" : "5d7d66f647400952b1758b230e019b07c0b4b22a",
99+
"version" : "4.1.1"
100100
}
101101
},
102102
{
@@ -113,8 +113,8 @@
113113
"kind" : "remoteSourceControl",
114114
"location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
115115
"state" : {
116-
"revision" : "d2f81ded070ac6452b2a6acb5bc45eb566427fe7",
117-
"version" : "1.3.3"
116+
"revision" : "b8733236bfd16e10849f4752a4d1c4621e4bf930",
117+
"version" : "1.5.0"
118118
}
119119
},
120120
{

‎Package.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ let package = Package(
2828
.library(name: "CryptomatorCloudAccessCore", targets: ["CryptomatorCloudAccessCore"])
2929
],
3030
dependencies: [
31-
.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "1.3.0")),
32-
.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.34.0")),
31+
.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "1.5.0")),
32+
.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.35.0")),
3333
.package(url: "https://github.com/cryptomator/cryptolib-swift.git", .upToNextMinor(from: "1.1.0")),
3434
.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.8.0")),
3535
.package(url: "https://github.com/google/google-api-objectivec-client-for-rest.git", .upToNextMinor(from: "3.4.0")),
36-
.package(url: "https://github.com/google/GTMAppAuth.git", .upToNextMinor(from: "4.0.0")),
37-
.package(url: "https://github.com/google/gtm-session-fetcher.git", .upToNextMinor(from: "3.1.0")),
36+
.package(url: "https://github.com/google/GTMAppAuth.git", .upToNextMinor(from: "4.1.0")),
37+
.package(url: "https://github.com/google/gtm-session-fetcher.git", .upToNextMinor(from: "3.5.0")),
3838
.package(url: "https://github.com/google/promises.git", .upToNextMinor(from: "2.3.0")),
39-
.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMinor(from: "5.26.0")),
40-
.package(url: "https://github.com/openid/AppAuth-iOS.git", .upToNextMinor(from: "1.6.0")),
39+
.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMinor(from: "6.29.1")),
40+
.package(url: "https://github.com/openid/AppAuth-iOS.git", .upToNextMinor(from: "1.7.0")),
4141
.package(url: "https://github.com/pCloud/pcloud-sdk-swift.git", .upToNextMinor(from: "3.2.0")),
4242
.package(url: "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git", .upToNextMinor(from: "7.2.0")),
4343
.package(url: "https://github.com/phil1995/msgraph-sdk-objc-spm.git", .upToNextMinor(from: "1.0.0")),

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ The API is implemented once for each cloud. It also forms the foundation for dec
2121
You can use [Swift Package Manager](https://swift.org/package-manager/ "Swift Package Manager").
2222

2323
```swift
24-
.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.11.0"))
24+
.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.12.0"))
2525
```
2626

2727
## Usage

‎Sources/CryptomatorCloudAccess/Box/BoxIdentifierCache.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class BoxIdentifierCache {
1313
private let inMemoryDB: DatabaseQueue
1414

1515
init() throws {
16-
self.inMemoryDB = DatabaseQueue()
16+
self.inMemoryDB = try DatabaseQueue()
1717
try inMemoryDB.write { db in
1818
try db.create(table: BoxItem.databaseTableName) { table in
1919
table.column(BoxItem.cloudPathKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/Box/BoxItem.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extension BoxItem {
3636
}
3737

3838
extension BoxItem: PersistableRecord {
39-
func encode(to container: inout PersistenceContainer) {
39+
func encode(to container: inout PersistenceContainer) throws {
4040
container[BoxItem.cloudPathKey] = cloudPath
4141
container[BoxItem.identifierKey] = identifier
4242
container[BoxItem.itemTypeKey] = itemType

‎Sources/CryptomatorCloudAccess/Crypto/DirectoryIdCache.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ private struct CachedEntry: Decodable, FetchableRecord, TableRecord {
1919
}
2020

2121
extension CachedEntry: PersistableRecord {
22-
func encode(to container: inout PersistenceContainer) {
22+
func encode(to container: inout PersistenceContainer) throws {
2323
container[CachedEntry.cleartextPathKey] = cleartextPath
2424
container[CachedEntry.dirIdKey] = dirId
2525
}
@@ -29,7 +29,7 @@ class DirectoryIdCache {
2929
private let inMemoryDB: DatabaseQueue
3030

3131
init() throws {
32-
self.inMemoryDB = DatabaseQueue()
32+
self.inMemoryDB = try DatabaseQueue()
3333
try inMemoryDB.write { db in
3434
try db.create(table: CachedEntry.databaseTableName) { table in
3535
table.column(CachedEntry.cleartextPathKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/Crypto/VaultFormat6/VaultFormat6ShortenedNameCache.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private struct CachedEntry: Decodable, FetchableRecord, TableRecord {
2525
}
2626

2727
extension CachedEntry: PersistableRecord {
28-
func encode(to container: inout PersistenceContainer) {
28+
func encode(to container: inout PersistenceContainer) throws {
2929
container[CachedEntry.shortenedNameKey] = shortenedName
3030
container[CachedEntry.originalNameKey] = originalName
3131
}
@@ -48,7 +48,7 @@ class VaultFormat6ShortenedNameCache {
4848
init(vaultPath: CloudPath) throws {
4949
self.vaultPath = vaultPath
5050
self.ciphertextNameCompIdx = vaultPath.pathComponents.lastItemIndex() + 4
51-
self.inMemoryDB = DatabaseQueue()
51+
self.inMemoryDB = try DatabaseQueue()
5252
try inMemoryDB.write { db in
5353
try db.create(table: CachedEntry.databaseTableName) { table in
5454
table.column(CachedEntry.shortenedNameKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/Crypto/VaultFormat7/VaultFormat7ShortenedNameCache.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private struct CachedEntry: Decodable, FetchableRecord, TableRecord {
3131
}
3232

3333
extension CachedEntry: PersistableRecord {
34-
func encode(to container: inout PersistenceContainer) {
34+
func encode(to container: inout PersistenceContainer) throws {
3535
container[CachedEntry.shortenedNameKey] = shortenedName
3636
container[CachedEntry.originalNameKey] = originalName
3737
}
@@ -106,7 +106,7 @@ class VaultFormat7ShortenedNameCache {
106106
self.vaultPath = vaultPath
107107
self.threshold = threshold
108108
self.ciphertextNameCompIdx = vaultPath.pathComponents.lastItemIndex() + 4
109-
self.inMemoryDB = DatabaseQueue()
109+
self.inMemoryDB = try DatabaseQueue()
110110
try inMemoryDB.write { db in
111111
try db.create(table: CachedEntry.databaseTableName) { table in
112112
table.column(CachedEntry.shortenedNameKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/GoogleDrive/GoogleDriveIdentifierCache.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class GoogleDriveIdentifierCache {
1313
private let inMemoryDB: DatabaseQueue
1414

1515
init() throws {
16-
self.inMemoryDB = DatabaseQueue()
16+
self.inMemoryDB = try DatabaseQueue()
1717
try inMemoryDB.write { db in
1818
try db.create(table: GoogleDriveItem.databaseTableName) { table in
1919
table.column(GoogleDriveItem.cloudPathKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/OneDrive/OneDriveIdentifierCache.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class OneDriveIdentifierCache {
1313
private let inMemoryDB: DatabaseQueue
1414

1515
init() throws {
16-
self.inMemoryDB = DatabaseQueue()
16+
self.inMemoryDB = try DatabaseQueue()
1717
try inMemoryDB.write { db in
1818
try db.create(table: OneDriveItem.databaseTableName) { table in
1919
table.column(OneDriveItem.cloudPathKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/OneDrive/OneDriveItem.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct OneDriveItem: Decodable, FetchableRecord, TableRecord, Equatable {
4242
}
4343

4444
extension OneDriveItem: PersistableRecord {
45-
func encode(to container: inout PersistenceContainer) {
45+
func encode(to container: inout PersistenceContainer) throws {
4646
container[OneDriveItem.cloudPathKey] = cloudPath
4747
container[OneDriveItem.identifierKey] = identifier
4848
container[OneDriveItem.driveIdentifierKey] = driveIdentifier

‎Sources/CryptomatorCloudAccess/PCloud/PCloudIdentifierCache.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class PCloudIdentifierCache {
1414
private let inMemoryDB: DatabaseQueue
1515

1616
init() throws {
17-
self.inMemoryDB = DatabaseQueue()
17+
self.inMemoryDB = try DatabaseQueue()
1818
try inMemoryDB.write { db in
1919
try db.create(table: PCloudItem.databaseTableName) { table in
2020
table.column(PCloudItem.cloudPathKey, .text).notNull().primaryKey()

‎Sources/CryptomatorCloudAccess/PCloud/PCloudItem.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extension PCloudItem {
4646
}
4747

4848
extension PCloudItem: PersistableRecord {
49-
func encode(to container: inout PersistenceContainer) {
49+
func encode(to container: inout PersistenceContainer) throws {
5050
container[PCloudItem.cloudPathKey] = cloudPath
5151
container[PCloudItem.identifierKey] = identifier
5252
container[PCloudItem.itemTypeKey] = itemType

‎Tests/CryptomatorCloudAccessTests/Common/DirectoryContentCacheTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class DirectoryContentCacheTests: XCTestCase {
2929
let subfolderPath = CloudPath("/subfolder")
3030

3131
override func setUpWithError() throws {
32-
let inMemoryDB = DatabaseQueue()
32+
let inMemoryDB = try DatabaseQueue()
3333
cache = try DirectoryContentDBCache(dbWriter: inMemoryDB, maxPageSize: maxPageSize)
3434
}
3535

0 commit comments

Comments
 (0)