CI: fix and run tests on all Apple platforms

.github/workflows/ci.yml

@@ -28,14 +28,16 @@ jobs:
 
       - name: SwiftFormat Lint
         run: swiftformat --lint . --reporter github-actions-log
-  macOS:
+  apple:
+    if: github.event_name != 'pull_request' || !contains(github.event.pull_request.title, '[skip ci]')
     name: ${{ matrix.platform }} (Swift ${{ matrix.swift }})
     runs-on: macos-15
     strategy:
       fail-fast: false
       matrix:
         platform:
           - iOS
+          - mac-catalyst
           - macOS
           - tvOS
           - watchOS
@@ -48,6 +50,13 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v5
 
+      - name: Select Xcode version
+        uses: mxcl/xcodebuild@v3
+        with:
+          swift: ~${{ matrix.swift }}
+          action: none
+          verbosity: xcbeautify
+
       - name: Disable SwiftSyntax Prebuilts
         run: |
           defaults write com.apple.dt.Xcode IDEPackageEnablePrebuilts -bool NO
@@ -57,23 +66,15 @@ jobs:
           rm -rf ~/Library/Developer/Xcode/SourcePackages
           rm -rf ~/Library/Caches/org.swift.swiftpm
 
-      - name: Select Xcode version
-        uses: mxcl/xcodebuild@v3
-        with:
-          swift: ~${{ matrix.swift }}
-          action: none
-          verbosity: xcbeautify
-
-      - if: ${{ matrix.platform != 'macOS' }}
+      - if: ${{ matrix.platform != 'macOS' && matrix.platform != 'mac-catalyst' }}
         name: Download Default Runtime
         run: xcodebuild -downloadPlatform ${{ matrix.platform }}
 
-      - name: Test Library
+      - name: Run Tests
         uses: mxcl/xcodebuild@v3
         with:
           platform: ${{ matrix.platform }}
           swift: ~${{ matrix.swift }}
           action: test
-          workspace: ObjCRuntimeTools.xcworkspace
           scheme: ObjCRuntimeTools
           verbosity: xcbeautify

.gitignore

@@ -1,7 +1,8 @@
 .DS_Store
 /.build
 /Packages
-/.swiftpm
 xcuserdata/
 DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc

Package.swift

@@ -49,6 +49,9 @@ package.targets += [
 			"Association",
 			"AssociationMacro",
 			.product(name: "MacroTesting", package: "swift-macro-testing"),
+			// For some reason, with Swift Syntax prebuilts enabled, we need to depend on SwiftCompilerPlugin here to work around error:
+			// Compilation search paths unable to resolve module dependency: 'SwiftCompilerPlugin'
+			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
 		]
 	),
 ]
@@ -75,6 +78,9 @@ package.targets += [
 			"Swizzling",
 			"SwizzlingMacro",
 			.product(name: "MacroTesting", package: "swift-macro-testing"),
+			// For some reason, with Swift Syntax prebuilts enabled, we need to depend on SwiftCompilerPlugin here to work around error:
+			// Compilation search paths unable to resolve module dependency: 'SwiftCompilerPlugin'
+			.product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
 		]
 	),
 ]