- Updated to the latest versions of libraries, et al.

- Tweaked a bit of code to account for deprecated calls. - Upped the iOS version to minimum 13, just to make it less of a support burden. - Updated the dependencies to the latest.
RiftValleySoftware · Feb 1, 2024 · fd3ba20 · fd3ba20
1 parent 009089f
commit fd3ba20
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # RVS_BlueThoth Change Log
 
+## 1.9.5
+
+- **February 1, 2024**
+
+- Updated to the latest versions of libraries, et al.
+- Tweaked a bit of code to account for deprecated calls.
+- Upped the iOS version to minimum 13, just to make it less of a support burden.
+- Updated the dependencies to the latest.
+
+>N.B. Looks like Apple is trying to strongarm us into using SwiftUI for Watch and TV. I'm not really up to rewriting the wole test harness (right now), but I'll probably do that, at some time. Note that the Watch and TV targets may bork, in the test harness.
+
 ## 1.9.4
 
 - **January 6, 2024**

diff --git a/Package.swift b/Package.swift
@@ -27,7 +27,7 @@ import PackageDescription
 let package = Package(
     name: "RVS_BlueThoth",
     platforms: [
-        .iOS(.v11),
+        .iOS(.v13),
         .tvOS(.v11),
         .macOS(.v10_14),
         .watchOS(.v5)
@@ -40,7 +40,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(name: "RVS_Generic_Swift_Toolbox", url: "git@github.com:RiftValleySoftware/RVS_Generic_Swift_Toolbox.git", from: "1.11.0")
+        .package(name: "RVS_Generic_Swift_Toolbox", url: "git@github.com:RiftValleySoftware/RVS_Generic_Swift_Toolbox.git", from: "1.13.1")
     ],
     targets: [
         .target(

diff --git a/RVS_BlueThoth.xcodeproj/project.pbxproj b/RVS_BlueThoth.xcodeproj/project.pbxproj
diff --git a/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth.xcscheme b/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth_Test_Harness_MacOS.xcscheme b/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth_Test_Harness_MacOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth_Test_Harness_WatchOS.xcscheme b/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth_Test_Harness_WatchOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth_Test_Harness_iOS.xcscheme b/RVS_BlueThoth.xcodeproj/xcshareddata/xcschemes/RVS_BlueThoth_Test_Harness_iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/RVS_BlueThoth.xcworkspace/xcshareddata/swiftpm/Package.resolved b/RVS_BlueThoth.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,17 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:RiftValleySoftware/RVS_Generic_Swift_Toolbox.git",
       "state" : {
-        "revision" : "6e12bdb89aed0faab848f8688cd750ddf9a57bc4",
-        "version" : "1.11.0"
+        "revision" : "e85e1e83cdd2f57aacda13b13d75b9edb3252546",
+        "version" : "1.13.1"
       }
     },
     {
       "identity" : "rvs_persistentprefs",
       "kind" : "remoteSourceControl",
       "location" : "git@github.com:RiftValleySoftware/RVS_PersistentPrefs.git",
       "state" : {
-        "revision" : "1c05ac782f65b5c16e0551f0a052763e9e5fddce",
-        "version" : "1.3.4"
+        "revision" : "c6885ac24b20563507a52e6fc4638733af7f5dea",
+        "version" : "1.3.7"
       }
     }
   ],

diff --git a/Tests/RVS_BlueThoth_Test_Harness_iOS/Source/Main/CGA_AppDelegate.swift b/Tests/RVS_BlueThoth_Test_Harness_iOS/Source/Main/CGA_AppDelegate.swift
@@ -69,11 +69,11 @@ class CGA_AppDelegate: UIResponder, UIApplicationDelegate {
             var presentedBy = inPresentingViewController
 
             if nil == presentedBy {
-                presentedBy = (UIApplication.shared.windows.filter { $0.isKeyWindow }.first)?.rootViewController
+                presentedBy = (appDelegateObject?.window?.windowScene?.windows.filter { $0.isKeyWindow }.first)?.rootViewController
             }
 
             if nil == presentedBy {
-                presentedBy = UIApplication.shared.delegate?.window??.rootViewController
+                presentedBy = appDelegateObject?.window?.rootViewController
             }
 
             if nil != presentedBy {