Merge branch 'develop' into release/1.7.5

cryptomator · Mar 9, 2023 · 041595c · 041595c
2 parents 61501f9 + 9c792b4
commit 041595c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CryptomatorCloudAccess.xcodeproj/project.pbxproj b/CryptomatorCloudAccess.xcodeproj/project.pbxproj
@@ -1745,7 +1745,7 @@
 			repositoryURL = "https://github.com/aws-amplify/aws-sdk-ios-spm.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 2.28.0;
+				minimumVersion = 2.30.0;
 			};
 		};
 		740C5877262F800A00F63423 /* XCRemoteSwiftPackageReference "JOSESwift" */ = {

diff --git a/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CryptomatorCloudAccess.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,8 +14,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "eae68dde708c17a3ed249f1926e96d5bda20d2d2",
-        "version" : "2.28.5"
+        "revision" : "51d99d74be7249ac6444581bd1e394fb60ea86a3",
+        "version" : "2.30.4"
       }
     },
     {

diff --git a/Package.resolved b/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
         "state": {
           "branch": null,
-          "revision": "eae68dde708c17a3ed249f1926e96d5bda20d2d2",
-          "version": "2.28.5"
+          "revision": "51d99d74be7249ac6444581bd1e394fb60ea86a3",
+          "version": "2.30.4"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -29,7 +29,7 @@ let package = Package(
 	dependencies: [
 		.package(url: "https://github.com/airsidemobile/JOSESwift.git", .upToNextMinor(from: "2.4.0")),
 		.package(url: "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git", .exact("1.2.5")),
-		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.28.0")),
+		.package(url: "https://github.com/aws-amplify/aws-sdk-ios-spm.git", .upToNextMinor(from: "2.30.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.0.0")),