From 1a754471185e0d80da32ffd2a12f444eebcc690e Mon Sep 17 00:00:00 2001
From: Ian Leitch <ian@leitch.io>
Date: Sun, 25 Jun 2023 16:35:47 +0200
Subject: [PATCH] Add Xcode 15 to test matrix

---
 .github/workflows/test.yml                    | 11 ++-
 .../SwiftUIProject.xcodeproj/project.pbxproj  | 12 ++-
 .../xcschemes/SwiftUIProject.xcscheme         | 77 +++++++++++++++++++
 .../UIKitProject.xcodeproj/project.pbxproj    | 14 +++-
 4 files changed, 106 insertions(+), 8 deletions(-)
 create mode 100644 Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/xcshareddata/xcschemes/SwiftUIProject.xcscheme

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e3f7964a0..d8c918d22 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,9 +15,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["14.3"]
+        xcode: ["15.0", "14.3.1"]
         include:
-          - xcode: "14.3"
+          - xcode: "15.0"
+            macos: macOS-13
+          - xcode: "14.3.1"
             macos: macOS-13
     runs-on: ${{ matrix.macos }}
     name: macOS
@@ -53,8 +55,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.8"]
+        swift: ["5.9", "5.8"]
         include:
+          - swift: "5.9"
+            container: "swiftlang/swift:nightly-5.9-jammy"
+            cache-version: 1
           - swift: "5.8"
             container: "swift:5.8"
             cache-version: 1
diff --git a/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/project.pbxproj b/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/project.pbxproj
index 1554d837e..a9a616845 100644
--- a/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/project.pbxproj
+++ b/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/project.pbxproj
@@ -294,8 +294,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.peripheryapp.SwiftUIProject;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				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,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -316,8 +320,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.peripheryapp.SwiftUIProject;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				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,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};
diff --git a/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/xcshareddata/xcschemes/SwiftUIProject.xcscheme b/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/xcshareddata/xcschemes/SwiftUIProject.xcscheme
new file mode 100644
index 000000000..4ba2bd690
--- /dev/null
+++ b/Tests/XcodeTests/SwiftUIProject/SwiftUIProject.xcodeproj/xcshareddata/xcschemes/SwiftUIProject.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "3C388865266D0CEE00E6F3AF"
+               BuildableName = "SwiftUIProject.app"
+               BlueprintName = "SwiftUIProject"
+               ReferencedContainer = "container:SwiftUIProject.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3C388865266D0CEE00E6F3AF"
+            BuildableName = "SwiftUIProject.app"
+            BlueprintName = "SwiftUIProject"
+            ReferencedContainer = "container:SwiftUIProject.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "3C388865266D0CEE00E6F3AF"
+            BuildableName = "SwiftUIProject.app"
+            BlueprintName = "SwiftUIProject"
+            ReferencedContainer = "container:SwiftUIProject.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Tests/XcodeTests/UIKitProject/UIKitProject.xcodeproj/project.pbxproj b/Tests/XcodeTests/UIKitProject/UIKitProject.xcodeproj/project.pbxproj
index dcf5bcc90..174d398c5 100644
--- a/Tests/XcodeTests/UIKitProject/UIKitProject.xcodeproj/project.pbxproj
+++ b/Tests/XcodeTests/UIKitProject/UIKitProject.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -790,8 +790,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.peripheryapp.UIKitProject;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				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,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
 		};
@@ -813,8 +817,12 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.peripheryapp.UIKitProject;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				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,2";
+				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
 		};