[Chore] Update minimum supported iOS version to 14 (#41)

michaelhenry · Jul 20, 2023 · e318b9e · e318b9e
1 parent 175ac0b
commit e318b9e
Show file tree

Hide file tree

Showing 24 changed files with 825 additions and 1,015 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,7 +32,7 @@ jobs:
           ${{ env.DERIVEDDATA_PATH }}/SourcePackages/checkouts/
         key: ${{ runner.os }}-${{ hashFiles('**/Package.resolved') }}
 
-    - run: xcodebuild test -project Demo/Demo.xcodeproj -scheme Demo -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -enableCodeCoverage YES -derivedDataPath ${{ env.DERIVEDDATA_PATH }} | xcpretty
+    - run: set -o pipefail && xcodebuild test -project Demo/Demo.xcodeproj -scheme Demo -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 13' -enableCodeCoverage YES -derivedDataPath ${{ env.DERIVEDDATA_PATH }} | xcpretty
     - uses: michaelhenry/swifty-code-coverage@v1.0.1
       with:
         build-path: ${{ env.DERIVEDDATA_PATH }}

diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
@@ -21,7 +21,6 @@
 		999353C5290EDFB700E79302 /* SampleKeyValueProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 999353C4290EDFB700E79302 /* SampleKeyValueProvider.swift */; };
 		999353C72911646400E79302 /* MockKeyValueProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 999353C62911646400E79302 /* MockKeyValueProvider.swift */; };
 		999353C92911647B00E79302 /* MockKeyValueStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 999353C82911647B00E79302 /* MockKeyValueStore.swift */; };
-		99AFB8A22955C7BB009C1A56 /* RxTest in Frameworks */ = {isa = PBXBuildFile; productRef = 99AFB8A12955C7BB009C1A56 /* RxTest */; };
 		99C7400D2912A4640039CA69 /* UserDefaults++.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C7400C2912A4640039CA69 /* UserDefaults++.swift */; };
 		99CD39752902EC7E003CE496 /* SnapshotTesting in Frameworks */ = {isa = PBXBuildFile; productRef = 99CD39742902EC7E003CE496 /* SnapshotTesting */; };
 		99CD39772902EC92003CE496 /* SnapshotTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99CD39762902EC92003CE496 /* SnapshotTests.swift */; };
@@ -72,7 +71,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				992081A429018B1C009263C5 /* XConfigs in Frameworks */,
-				99AFB8A22955C7BB009C1A56 /* RxTest in Frameworks */,
 				99CD39752902EC7E003CE496 /* SnapshotTesting in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -192,7 +190,6 @@
 			packageProductDependencies = (
 				992081A329018B1C009263C5 /* XConfigs */,
 				99CD39742902EC7E003CE496 /* SnapshotTesting */,
-				99AFB8A12955C7BB009C1A56 /* RxTest */,
 			);
 			productName = DemoTests;
 			productReference = 9920816E28F837DD009263C5 /* DemoTests.xctest */;
@@ -228,7 +225,6 @@
 			mainGroup = 9920814F28F837DC009263C5;
 			packageReferences = (
 				99CD39732902EC7E003CE496 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */,
-				99AFB8A02955C7BB009C1A56 /* XCRemoteSwiftPackageReference "RxSwift" */,
 			);
 			productRefGroup = 9920815928F837DC009263C5 /* Products */;
 			projectDirPath = "";
@@ -444,7 +440,7 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -472,7 +468,7 @@
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -557,14 +553,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		99AFB8A02955C7BB009C1A56 /* XCRemoteSwiftPackageReference "RxSwift" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/ReactiveX/RxSwift";
-			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 6.6.0;
-			};
-		};
 		99CD39732902EC7E003CE496 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/pointfreeco/swift-snapshot-testing.git";
@@ -584,11 +572,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = XConfigs;
 		};
-		99AFB8A12955C7BB009C1A56 /* RxTest */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 99AFB8A02955C7BB009C1A56 /* XCRemoteSwiftPackageReference "RxSwift" */;
-			productName = RxTest;
-		};
 		99CD39742902EC7E003CE496 /* SnapshotTesting */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 99CD39732902EC7E003CE496 /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;

diff --git a/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Demo/Demo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -2,21 +2,21 @@
   "object": {
     "pins": [
       {
-        "package": "DiffableDataSources",
-        "repositoryURL": "https://github.com/ra1028/DiffableDataSources",
+        "package": "CombineCocoa",
+        "repositoryURL": "https://github.com/CombineCommunity/CombineCocoa",
         "state": {
           "branch": null,
-          "revision": "a457cf63456b3aeec2a3626af0230c98b0733927",
-          "version": "0.5.0"
+          "revision": "7300c75ff9e072aa7fd0fccefcc88f74aae9bf56",
+          "version": "0.4.1"
         }
       },
       {
-        "package": "DifferenceKit",
-        "repositoryURL": "https://github.com/ra1028/DifferenceKit.git",
+        "package": "CombineExt",
+        "repositoryURL": "https://github.com/CombineCommunity/CombineExt",
         "state": {
           "branch": null,
-          "revision": "62745d7780deef4a023a792a1f8f763ec7bf9705",
-          "version": "1.2.0"
+          "revision": "d7b896fa9ca8b47fa7bcde6b43ef9b70bf8c1f56",
+          "version": "1.8.1"
         }
       },
       {
@@ -38,12 +38,21 @@
         }
       },
       {
-        "package": "RxSwift",
-        "repositoryURL": "https://github.com/ReactiveX/RxSwift",
+        "package": "SwiftDocCPlugin",
+        "repositoryURL": "https://github.com/apple/swift-docc-plugin",
         "state": {
           "branch": null,
-          "revision": "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
-          "version": "6.6.0"
+          "revision": "26ac5758409154cc448d7ab82389c520fa8a8247",
+          "version": "1.3.0"
+        }
+      },
+      {
+        "package": "SymbolKit",
+        "repositoryURL": "https://github.com/apple/swift-docc-symbolkit",
+        "state": {
+          "branch": null,
+          "revision": "b45d1f2ed151d057b54504d653e0da5552844e34",
+          "version": "1.0.0"
         }
       },
       {