Merge pull request #78 from essentialdevelopercom/xcode15_2

Update CI to run with Xcode 15.2
essentialdevelopercom · Jan 28, 2024 · 83253f6 · 83253f6
2 parents ff041d6 + 452bc0b
commit 83253f6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/.github/workflows/CI-iOS.yml b/.github/workflows/CI-iOS.yml
@@ -14,15 +14,15 @@ jobs:
     # The type of runner that the job will run on
     runs-on: macos-13-xlarge
 
-    timeout-minutes: 12
+    timeout-minutes: 8
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v4
 
     - name: Select Xcode
-      run: sudo xcode-select -switch /Applications/Xcode_15.1.app
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
 
     - name: Xcode version
       run: /usr/bin/xcodebuild -version

diff --git a/.github/workflows/CI-macOS.yml b/.github/workflows/CI-macOS.yml
@@ -14,15 +14,15 @@ jobs:
     # The type of runner that the job will run on
     runs-on: macos-13
 
-    timeout-minutes: 10
+    timeout-minutes: 8
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v4
 
     - name: Select Xcode
-      run: sudo xcode-select -switch /Applications/Xcode_15.1.app
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
 
     - name: Xcode version
       run: /usr/bin/xcodebuild -version

diff --git a/.github/workflows/Deploy.yml b/.github/workflows/Deploy.yml
@@ -36,7 +36,7 @@ jobs:
         security set-key-partition-list -S apple-tool:,apple: -s -k "" ~/Library/Keychains/build.keychain
 
     - name: Select Xcode
-      run: sudo xcode-select -switch /Applications/Xcode_15.1.app
+      run: sudo xcode-select -switch /Applications/Xcode_15.2.app
 
     - name: Xcode version
       run: /usr/bin/xcodebuild -version

diff --git a/EssentialApp/EssentialApp.xcodeproj/project.pbxproj b/EssentialApp/EssentialApp.xcodeproj/project.pbxproj
@@ -513,6 +513,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -536,6 +537,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -560,6 +562,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -586,6 +589,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EssentialApp.app/EssentialApp";

diff --git a/EssentialFeed/EssentialFeed.xcodeproj/project.pbxproj b/EssentialFeed/EssentialFeed.xcodeproj/project.pbxproj
@@ -1711,6 +1711,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1745,6 +1746,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALIDATE_PRODUCT = YES;
@@ -1771,6 +1773,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
@@ -1797,6 +1800,7 @@
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				VALIDATE_PRODUCT = YES;

diff --git a/EssentialFeed/EssentialFeediOS/Shared UI/Controllers/ListViewController.swift b/EssentialFeed/EssentialFeediOS/Shared UI/Controllers/ListViewController.swift
@@ -14,7 +14,7 @@ public final class ListViewController: UITableViewController, UITableViewDataSou
 		}
 	}()
 
-	private var onViewIsAppearing: ((ListViewController) -> Void)?
+	private var onViewDidAppear: ((ListViewController) -> Void)?
 
 	public var onRefresh: (() -> Void)?
 
@@ -24,16 +24,16 @@ public final class ListViewController: UITableViewController, UITableViewDataSou
 		configureTableView()
 		configureTraitCollectionObservers()
 
-		onViewIsAppearing = { vc in
-			vc.onViewIsAppearing = nil
+		onViewDidAppear = { vc in
+			vc.onViewDidAppear = nil
 			vc.refresh()
 		}
 	}
 
-	public override func viewIsAppearing(_ animated: Bool) {
-		super.viewIsAppearing(animated)
+	public override func viewDidAppear(_ animated: Bool) {
+		super.viewDidAppear(animated)
 
-		onViewIsAppearing?(self)
+		onViewDidAppear?(self)
 	}
 
 	private func configureTableView() {
@@ -73,11 +73,7 @@ public final class ListViewController: UITableViewController, UITableViewDataSou
 			snapshot.appendItems(cellControllers, toSection: section)
 		}
 
-		if #available(iOS 15.0, *) {
-			dataSource.applySnapshotUsingReloadData(snapshot)
-		} else {
-			dataSource.apply(snapshot)
-		}
+		dataSource.applySnapshotUsingReloadData(snapshot)
 	}
 
 	public func display(_ viewModel: ResourceLoadingViewModel) {