Add deployment targets to samples (#570)

* Add deployment targets to samples * Define versions once * Remove visionOS platform installation
kstenerud · Sep 21, 2024 · aff9901 · aff9901
1 parent d5bf3ba
commit aff9901
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 26 deletions.
diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml
@@ -41,15 +41,6 @@ jobs:
         with:
           xcode-version: latest-stable
 
-      - name: Install visionOS Platform
-        if: matrix.platform == 'visionOS'
-        shell: bash
-        run: |
-          # See https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070
-          defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES
-          defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES
-          xcodebuild -downloadPlatform visionOS
-
       - name: Install Tuist
         run: |
           brew tap tuist/tuist

diff --git a/.github/workflows/cocoapods-lint.yml b/.github/workflows/cocoapods-lint.yml
@@ -59,15 +59,6 @@ jobs:
         with:
           xcode-version: latest-stable
 
-      - name: Install visionOS Platform
-        if: matrix.platform == 'visionOS'
-        shell: bash
-        run: |
-          # See https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070
-          defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES
-          defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES
-          xcodebuild -downloadPlatform visionOS
-
       - name: Lint Podspec
         id: lint
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,14 +27,6 @@ jobs:
         with:
           xcode-version: latest-stable
 
-      - name: Install visionOS Platform
-        shell: bash
-        run: |
-          # See https://github.com/actions/runner-images/issues/8144#issuecomment-1902072070
-          defaults write com.apple.dt.Xcode AllowUnsupportedVisionOSHost -bool YES
-          defaults write com.apple.CoreSimulator AllowUnsupportedVisionOSHost -bool YES
-          xcodebuild -downloadPlatform visionOS
-
       - name: Update version in podspec
         run: sed -i '' 's/s.version      = "[^"]*"/s.version      = "${{ github.event.inputs.version }}"/' KSCrash.podspec
 

diff --git a/Samples/Project.swift b/Samples/Project.swift
@@ -11,6 +11,7 @@ let project = Project(
             destinations: .allForSample,
             product: .app,
             bundleId: "com.github.kstenerud.KSCrash.Sample",
+            deploymentTargets: .allForSample,
             infoPlist: InfoPlist.extendingDefault(with: [
                 "UILaunchScreen": [
                     "UIImageName": "LaunchImage",
@@ -31,6 +32,7 @@ let project = Project(
             destinations: .allForSample.subtracting(.visionOS),
             product: .uiTests,
             bundleId: "com.github.kstenerud.KSCrash.Sample.Tests",
+            deploymentTargets: .allForSample.excludingVisionOS,
             sources: ["Tests/**"],
             dependencies: [
                 .target(name: "Sample"),
@@ -64,3 +66,21 @@ extension Set where Element == ProjectDescription.Destination {
         return sets.reduce(.init()) { $0.union($1) }
     }
 }
+
+extension DeploymentTargets {
+    static var allForSample: Self {
+        .multiplatform(
+            iOS: "15.0",
+            macOS: "13.0",
+            watchOS: "8.0",
+            tvOS: "15.0",
+            visionOS: "1.0"
+        )
+    }
+
+    var excludingVisionOS: Self {
+        var excluded = self
+        excluded.visionOS = nil
+        return excluded
+    }
+}