Merge pull request #332 from cryptomator/feature/hub-1_3_0-compatibility

Feature: Hub 1.3.0 Compatibility
cryptomator · Jan 3, 2024 · 0362d6c · 0362d6c
2 parents 7b5f78b + 8ebb9b5
commit 0362d6c
Show file tree

Hide file tree

Showing 16 changed files with 848 additions and 86 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,6 +30,8 @@ jobs:
         run: |
           cd fastlane
           ./scripts/create-cloud-access-secrets.sh
+      - name: Select Xcode 15.1
+        run: sudo xcode-select -s /Applications/Xcode_15.1.app
       - name: Configuration for freemium
         if: ${{ matrix.config == 'freemium' }}
         run: |

diff --git a/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -9,6 +9,15 @@
         "version" : "1.6.2"
       }
     },
+    {
+      "identity" : "asn1",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/leif-ibsen/ASN1",
+      "state" : {
+        "revision" : "5bb6eca2e4b250995f189c3d04ec53b6cd8257c5",
+        "version" : "2.2.0"
+      }
+    },
     {
       "identity" : "asn1swift",
       "kind" : "remoteSourceControl",
@@ -23,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "ca31418963a90bac80538e13f6b7af87ea14d279",
-        "version" : "2.33.4"
+        "revision" : "59fdc9ca7ff3f5d38e07af27526a527c199b8de6",
+        "version" : "2.33.7"
       }
     },
     {
@@ -36,13 +45,22 @@
         "version" : "0.9.0"
       }
     },
+    {
+      "identity" : "bigint",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/leif-ibsen/BigInt",
+      "state" : {
+        "revision" : "3fe07ec38afa732e86d4f3e867cb43b05d004941",
+        "version" : "1.14.0"
+      }
+    },
     {
       "identity" : "cloud-access-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cryptomator/cloud-access-swift.git",
       "state" : {
-        "revision" : "1fe06a85f9ea38d9b22a84fb7dbd8de127c65f82",
-        "version" : "1.8.1"
+        "revision" : "63fd1cfee9e4d1c0a8d585dd0c7008eb37d2f037",
+        "version" : "1.9.0"
       }
     },
     {
@@ -63,6 +81,15 @@
         "version" : "1.1.0"
       }
     },
+    {
+      "identity" : "digest",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/leif-ibsen/Digest",
+      "state" : {
+        "revision" : "fd501645c5f14c17207c4ada4281a1e6b7cb03df",
+        "version" : "1.1.0"
+      }
+    },
     {
       "identity" : "dropbox-sdk-obj-c-spm",
       "kind" : "remoteSourceControl",
@@ -113,17 +140,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tobihagemann/JOSESwift.git",
       "state" : {
-        "revision" : "11442e7f1f803ef42281909c68f386b38afc5096",
-        "version" : "2.4.0-cryptomator"
+        "revision" : "3544f8117908ef12ea13b1c0927e0e3c0d30ee01",
+        "version" : "2.4.1-cryptomator"
       }
     },
     {
       "identity" : "microsoft-authentication-library-for-objc",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
       "state" : {
-        "revision" : "35846731c0971694f162b28fe8494c03b615ae74",
-        "version" : "1.2.16"
+        "revision" : "e9ef281b2f281c3ba2d32608138b1431cba5e4df",
+        "version" : "1.2.20"
       }
     },
     {
@@ -180,6 +207,15 @@
         "version" : "1.5.3"
       }
     },
+    {
+      "identity" : "swiftecc",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/leif-ibsen/SwiftECC",
+      "state" : {
+        "revision" : "18c0e462882d0a4fa910472a0a6cc13ef97bbc21",
+        "version" : "5.0.0"
+      }
+    },
     {
       "identity" : "swiftui-introspect",
       "kind" : "remoteSourceControl",

diff --git a/CryptomatorCommon/Package.swift b/CryptomatorCommon/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.7
+// swift-tools-version:5.9
 
 //
 //  Package.swift
@@ -26,10 +26,11 @@ let package = Package(
 		)
 	],
 	dependencies: [
-		.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.8.0")),
+		.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.9.0")),
 		.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.8.0")),
 		.package(url: "https://github.com/PhilLibs/simple-swift-dependencies", .upToNextMajor(from: "0.1.0")),
-		.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", .upToNextMajor(from: "0.3.0"))
+		.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", .upToNextMajor(from: "0.3.0")),
+		.package(url: "https://github.com/leif-ibsen/SwiftECC", from: "5.0.0")
 	],
 	targets: [
 		.target(
@@ -45,7 +46,9 @@ let package = Package(
 				.product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
 				.product(name: "CryptomatorCloudAccessCore", package: "cloud-access-swift"),
 				.product(name: "Dependencies", package: "simple-swift-dependencies"),
-				.product(name: "Introspect", package: "SwiftUI-Introspect")
+				.product(name: "Introspect", package: "SwiftUI-Introspect"),
+				.product(name: "SwiftUIIntrospect", package: "SwiftUI-Introspect"),
+				.product(name: "SwiftECC", package: "SwiftECC")
 			]
 		),
 		.testTarget(