Update minimum version to iOS15 (#416)

This updates the minimum version to iOS15 and removes codepaths to explicitly support lower versions. Also updates the project to be consistent with recommendations for the latest xcode, and makes a few changes to be consistent with this.
beeminder · Oct 7, 2023 · 2e2045a · 2e2045a
1 parent dbeb9ed
commit 2e2045a
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 60 deletions.
diff --git a/.github/workflows/fastlane-tests.yml b/.github/workflows/fastlane-tests.yml
@@ -5,9 +5,12 @@ on:
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-13
 
     steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: latest-stable
     - uses: actions/checkout@v4
     - name: Use sample configuration
       run: cp BeeSwift/Config.swift.sample BeeKit/Config.swift

diff --git a/BeeSwift.xcodeproj/project.pbxproj b/BeeSwift.xcodeproj/project.pbxproj
@@ -963,7 +963,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftMigration = 0710;
 				LastSwiftUpdateCheck = 1240;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				ORGANIZATIONNAME = APB;
 				TargetAttributes = {
 					A12E694C1BD3EF0200AB94C2 = {
@@ -1415,7 +1415,7 @@
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = BeeSwiftToday/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1442,7 +1442,7 @@
 				EXCLUDED_ARCHS = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = BeeSwiftToday/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1462,6 +1462,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1493,6 +1494,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				EXCLUDED_ARCHS = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -1509,7 +1511,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PROVISIONING_PROFILE = "";
@@ -1523,6 +1525,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1554,6 +1557,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				EXCLUDED_ARCHS = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1563,7 +1567,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
@@ -1593,7 +1597,7 @@
 				);
 				INFOPLIST_FILE = BeeSwift/Info.plist;
 				INTENTS_CODEGEN_LANGUAGE = Swift;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1630,7 +1634,7 @@
 				GCC_OPTIMIZATION_LEVEL = s;
 				INFOPLIST_FILE = BeeSwift/Info.plist;
 				INTENTS_CODEGEN_LANGUAGE = Swift;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1720,7 +1724,7 @@
 				INFOPLIST_FILE = BeeKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				INTENTS_CODEGEN_LANGUAGE = Swift;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1767,7 +1771,7 @@
 				INFOPLIST_FILE = BeeKit/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				INTENTS_CODEGEN_LANGUAGE = Swift;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1802,7 +1806,7 @@
 				DEVELOPMENT_TEAM = 8TW9V9HVES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = BeeKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1832,7 +1836,7 @@
 				DEVELOPMENT_TEAM = 8TW9V9HVES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = BeeKitTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1866,7 +1870,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = BeeSwiftIntents/Info.plist;
 				INTENTS_CODEGEN_LANGUAGE = Swift;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1901,7 +1905,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = BeeSwiftIntents/Info.plist;
 				INTENTS_CODEGEN_LANGUAGE = Swift;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1930,7 +1934,7 @@
 				DEVELOPMENT_TEAM = 8TW9V9HVES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = BeeSwiftUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1960,7 +1964,7 @@
 				DEVELOPMENT_TEAM = 8TW9V9HVES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = BeeSwiftUITests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwift.xcscheme b/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwift.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/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftIntents.xcscheme b/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftIntents.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftTests.xcscheme b/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftTests.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -67,15 +67,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A196CB2B1AE4142F00B90A3E"
-            BuildableName = "BeeSwiftTests.xctest"
-            BlueprintName = "BeeSwiftTests"
-            ReferencedContainer = "container:BeeSwift.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftToday.xcscheme b/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftToday.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftUITests.xcscheme b/BeeSwift.xcodeproj/xcshareddata/xcschemes/BeeSwiftUITests.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/BeeSwift/ConfigureHKMetricViewController.swift b/BeeSwift/ConfigureHKMetricViewController.swift
@@ -157,7 +157,7 @@ class ConfigureHKMetricViewController : UIViewController {
             do {
                 let _ = try await ServiceLocator.requestManager.put(url: "api/v1/users/\(ServiceLocator.currentUserManager.username!)/goals/\(self.goal.slug).json", parameters: params)
                 hud.mode = .customView
-                hud.customView = UIImageView(image: UIImage(named: "checkmark"))
+                hud.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
                 hud.hide(animated: true, afterDelay: 2)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
                     guard let healthKitConfigController = self.navigationController?.viewControllers.first(where: { vc in vc is HealthKitConfigViewController }) else {

diff --git a/BeeSwift/DatapointValueAccessory.swift b/BeeSwift/DatapointValueAccessory.swift
@@ -34,7 +34,7 @@ class DatapointValueAccessory : UIInputView {
         switch UIDevice.current.userInterfaceIdiom {
         case .pad, .mac:
             return false
-        case .phone, .carPlay, .tv, .unspecified:
+        case .phone, .carPlay, .tv, .vision, .unspecified:
              return true
         @unknown default:
             return true

diff --git a/BeeSwift/EditDatapointViewController.swift b/BeeSwift/EditDatapointViewController.swift
@@ -131,9 +131,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
         let updateButton = UIButton(type: .system)
         self.view.addSubview(updateButton)
         updateButton.setTitle("Update", for: .normal)
-        if #available(iOS 15.0, *) {
-            updateButton.configuration = .filled()
-        }
+        updateButton.configuration = .filled()
         updateButton.addTarget(self, action: #selector(self.updateButtonPressed), for: .touchUpInside)
         updateButton.snp.makeConstraints { (make) in
             make.left.right.equalTo(formView)
@@ -215,7 +213,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
                 let _ = try await ServiceLocator.requestManager.put(url: "api/v1/users/\(ServiceLocator.currentUserManager.username!)/goals/\(self.goalSlug)/datapoints/\(self.datapoint.id).json", parameters: params)
                 let hud = MBProgressHUD.forView(self.view)
                 hud?.mode = .customView
-                hud?.customView = UIImageView(image: UIImage(named: "checkmark"))
+                hud?.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
                 hud?.hide(animated: true, afterDelay: 2)
             } catch {
                 logger.error("Error updating datapoint for goal \(self.goalSlug): \(error)")
@@ -234,7 +232,7 @@ class EditDatapointViewController: UIViewController, UITextFieldDelegate {
 
                 let hud = MBProgressHUD.forView(self.view)
                 hud?.mode = .customView
-                hud?.customView = UIImageView(image: UIImage(named: "checkmark"))
+                hud?.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
                 hud?.hide(animated: true, afterDelay: 2)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
                     self.navigationController?.popViewController(animated: true)

diff --git a/...xcassets/checkmark.imageset/Contents.json → ...ets/BasicCheckmark.imageset/Contents.json b/...xcassets/checkmark.imageset/Contents.json → ...ets/BasicCheckmark.imageset/Contents.json
diff --git a/...s/checkmark.imageset/noun_942794_cc-1.png → ...icCheckmark.imageset/noun_942794_cc-1.png b/...s/checkmark.imageset/noun_942794_cc-1.png → ...icCheckmark.imageset/noun_942794_cc-1.png
diff --git a/...s/checkmark.imageset/noun_942794_cc-2.png → ...icCheckmark.imageset/noun_942794_cc-2.png b/...s/checkmark.imageset/noun_942794_cc-2.png → ...icCheckmark.imageset/noun_942794_cc-2.png
diff --git a/...ets/checkmark.imageset/noun_942794_cc.png → ...asicCheckmark.imageset/noun_942794_cc.png b/...ets/checkmark.imageset/noun_942794_cc.png → ...asicCheckmark.imageset/noun_942794_cc.png
diff --git a/BeeSwift/RemoveHKMetricViewController.swift b/BeeSwift/RemoveHKMetricViewController.swift
@@ -78,7 +78,7 @@ class RemoveHKMetricViewController: UIViewController {
                 self.goal = Goal(json: JSON(responseObject!))
 
                 hud.mode = .customView
-                hud.customView = UIImageView(image: UIImage(named: "checkmark"))
+                hud.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
 
                 NotificationCenter.default.post(name: Notification.Name(rawValue: CurrentUserManager.healthKitMetricRemovedNotificationName), object: self, userInfo: ["goal": self.goal as Any])
 

diff --git a/BeeSwift/SettingsViewController.swift b/BeeSwift/SettingsViewController.swift
@@ -51,26 +51,21 @@ class SettingsViewController: UIViewController {
             versionLabel.text = "Version: Unknown"
         }
 
-        if #available(iOS 15.0, *) {
-            let logsLabel = UILabel()
-            self.view.addSubview(logsLabel)
-            logsLabel.textAlignment = .center
-            logsLabel.text = "Debug Logs »"
-            logsLabel.font = UIFont(name: "Avenir-Light", size: 16)!
-            logsLabel.textColor = .systemBlue
-            logsLabel.isUserInteractionEnabled = true
-            logsLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(showLogsTapped)))
+        let logsLabel = UILabel()
+        self.view.addSubview(logsLabel)
+        logsLabel.textAlignment = .center
+        logsLabel.text = "Debug Logs »"
+        logsLabel.font = UIFont(name: "Avenir-Light", size: 16)!
+        logsLabel.textColor = .systemBlue
+        logsLabel.isUserInteractionEnabled = true
+        logsLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(showLogsTapped)))
 
-            logsLabel.snp.makeConstraints { (make) in
-                make.top.equalTo(versionLabel.snp.bottom).offset(10)
-                make.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottomMargin)
-                make.width.equalTo(self.view)
-            }
-        } else {
-            versionLabel.snp.makeConstraints { (make) in
-                make.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottomMargin).offset(-10)
-            }
+        logsLabel.snp.makeConstraints { (make) in
+            make.top.equalTo(versionLabel.snp.bottom).offset(10)
+            make.bottom.equalTo(self.view.safeAreaLayoutGuide.snp.bottomMargin)
+            make.width.equalTo(self.view)
         }
+
     }
 
     @objc func userDefaultsDidChange() {
@@ -88,9 +83,7 @@ class SettingsViewController: UIViewController {
 
     @objc
     func showLogsTapped() {
-        if #available(iOS 15.0, *) {
-            self.navigationController?.pushViewController(LogsViewController(), animated: true)
-        }
+        self.navigationController?.pushViewController(LogsViewController(), animated: true)
     }
 
 }

diff --git a/BeeSwiftToday/TodayTableViewCell.swift b/BeeSwiftToday/TodayTableViewCell.swift
@@ -180,7 +180,7 @@ class TodayTableViewCell: UITableViewCell {
                     self.pollTimer = nil
                     let hud = MBProgressHUD.forView(self)
                     hud?.mode = .customView
-                    hud?.customView = UIImageView(image: UIImage(named: "checkmark"))
+                    hud?.customView = UIImageView(image: UIImage(named: "BasicCheckmark"))
                     hud?.hide(animated: true, afterDelay: 2)
                     self.valueStepper.value = 0
                     self.valueLabel.text = "0"