IOS-639 Xcode 15 upgrade, drop iOS 11 support

ettore · ettore · commit 6085d5c488b9 · 2024-02-05T10:05:31.000-08:00
Fix deprecations from dropping iOS 11.
diff --git a/Axis-iOS b/Axis-iOS
@@ -1 +1 @@
-Subproject commit 0f8ddb023ecf096b01fb835c10ca27d9b29a2795
+Subproject commit 970f51225fc57315bdfb695cb99b333cfcbfab94
diff --git a/CardCreator-iOS b/CardCreator-iOS
@@ -1 +1 @@
-Subproject commit 4acdfb4317f7979abc193e444d9e399e2f9029e6
+Subproject commit 854a0257129deaa639d436e43310091259ff44a7
diff --git a/NYPLAEToolkit b/NYPLAEToolkit
@@ -1 +1 @@
-Subproject commit 3795dd42cddd56696e47f2eabc722500ed2188cf
+Subproject commit 6fc1c3285c9095f6c36470d69ca25272a817372a
diff --git a/NYPLAudiobookToolkit b/NYPLAudiobookToolkit
@@ -1 +1 @@
-Subproject commit 851bcc57258ae92a6d76208704efc68e852773c6
+Subproject commit 5194fc4b3545cd3efc011ba2f6be27b0307cc920
diff --git a/RDServices.xcodeproj/project.pbxproj b/RDServices.xcodeproj/project.pbxproj
@@ -537,7 +537,7 @@
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/dp/public\"",
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/xml/uft/public\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
@@ -590,7 +590,7 @@
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/dp/public\"",
 					"\"$(NYPLADEPT_ADOBE_SDK)/DRM_Connector_Prerelease/xml/uft/public\"",
 				);
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
 				VALIDATE_PRODUCT = YES;
diff --git a/RDServices.xcodeproj/xcshareddata/xcschemes/RDServices.xcscheme b/RDServices.xcodeproj/xcshareddata/xcschemes/RDServices.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplified.xcodeproj/project.pbxproj b/Simplified.xcodeproj/project.pbxproj
@@ -4936,7 +4936,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -4991,7 +4991,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -5037,7 +5037,7 @@
 				MARKETING_VERSION = 3.9.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					"-ld64",
+					"-ld_classic",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
 				PROVISIONING_PROFILE = "2e185b6c-271e-4b02-a05e-860b8c3831f6";
@@ -5090,7 +5090,7 @@
 				MARKETING_VERSION = 3.9.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
-					"-ld64",
+					"-ld_classic",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = org.nypl.labs.SimplyE;
 				PROVISIONING_PROFILE = "b3d9154d-70e1-48d6-a0c5-869431277a5c";
diff --git a/Simplified.xcodeproj/xcshareddata/xcschemes/Open eBooks.xcscheme b/Simplified.xcodeproj/xcshareddata/xcschemes/Open eBooks.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE-R2dev.xcscheme b/Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE-R2dev.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE-noDRM.xcscheme b/Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE-noDRM.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE.xcscheme b/Simplified.xcodeproj/xcshareddata/xcschemes/SimplyE.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Simplified/Announcements/NYPLAnnouncementBusinessLogic.swift b/Simplified/Announcements/NYPLAnnouncementBusinessLogic.swift
@@ -27,9 +27,11 @@ class NYPLAnnouncementBusinessLogic {
   // MARK: - Read
     
   private func restorePresentedAnnouncements() {
-    guard let filePathURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.appendingPathComponent(announcementsFilename),
+    guard 
+      let filePathURL = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.appendingPathComponent(announcementsFilename),
       let filePathData = try? Data(contentsOf: filePathURL),
-      let unarchived = try? NSKeyedUnarchiver.unarchiveTopLevelObjectWithData(filePathData),
+      let unarchived = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSSet.self, 
+                                                               from: filePathData),
       let presented = unarchived as? Set<String> else {
         return
     }
@@ -61,7 +63,9 @@ class NYPLAnnouncementBusinessLogic {
     }
     
     do {
-      let codedData = NSKeyedArchiver.archivedData(withRootObject: presentedAnnouncements)
+      let codedData = try NSKeyedArchiver
+        .archivedData(withRootObject: presentedAnnouncements,
+                      requiringSecureCoding: false)
       try codedData.write(to: filePathURL)
     } catch {
       NYPLErrorLogger.logError(error,
diff --git a/Simplified/ErrorHandling/ProblemReportEmail.swift b/Simplified/ErrorHandling/ProblemReportEmail.swift
@@ -59,6 +59,8 @@ import UIKit
       idiom = "tv"
     case .mac:
       idiom = "mac"
+    case .vision:
+      idiom = "vision"
     case .unspecified:
       fallthrough
     @unknown default:
diff --git a/Simplified/Keychain/NYPLKeychain.m b/Simplified/Keychain/NYPLKeychain.m
@@ -35,8 +35,14 @@ - (id)objectForKey:(NSString *const)key
 
 - (id)objectForKey:(NSString *const)key accessGroup:(NSString *const)groupID
 {
-  NSData *const keyData = [NSKeyedArchiver archivedDataWithRootObject:key];
-  
+  NSError *error = nil;
+  NSData *const keyData = [NSKeyedArchiver archivedDataWithRootObject:key
+                                                requiringSecureCoding:NO
+                                                                error:&error];
+  if (error) {
+    NYPLLOG_F(@"Error archiving key [%@] while reading from keychain: %@", key, error);
+  }
+
   NSMutableDictionary *const dictionary = [self defaultDictionary];
   dictionary[(__bridge __strong id) kSecAttrAccount] = keyData;
   dictionary[(__bridge __strong id) kSecMatchLimit] = (__bridge id) kSecMatchLimitOne;
@@ -61,9 +67,24 @@ - (void)setObject:(id)value forKey:(NSString *)key
 
 - (void)setObject:(id const)value forKey:(NSString *const)key accessGroup:(NSString *const)groupID
 {
-  NSData *const keyData = [NSKeyedArchiver archivedDataWithRootObject:key];
-  NSData *const valueData = [NSKeyedArchiver archivedDataWithRootObject:value];
-  
+  NSError *error = nil;
+  NSData *const keyData = [NSKeyedArchiver archivedDataWithRootObject:key
+                                                requiringSecureCoding:NO
+                                                                error:&error];
+  if (error) {
+    NYPLLOG_F(@"Error archiving key [%@] while writing to keychain: %@", 
+              key, error);
+    error = nil;
+  }
+
+  NSData *const valueData = [NSKeyedArchiver archivedDataWithRootObject:value
+                                                  requiringSecureCoding:NO
+                                                                  error:&error];
+  if (error) {
+    NYPLLOG_F(@"Error archiving value [%@] for key [%@] while writing to keychain: %@",
+              value, key, error);
+  }
+
   NSMutableDictionary *const queryDictionary = [self defaultDictionary];
   queryDictionary[(__bridge __strong id) kSecAttrAccount] = keyData;
   if (groupID) {
@@ -98,8 +119,15 @@ - (void)removeObjectForKey:(NSString *const)key
 
 - (void)removeObjectForKey:(NSString *const)key accessGroup:(NSString *const)groupID
 {
-  NSData *const keyData = [NSKeyedArchiver archivedDataWithRootObject:key];
-  
+  NSError *error = nil;
+  NSData *const keyData = [NSKeyedArchiver archivedDataWithRootObject:key
+                                                requiringSecureCoding:NO
+                                                                error:&error];
+  if (error) {
+    NYPLLOG_F(@"Error archiving key [%@] while removing from keychain: %@", 
+              key, error);
+  }
+
   NSMutableDictionary *const dictionary = [self defaultDictionary];
   dictionary[(__bridge __strong id) kSecAttrAccount] = keyData;
   if (groupID) {
diff --git a/Simplified/Keychain/NYPLKeychainManager.swift b/Simplified/Keychain/NYPLKeychainManager.swift
@@ -105,11 +105,12 @@ import Foundation
       guard let array = result as? Array<Dictionary<String, Any>> else { return values }
       for item in array {
         if let keyData = item[kSecAttrAccount as String] as? Data,
-          let valueData = item[kSecValueData as String] as? Data,
-          let keyString = NSKeyedUnarchiver.unarchiveObject(with: keyData) as? String {
-            Log.debug(#file, "Value found for keychain key: \(keyString)")
-            let value = NSKeyedUnarchiver.unarchiveObject(with: valueData) as AnyObject
-            values[keyString] = value
+           let valueData = item[kSecValueData as String] as? Data,
+           let keyString = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSString.self, 
+                                                                   from: keyData) 
+        {
+          let value = NSKeyedUnarchiver.unarchiveObject(with: valueData) as? AnyObject
+          values[keyString as String] = value
         }
       }
     }
@@ -141,10 +142,12 @@ import Foundation
       guard let array = result as? Array<Dictionary<String, Any>> else { return }
       for item in array {
         if let keyData = item[kSecAttrAccount as String] as? Data,
-          let valueData = item[kSecValueData as String] as? Data,
-          let keyString = NSKeyedUnarchiver.unarchiveObject(with: keyData) as? String {
+           let valueData = item[kSecValueData as String] as? Data,
+           let keyString = try? NSKeyedUnarchiver.unarchivedObject(ofClass: NSString.self,
+                                                                   from: keyData)
+        {
           let value = NSKeyedUnarchiver.unarchiveObject(with: valueData) as AnyObject
-          values[keyString] = value
+          values[keyString as String] = value
         }
       }
     }
diff --git a/adept-ios b/adept-ios
@@ -1 +1 @@
-Subproject commit 1d7f97f6bc44d7ed52267b30fe392f907d46416f
+Subproject commit 059824f065b5c9b52fb0a714425e836f06346adb
diff --git a/readium-sdk b/readium-sdk
@@ -1 +1 @@
-Subproject commit 49be227739d957c779660053bbde6ceada164c00
+Subproject commit a0f4e1b21d5594cfb119d1bdbdcc943531a9d70c
diff --git a/tenprintcover-ios b/tenprintcover-ios
@@ -1 +1 @@
-Subproject commit 56fbb5850df5b136243df6331723a87ad0629440
+Subproject commit 67ef31c4f431ca9f6159707dcedc5244082acc26
