Merge pull request #4 from GeorgeLyon/dev/george/remove-sdk-argument

Remove sdk argument

.devcontainer/default/devcontainer.json

@@ -11,7 +11,7 @@
 
   "mounts": [
     /// Keep build products on a volume for performance and to separate host and guest build artifacts
-    "source=${localWorkspaceFolderBasename}-build,target=${containerWorkspaceFolder}/.build,type=volume",
+    "source=${localWorkspaceFolderBasename}-build,target=${containerWorkspaceFolder}/.build,type=volume"
   ],
 
   "remoteEnv": {

.github/workflows/Build and Test (Package).yml

@@ -14,13 +14,13 @@ jobs:
       matrix:
         xcode-version:
           - "16"
-        swift-configuration:
+        build-configuration:
           - "debug"
           - "release"
 
     runs-on: macos-15
 
-    name: Build and Test (macOS, ${{ matrix.swift-configuration }})
+    name: Build and Test (macOS, ${{ matrix.build-configuration }})
 
     steps:
       - name: Checkout
@@ -31,15 +31,15 @@ jobs:
 
       - name: Build
         run: |
-          swift build --configuration ${{ matrix.swift-configuration }}
+          swift build --configuration ${{ matrix.build-configuration }}
 
       - name: Build Tests
-        if: matrix.swift-configuration == 'debug'
+        if: matrix.build-configuration == 'debug'
         run: |
-          swift build --build-tests --configuration ${{ matrix.swift-configuration }}
+          swift build --build-tests --configuration ${{ matrix.build-configuration }}
 
       - name: Test
-        if: matrix.swift-configuration == 'debug'
+        if: matrix.build-configuration == 'debug'
         run: |
           swift test --skip-build
       
@@ -52,9 +52,9 @@ jobs:
     strategy:
       matrix:
         devcontainer-name: ["default"]
-        swift-configuration: ["debug", "release"]
+        build-configuration: ["debug", "release"]
 
-    name: Build and Test (devcontainer/${{ matrix.devcontainer-name }}, ${{ matrix.swift-configuration }})
+    name: Build and Test (devcontainer/${{ matrix.devcontainer-name }}, ${{ matrix.build-configuration }})
 
     runs-on: ubuntu-latest
 
@@ -77,19 +77,19 @@ jobs:
         with:
           push: never
           runCmd: |
-            swift build --configuration ${{ matrix.swift-configuration }}
+            swift build --configuration ${{ matrix.build-configuration }}
 
       - name: Build Tests
-        if: matrix.swift-configuration == 'debug'
+        if: matrix.build-configuration == 'debug'
         uses: devcontainers/[email protected]
         with:
           push: never
           runCmd: |
-            swift build --build-tests --configuration ${{ matrix.swift-configuration }}
+            swift build --build-tests --configuration ${{ matrix.build-configuration }}
 
       - name: Test
         uses: devcontainers/[email protected]
-        if: matrix.swift-configuration == 'debug'
+        if: matrix.build-configuration == 'debug'
         with:
           push: never
           runCmd: |

.github/workflows/Build and Test (Xcode App).yml

@@ -18,17 +18,15 @@ jobs:
         xcode-configuration:
           - name: iOS Simulator
             destination: "platform=iOS Simulator,name=iPhone 16"
-            sdk: "iphonesimulator"
           - name: macOS
             destination: "platform=macOS"
-            sdk: "macosx"
-        swift-configuration:
-          - "debug"
-          - "release"
+        build-configuration:
+          - "Debug"
+          - "Release"
 
     runs-on: macos-15
 
-    name: Build and Test (${{ matrix.xcode-configuration.name }}, ${{ matrix.swift-configuration }})
+    name: Build and Test (${{ matrix.xcode-configuration.name }}, ${{ matrix.build-configuration }})
 
     steps:
       - name: Checkout
@@ -40,38 +38,35 @@ jobs:
       - name: Build
         run: |
           xcrun xcodebuild clean build \
-            -workspace .xcode/SwiftProjectTemplate.xcworkspace \
+            -workspace SwiftProjectTemplate.xcworkspace \
             -scheme SwiftProjectTemplateApp \
             -derivedDataPath ".build/Xcode.noindex/DerivedData" \
-            -configuration "${{ matrix.swift-configuration }}" \
-            -sdk "${{ matrix.xcode-configuration.sdk }}" \
+            -configuration "${{ matrix.build-configuration }}" \
             -destination "${{ matrix.xcode-configuration.destination }}"
 
       - name: SwiftPM Tests
-        if: matrix.swift-configuration == 'debug'
+        if: matrix.build-configuration == 'Debug'
         run: |
           xcrun xcodebuild test \
-            -workspace .xcode/SwiftProjectTemplate.xcworkspace \
+            -workspace SwiftProjectTemplate.xcworkspace \
             -scheme SwiftProjectTemplateAppPackage \
             -derivedDataPath ".build/Xcode.noindex/DerivedData" \
-            -configuration "${{ matrix.swift-configuration }}" \
-            -sdk "${{ matrix.xcode-configuration.sdk }}" \
+            -configuration "${{ matrix.build-configuration }}" \
             -destination "${{ matrix.xcode-configuration.destination }}"
 
       - name: UI Tests
         run: |
           xcrun xcodebuild test \
-            -workspace .xcode/SwiftProjectTemplate.xcworkspace \
+            -workspace SwiftProjectTemplate.xcworkspace \
             -scheme SwiftProjectTemplateAppUITests \
             -derivedDataPath ".build/Xcode.noindex/DerivedData" \
-            -configuration "${{ matrix.swift-configuration }}" \
-            -sdk "${{ matrix.xcode-configuration.sdk }}" \
+            -configuration "${{ matrix.build-configuration }}" \
             -destination "${{ matrix.xcode-configuration.destination }}"
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
         with:
-          name: Test Results (${{ matrix.xcode-configuration.name }}, ${{ matrix.swift-configuration }})
+          name: Test Results (${{ matrix.xcode-configuration.name }}, ${{ matrix.build-configuration }})
           path: .build/Xcode.noindex/DerivedData/Logs/Test
 
       - name: Check that repository is clean