Update dependencies, bump iOS deployment target to 16.0, migrate to GRDB 7

Author: tobihagemann

CryptomatorCloudAccess.xcodeproj/project.pbxproj

@@ -1555,7 +1555,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1615,7 +1615,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";
@@ -1801,15 +1801,15 @@
 			repositoryURL = "https://github.com/google/google-api-objectivec-client-for-rest.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 3.4.0;
+				minimumVersion = 5.2.0;
 			};
 		};
 		4A567B182615C917002C4D82 /* XCRemoteSwiftPackageReference "GTMAppAuth" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/google/GTMAppAuth.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 4.1.0;
+				minimumVersion = 5.0.0;
 			};
 		};
 		4A567B352615CAAC002C4D82 /* XCRemoteSwiftPackageReference "gtm-session-fetcher" */ = {
@@ -1825,7 +1825,7 @@
 			repositoryURL = "https://github.com/openid/AppAuth-iOS.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 1.7.0;
+				minimumVersion = 2.0.0;
 			};
 		};
 		4A75E1C228806F5800952FE6 /* XCRemoteSwiftPackageReference "msgraph-sdk-objc-models-spm" */ = {
@@ -1857,15 +1857,15 @@
 			repositoryURL = "https://github.com/CocoaLumberjack/CocoaLumberjack.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 3.8.0;
+				minimumVersion = 3.9.0;
 			};
 		};
 		4AF0AA7A2844DDD200C20B75 /* XCRemoteSwiftPackageReference "aws-sdk-ios-spm" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/aws-amplify/aws-sdk-ios-spm.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 2.35.0;
+				minimumVersion = 2.41.0;
 			};
 		};
 		740C5877262F800A00F63423 /* XCRemoteSwiftPackageReference "JOSESwift" */ = {
@@ -1881,7 +1881,7 @@
 			repositoryURL = "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 1.5.0;
+				minimumVersion = 2.9.0;
 			};
 		};
 		746F090C27BC0932003FCD9F /* XCRemoteSwiftPackageReference "pcloud-sdk-swift" */ = {
@@ -1905,7 +1905,7 @@
 			repositoryURL = "https://github.com/groue/GRDB.swift.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 6.29.1;
+				minimumVersion = 7.10.0;
 			};
 		};
 		74F93565251F6863001F4ADA /* XCRemoteSwiftPackageReference "promises" */ = {

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

@@ -21,23 +21,23 @@ let appExtensionUnsafeSources = [
 let package = Package(
 	name: "CryptomatorCloudAccess",
 	platforms: [
-		.iOS(.v14)
+		.iOS(.v16)
 	],
 	products: [
 		.library(name: "CryptomatorCloudAccess", targets: ["CryptomatorCloudAccess"]),
 		.library(name: "CryptomatorCloudAccessCore", targets: ["CryptomatorCloudAccessCore"])
 	],
 	dependencies: [
-		.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "1.5.0")),
-		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.35.0")),
+		.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .upToNextMinor(from: "2.9.0")),
+		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.41.0")),
 		.package(url: "https://github.com/cryptomator/cryptolib-swift.git", .upToNextMinor(from: "1.1.0")),
-		.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.8.0")),
-		.package(url: "https://github.com/google/google-api-objectivec-client-for-rest.git", .upToNextMinor(from: "3.4.0")),
-		.package(url: "https://github.com/google/GTMAppAuth.git", .upToNextMinor(from: "4.1.0")),
+		.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.9.0")),
+		.package(url: "https://github.com/google/google-api-objectivec-client-for-rest.git", .upToNextMinor(from: "5.2.0")),
+		.package(url: "https://github.com/google/GTMAppAuth.git", .upToNextMinor(from: "5.0.0")),
 		.package(url: "https://github.com/google/gtm-session-fetcher.git", .upToNextMinor(from: "3.5.0")),
 		.package(url: "https://github.com/google/promises.git", .upToNextMinor(from: "2.3.0")),
-		.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMinor(from: "6.29.1")),
-		.package(url: "https://github.com/openid/AppAuth-iOS.git", .upToNextMinor(from: "1.7.0")),
+		.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMinor(from: "7.10.0")),
+		.package(url: "https://github.com/openid/AppAuth-iOS.git", .upToNextMinor(from: "2.0.0")),
 		.package(url: "https://github.com/pCloud/pcloud-sdk-swift.git", .upToNextMinor(from: "3.2.0")),
 		.package(url: "https://github.com/phil1995/dropbox-sdk-obj-c-spm.git", .upToNextMinor(from: "7.2.0")),
 		.package(url: "https://github.com/phil1995/msgraph-sdk-objc-spm.git", .upToNextMinor(from: "1.0.0")),

Package.resolved

@@ -17,7 +17,7 @@ Continuous integration hosting is provided by [MacStadium](https://www.macstadiu
 
 ## Requirements
 
-- iOS 14.0 or higher
+- iOS 16.0 or higher
 - Swift 5
 
 ## Installation

Package.swift

@@ -44,9 +44,10 @@ struct DirectoryContentCacheResponse {
 }
 
 struct DirectoryContentDBCache: DirectoryContentCache {
-	let dbWriter: DatabaseWriter
+	let dbWriter: any DatabaseWriter
 	let maxPageSize: Int
-	private let cachedStatement: Statement
+
+	private static let insertSQL = "INSERT INTO entries (cacheIndex, name, itemType, lastModified, size, folderEnumerationPath) VALUES (?, ?, ?, ?, ?, ?)"
 
 	private static var migrator: DatabaseMigrator {
 		var migrator = DatabaseMigrator()
@@ -64,13 +65,10 @@ struct DirectoryContentDBCache: DirectoryContentCache {
 		return migrator
 	}
 
-	init(dbWriter: DatabaseWriter, maxPageSize: Int) throws {
+	init(dbWriter: any DatabaseWriter, maxPageSize: Int) throws {
 		self.dbWriter = dbWriter
 		self.maxPageSize = maxPageSize
 		try DirectoryContentDBCache.migrator.migrate(dbWriter)
-		self.cachedStatement = try dbWriter.write { db in
-			return try db.cachedStatement(sql: "INSERT INTO entries (cacheIndex, name, itemType, lastModified, size, folderEnumerationPath) VALUES (?, ?, ?, ?, ?, ?)")
-		}
 		// reduce the cache size from 2000 KiB to 500 KiB
 		try dbWriter.write { db in
 			try db.execute(sql: "pragma cache_size = -500")
@@ -79,8 +77,9 @@ struct DirectoryContentDBCache: DirectoryContentCache {
 
 	func save(_ element: CloudItemMetadata, for folderEnumerationPath: CloudPath, index: Int64) throws {
 		try autoreleasepool {
-			_ = try dbWriter.write { _ in
-				try cachedStatement.execute(arguments: [index, element.name, element.itemType, element.lastModifiedDate?.timeIntervalSinceReferenceDate, element.size, folderEnumerationPath])
+			_ = try dbWriter.write { db in
+				let statement = try db.cachedStatement(sql: DirectoryContentDBCache.insertSQL)
+				try statement.execute(arguments: [index, element.name, element.itemType, element.lastModifiedDate?.timeIntervalSinceReferenceDate, element.size, folderEnumerationPath])
 			}
 		}
 	}