Upgrade dependencies and recompile with newer xcode version

TheNoim · May 8, 2021 · 01c4071 · 01c4071
1 parent fe08f3b
commit 01c4071
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 43 deletions.
diff --git a/Project SITNU.xcodeproj/project.pbxproj b/Project SITNU.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		FB2B57D92646BC64008CD6C4 /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = FB2B57D82646BC64008CD6C4 /* Cache */; };
+		FB2B57DB2646BCDB008CD6C4 /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = FB2B57DA2646BCDB008CD6C4 /* Cache */; };
 		FB36E7FE2518B35F0039DFC9 /* onChangeChim.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB6E89FB25165A2600DAB2F4 /* onChangeChim.swift */; };
 		FB36E80D2518B90B0039DFC9 /* Color+Hex.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB36E80C2518B90B0039DFC9 /* Color+Hex.swift */; };
 		FB36E8172518B9BA0039DFC9 /* PeriodDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB36E8162518B9BA0039DFC9 /* PeriodDetailView.swift */; };
@@ -35,7 +37,6 @@
 		FB6E8986251624DD00DAB2F4 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = FB6E8985251624DD00DAB2F4 /* Preview Assets.xcassets */; };
 		FB6E898A251624DD00DAB2F4 /* Watch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = FB6E8969251624DA00DAB2F4 /* Watch.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		FB6E89A52516259B00DAB2F4 /* WatchStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB6E89A42516259B00DAB2F4 /* WatchStore.swift */; };
-		FB6E89BA251629F300DAB2F4 /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = FB6E89B9251629F300DAB2F4 /* Cache */; };
 		FB6E89CB25162F6400DAB2F4 /* AccountContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB6E89CA25162F6400DAB2F4 /* AccountContext.swift */; };
 		FB6E89D62516342700DAB2F4 /* SchoolSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB6E89D52516342700DAB2F4 /* SchoolSearchView.swift */; };
 		FB6E89E825163B1E00DAB2F4 /* Throttler.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB6E89E725163B1E00DAB2F4 /* Throttler.swift */; };
@@ -48,7 +49,6 @@
 		FB7F6A1725175E870052F679 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB7F6A1625175E870052F679 /* SearchBar.swift */; };
 		FB7F6A252517617B0052F679 /* Encodable+asDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB7F6A242517617B0052F679 /* Encodable+asDictionary.swift */; };
 		FB7F6A88251789EA0052F679 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = FB7F6A87251789EA0052F679 /* Alamofire */; };
-		FB7F6A8A251789EA0052F679 /* Cache in Frameworks */ = {isa = PBXBuildFile; productRef = FB7F6A89251789EA0052F679 /* Cache */; };
 		FB7F6A9725178B270052F679 /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB7F6A9625178B270052F679 /* ActivityIndicator.swift */; };
 		FB7F6A9C25178E600052F679 /* AccountContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB6E89CA25162F6400DAB2F4 /* AccountContext.swift */; };
 		FB7F6AA125178FDC0052F679 /* Encodable+asDictionary.swift in Sources */ = {isa = PBXBuildFile; fileRef = FB7F6A242517617B0052F679 /* Encodable+asDictionary.swift */; };
@@ -224,8 +224,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FB2B57DB2646BCDB008CD6C4 /* Cache in Frameworks */,
 				FB7F6A88251789EA0052F679 /* Alamofire in Frameworks */,
-				FB7F6A8A251789EA0052F679 /* Cache in Frameworks */,
 				FBDAA1AB251FBE0A00104001 /* SwiftyBeaver in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -234,7 +234,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FB6E89BA251629F300DAB2F4 /* Cache in Frameworks */,
+				FB2B57D92646BC64008CD6C4 /* Cache in Frameworks */,
 				FBA95DB72514F63D00494B5C /* Alamofire in Frameworks */,
 				FBDAA1A5251FBDDB00104001 /* SwiftyBeaver in Frameworks */,
 			);
@@ -560,8 +560,8 @@
 			name = "Watch Extension";
 			packageProductDependencies = (
 				FB7F6A87251789EA0052F679 /* Alamofire */,
-				FB7F6A89251789EA0052F679 /* Cache */,
 				FBDAA1AA251FBE0A00104001 /* SwiftyBeaver */,
+				FB2B57DA2646BCDB008CD6C4 /* Cache */,
 			);
 			productName = "Watch Extension";
 			productReference = FB6E8975251624DD00DAB2F4 /* Watch Extension.appex */;
@@ -584,8 +584,8 @@
 			name = "Project SITNU";
 			packageProductDependencies = (
 				FBA95DB62514F63D00494B5C /* Alamofire */,
-				FB6E89B9251629F300DAB2F4 /* Cache */,
 				FBDAA1A4251FBDDB00104001 /* SwiftyBeaver */,
+				FB2B57D82646BC64008CD6C4 /* Cache */,
 			);
 			productName = "Project SITNU";
 			productReference = FBA95DA22514F53200494B5C /* Project SITNU.app */;
@@ -649,8 +649,8 @@
 			mainGroup = FBA95D992514F53200494B5C;
 			packageReferences = (
 				FBA95DB52514F63D00494B5C /* XCRemoteSwiftPackageReference "Alamofire" */,
-				FB6E89B8251629F300DAB2F4 /* XCRemoteSwiftPackageReference "Cache" */,
 				FBDAA1A3251FBDDB00104001 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */,
+				FB2B57D72646BC64008CD6C4 /* XCRemoteSwiftPackageReference "Cache" */,
 			);
 			productRefGroup = FBA95DA32514F53200494B5C /* Products */;
 			projectDirPath = "";
@@ -836,7 +836,7 @@
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_ASSET_PATHS = "\"Watch Extension/Preview Content\"";
 				DEVELOPMENT_TEAM = P88CDRP8CR;
 				ENABLE_PREVIEWS = YES;
@@ -846,7 +846,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-function-bodies=100 -Xfrontend -warn-long-expression-type-checking=100";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.noim.Project-SITNU.watchkitapp.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
@@ -866,7 +866,7 @@
 				ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_ASSET_PATHS = "\"Watch Extension/Preview Content\"";
 				DEVELOPMENT_TEAM = P88CDRP8CR;
 				ENABLE_PREVIEWS = YES;
@@ -876,7 +876,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.1;
 				OTHER_SWIFT_FLAGS = "";
 				PRODUCT_BUNDLE_IDENTIFIER = "io.noim.Project-SITNU.watchkitapp.watchkitextension";
 				PRODUCT_NAME = "${TARGET_NAME}";
@@ -896,10 +896,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = P88CDRP8CR;
 				IBSC_MODULE = Watch_Extension;
 				INFOPLIST_FILE = Watch/Info.plist;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.noim.Project-SITNU.watchkitapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -917,10 +918,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = P88CDRP8CR;
 				IBSC_MODULE = Watch_Extension;
 				INFOPLIST_FILE = Watch/Info.plist;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.noim.Project-SITNU.watchkitapp";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = watchos;
@@ -1055,7 +1057,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_ASSET_PATHS = "\"Project SITNU/Preview Content\"";
 				DEVELOPMENT_TEAM = P88CDRP8CR;
 				ENABLE_PREVIEWS = YES;
@@ -1066,6 +1068,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.noim.Project-SITNU";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1084,7 +1087,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 24;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_ASSET_PATHS = "\"Project SITNU/Preview Content\"";
 				DEVELOPMENT_TEAM = P88CDRP8CR;
 				ENABLE_PREVIEWS = YES;
@@ -1094,6 +1097,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.noim.Project-SITNU";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1194,12 +1198,12 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		FB6E89B8251629F300DAB2F4 /* XCRemoteSwiftPackageReference "Cache" */ = {
+		FB2B57D72646BC64008CD6C4 /* XCRemoteSwiftPackageReference "Cache" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/TheNoim/Cache.git";
+			repositoryURL = "https://github.com/hyperoslo/Cache.git";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.3.0;
+				minimumVersion = 6.0.0;
 			};
 		};
 		FBA95DB52514F63D00494B5C /* XCRemoteSwiftPackageReference "Alamofire" */ = {
@@ -1221,21 +1225,21 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		FB6E89B9251629F300DAB2F4 /* Cache */ = {
+		FB2B57D82646BC64008CD6C4 /* Cache */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = FB6E89B8251629F300DAB2F4 /* XCRemoteSwiftPackageReference "Cache" */;
+			package = FB2B57D72646BC64008CD6C4 /* XCRemoteSwiftPackageReference "Cache" */;
+			productName = Cache;
+		};
+		FB2B57DA2646BCDB008CD6C4 /* Cache */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = FB2B57D72646BC64008CD6C4 /* XCRemoteSwiftPackageReference "Cache" */;
 			productName = Cache;
 		};
 		FB7F6A87251789EA0052F679 /* Alamofire */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = FBA95DB52514F63D00494B5C /* XCRemoteSwiftPackageReference "Alamofire" */;
 			productName = Alamofire;
 		};
-		FB7F6A89251789EA0052F679 /* Cache */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = FB6E89B8251629F300DAB2F4 /* XCRemoteSwiftPackageReference "Cache" */;
-			productName = Cache;
-		};
 		FBA95DB62514F63D00494B5C /* Alamofire */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = FBA95DB52514F63D00494B5C /* XCRemoteSwiftPackageReference "Alamofire" */;

diff --git a/Project SITNU.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Project SITNU.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,26 +6,26 @@
         "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
         "state": {
           "branch": null,
-          "revision": "becd9a729a37bdbef5bc39dc3c702b99f9e3d046",
-          "version": "5.2.2"
+          "revision": "f96b619bcb2383b43d898402283924b80e2c4bae",
+          "version": "5.4.3"
         }
       },
       {
         "package": "Cache",
-        "repositoryURL": "https://github.com/TheNoim/Cache.git",
+        "repositoryURL": "https://github.com/hyperoslo/Cache.git",
         "state": {
           "branch": null,
-          "revision": "d356ed13e1bcf778713fc852adea001adcf32e7e",
-          "version": "5.3.2"
+          "revision": "c7f4d633049c3bd649a353bad36f6c17e9df085f",
+          "version": "6.0.0"
         }
       },
       {
         "package": "SwiftyBeaver",
         "repositoryURL": "https://github.com/SwiftyBeaver/SwiftyBeaver.git",
         "state": {
           "branch": null,
-          "revision": "c7b2fceb3fd0095acba4792c728f3f062baf8fb9",
-          "version": "1.9.2"
+          "revision": "5cfd6888447adcc49b80b625281b6177104f011f",
+          "version": "1.9.4"
         }
       }
     ]

diff --git a/Project SITNU/AppDelegate.swift b/Project SITNU/AppDelegate.swift
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import SwiftUI
 import SwiftyBeaver
 
 let log = SwiftyBeaver.self

diff --git a/Project SITNU/Info.plist b/Project SITNU/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/Project SITNU/SceneDelegate.swift b/Project SITNU/SceneDelegate.swift
@@ -90,6 +90,8 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, WCSessionDelegate {
         // If using a storyboard, the `window` property will automatically be initialized and attached to the scene.
         // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead).
 
+        print("Test")
+
         self.watchStore.syncCallback = { context in
             do {
                 try self.sync(context: context)

diff --git a/Watch Extension/HostingController.swift b/Watch Extension/HostingController.swift
@@ -86,7 +86,7 @@ class HostingController: WKHostingController<AnyView>, WCSessionDelegate {
         if let sharedContext: SharedContext = try? SharedContext(from: context) {
             DispatchQueue.main.async {
                 do {
-                    let storage = try DiskStorage(config: DiskConfig(name: "UntisWA", expiry: .never), transformer: TransformerFactory.forCodable(ofType: SharedContext.self));
+                    let storage = try DiskStorage<String, SharedContext>(config: DiskConfig(name: "UntisWA", expiry: .never), transformer: TransformerFactory.forCodable(ofType: SharedContext.self));
                     try storage.setObject(sharedContext, forKey: "context");
                 } catch {
                     print(error)

diff --git a/Watch Extension/Utility/BackgroundUtility.swift b/Watch Extension/Utility/BackgroundUtility.swift
@@ -15,10 +15,10 @@ class BackgroundUtility {
 
     var untisClient: UntisClient?;
 
-    var backgroundTaskDiskStorage: DiskStorage<Date>?;
+    var backgroundTaskDiskStorage: DiskStorage<String, Date>?;
 
     public func getContext() -> SharedContext? {
-        if let storage = try? DiskStorage(config: DiskConfig(name: "UntisWA", expiry: .never), transformer: TransformerFactory.forCodable(ofType: SharedContext.self)) {
+        if let storage = try? DiskStorage<String, SharedContext>(config: DiskConfig(name: "UntisWA", expiry: .never), transformer: TransformerFactory.forCodable(ofType: SharedContext.self)) {
             if let sharedContext: SharedContext = try? storage.object(forKey: "context") {
                 return sharedContext;
             }
@@ -62,12 +62,12 @@ class BackgroundUtility {
         }
     }
 
-    func getBackgroundTaskDiskStorage() -> DiskStorage<Date>? {
+    func getBackgroundTaskDiskStorage() -> DiskStorage<String, Date>? {
         if self.backgroundTaskDiskStorage != nil {
             return self.backgroundTaskDiskStorage;
         }
         let diskConfig = DiskConfig(name: "UntisBackgroundTaskStorage", expiry: .never);
-        guard let backgroundTaskStorage = try? DiskStorage(config: diskConfig, transformer: TransformerFactory.forCodable(ofType: Date.self)) else {
+        guard let backgroundTaskStorage = try? DiskStorage<String, Date>(config: diskConfig, transformer: TransformerFactory.forCodable(ofType: Date.self)) else {
             return nil;
         }
         self.backgroundTaskDiskStorage = backgroundTaskStorage;

diff --git a/Watch/Info.plist b/Watch/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>UISupportedInterfaceOrientations</key>

diff --git a/WebUntis/Client/Authenticator.swift b/WebUntis/Client/Authenticator.swift
@@ -10,10 +10,10 @@ import Alamofire
 import Cache
 
 class UntisAuthenticator: Authenticator {
-    let cache: Storage<AuthSession>?;
+    let cache: Storage<String, AuthSession>?;
     let key: String;
 
-    init(storage: Storage<AuthSession>?, key: String) {
+    init(storage: Storage<String, AuthSession>?, key: String) {
         self.cache = storage;
         self.key = key;
     }

diff --git a/WebUntis/Client/UntisClient.swift b/WebUntis/Client/UntisClient.swift
@@ -12,7 +12,7 @@ import Cache
 class UntisClient {
     private var credentials: BasicUntisCredentials;
     private var session: Session;
-    private var storage: Storage<String>?;
+    private var storage: Storage<String, String>?;
     private var disableCache: Bool = false;
     private lazy var intSerializer: UntisIntSerializer = UntisIntSerializer();
     private lazy var objectSerializer: UntisObjectSerializer = UntisObjectSerializer();
@@ -30,7 +30,7 @@ class UntisClient {
         } catch {
             self.disableCache = true;
         }
-        let authStorage: Storage<AuthSession>? = self.storage?.transformCodable(ofType: AuthSession.self);
+        let authStorage: Storage<String, AuthSession>? = self.storage?.transformCodable(ofType: AuthSession.self);
         let authKey: String = "\(self.credentials.username):\(self.credentials.school)@\(self.credentials.server)->AUTH";
         let authenticator: UntisAuthenticator = UntisAuthenticator(storage: authStorage, key: authKey);