updated dependencies

cryptomator · Sep 21, 2023 · af8e138 · af8e138
1 parent 9198b1b
commit af8e138
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Cryptomator.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/openid/AppAuth-iOS.git",
       "state" : {
-        "revision" : "3d36a58a2b736f7bc499453e996a704929b25080",
-        "version" : "1.6.0"
+        "revision" : "71cde449f13d453227e687458144bde372d30fc7",
+        "version" : "1.6.2"
       }
     },
     {
@@ -23,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/aws-amplify/aws-sdk-ios-spm.git",
       "state" : {
-        "revision" : "51d99d74be7249ac6444581bd1e394fb60ea86a3",
-        "version" : "2.30.4"
+        "revision" : "ca31418963a90bac80538e13f6b7af87ea14d279",
+        "version" : "2.33.4"
       }
     },
     {
@@ -41,17 +41,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/cryptomator/cloud-access-swift.git",
       "state" : {
-        "branch" : "feature/hub-poc",
-        "revision" : "302afc0f5960fac7dd67cc3c09e52d21ba45f829"
+        "revision" : "250d3f935bf8de06338f46c4f1652a00e23f0caa",
+        "version" : "1.8.1"
       }
     },
     {
       "identity" : "cocoalumberjack",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/CocoaLumberjack/CocoaLumberjack.git",
       "state" : {
-        "revision" : "0188d31089b5881a269e01777be74c7316924346",
-        "version" : "3.8.0"
+        "revision" : "67ec5818a757aba4d7c534e21a905d878d128dbf",
+        "version" : "3.8.1"
       }
     },
     {
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/google-api-objectivec-client-for-rest.git",
       "state" : {
-        "revision" : "260501c0425e95e038c65436436161266bf548e9",
-        "version" : "3.0.0"
+        "revision" : "40930b2c3add6234b8be1a780c08cf88b6a7a1f7",
+        "version" : "3.2.0"
       }
     },
     {
@@ -95,35 +95,35 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/gtm-session-fetcher.git",
       "state" : {
-        "revision" : "efda500b6d9858d38a76dbfbfa396bd644692e4a",
-        "version" : "3.0.0"
+        "revision" : "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
+        "version" : "3.1.1"
       }
     },
     {
       "identity" : "gtmappauth",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/GTMAppAuth.git",
       "state" : {
-        "revision" : "cee3c709307912d040bd1e06ca919875a92339c6",
-        "version" : "2.0.0"
+        "revision" : "41aba100f28395ebe842cd66e5d371cdd46c6792",
+        "version" : "4.0.0"
       }
     },
     {
       "identity" : "joseswift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/tobihagemann/JOSESwift.git",
       "state" : {
-        "branch" : "feature/JWE-ECDH-GCM",
-        "revision" : "e851667a4e6f6e8411d21474e77442041025e93c"
+        "revision" : "11442e7f1f803ef42281909c68f386b38afc5096",
+        "version" : "2.4.0-cryptomator"
       }
     },
     {
       "identity" : "microsoft-authentication-library-for-objc",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/AzureAD/microsoft-authentication-library-for-objc.git",
       "state" : {
-        "revision" : "31a806298d6aa71b40504e7ebda6d6a8923f0ebf",
-        "version" : "1.2.5"
+        "revision" : "35846731c0971694f162b28fe8494c03b615ae74",
+        "version" : "1.2.16"
       }
     },
     {
@@ -158,26 +158,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/google/promises.git",
       "state" : {
-        "revision" : "611337c330350c9c1823ad6d671e7f936af5ee13",
-        "version" : "2.0.0"
+        "revision" : "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
+        "version" : "2.3.1"
       }
     },
     {
       "identity" : "swift-log",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-log.git",
       "state" : {
-        "revision" : "3e3ef75109d6801b2c44504e73f55f0dce6662c9",
-        "version" : "1.5.1"
+        "revision" : "532d8b529501fb73a2455b179e0bbb6d49b652ed",
+        "version" : "1.5.3"
       }
     },
     {
       "identity" : "swiftui-introspect",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/siteline/SwiftUI-Introspect.git",
       "state" : {
-        "revision" : "5b3f3996c7a2a84d5f4ba0e03cd7d584154778f2",
-        "version" : "0.3.1"
+        "revision" : "121c146fe591b1320238d054ae35c81ffa45f45a",
+        "version" : "0.12.0"
       }
     },
     {

diff --git a/CryptomatorCommon/Package.swift b/CryptomatorCommon/Package.swift
@@ -26,7 +26,7 @@ let package = Package(
 		)
 	],
 	dependencies: [
-		.package(url: "https://github.com/cryptomator/cloud-access-swift.git", branch: "feature/hub-poc"),
+		.package(url: "https://github.com/cryptomator/cloud-access-swift.git", .upToNextMinor(from: "1.8.0")),
 		.package(url: "https://github.com/CocoaLumberjack/CocoaLumberjack.git", .upToNextMinor(from: "3.8.0")),
 		.package(url: "https://github.com/siteline/SwiftUI-Introspect.git", .upToNextMajor(from: "0.3.0"))
 	],

diff --git a/CryptomatorCommon/Sources/CryptomatorCommonCore/Hub/HubAuthenticationViewModel.swift b/CryptomatorCommon/Sources/CryptomatorCommonCore/Hub/HubAuthenticationViewModel.swift
@@ -49,7 +49,7 @@ public class HubAuthenticationViewModel: ObservableObject {
 	}
 
 	public func login() async {
-		guard let hubConfig = vaultConfig.hub else {
+		guard let hubConfig = vaultConfig.allegedHubConfig else {
 			await setStateToErrorState(with: HubAuthenticationViewModelError.missingHubConfig)
 			return
 		}
@@ -64,7 +64,7 @@ public class HubAuthenticationViewModel: ObservableObject {
 	}
 
 	public func register() async {
-		guard let hubConfig = vaultConfig.hub else {
+		guard let hubConfig = vaultConfig.allegedHubConfig else {
 			await setStateToErrorState(with: HubAuthenticationViewModelError.missingHubConfig)
 			return
 		}