Add test command argument -Xswiftc -plugin-path; fix android-target and android-channel

Author: marcprux

README.md

@@ -87,7 +87,7 @@ Snapshots can be specified with their full name, like "6.1-DEVELOPMENT-SNAPSHOT-
 | run-tests | Whether to run the tests or just perform the build | true |
 | copy-files | Additional files to copy to emulator for testing | |
 | android-emulator-test-folder | Emulator folder where tests are copied | /data/local/tmp/android-xctest |
-| android-api-level | The API level of the Android emulator to run against | 29 |
+| android-api-level | The API level of the Android emulator to run against | 30 |
 | android-channel | SDK component channel: stable, beta, dev, canary | stable |
 | android-profile | Hardware profile used for creating the AVD | pixel |
 | android-target | Target of the system image | aosp_atd |

action.yml

@@ -77,7 +77,7 @@ inputs:
   android-api-level:
     description: 'The API level of the Android emulator to run against'
     required: true
-    default: 29
+    default: 30
   android-channel:
     required: false
     type: string
@@ -236,11 +236,6 @@ runs:
           /usr/sbin/installer -pkg swift.pkg -target CurrentUserHomeDirectory
           SWIFT_INSTALLATION=${HOME}/Library/Developer/Toolchains/${{ steps.setup.outputs.swift-id }}.xctoolchain/usr
           echo "TOOLCHAINS=$(plutil -extract CFBundleIdentifier raw ${SWIFT_INSTALLATION}/Info.plist)" >> $GITHUB_ENV
-
-          # workaround for https://github.com/swiftlang/swift-package-manager/issues/8362
-          cd ${SWIFT_INSTALLATION}
-          cp -f lib/swift/host/plugins/testing/libTestingMacros.dylib lib/swift/host/plugins/ || true
-          cd -
         else
           echo "::error::Unsupported platform: ${RUNNER_OS}"
           exit 1
@@ -302,7 +297,9 @@ runs:
         echo "SWIFT_SDK_BUNDLE=${SWIFT_SDK_BUNDLE}" >> $GITHUB_ENV
 
         echo "swiftroot=${SWIFT_INSTALLATION}" >> $GITHUB_OUTPUT
-        echo "swiftcmd=TARGET_OS_ANDROID=1 SKIP_BRIDGE=1 ${SWIFT_INSTALLATION}/bin/swift build --swift-sdk ${SWIFT_SDK_TARGET} -Xswiftc -DTARGET_OS_ANDROID -Xswiftc -DSKIP_BRIDGE ${{ inputs.swift-build-flags }}" >> $GITHUB_OUTPUT
+
+        # plugin-path is a workaround for https://github.com/swiftlang/swift-package-manager/issues/8362
+        echo "swiftcmd=TARGET_OS_ANDROID=1 SKIP_BRIDGE=1 ${SWIFT_INSTALLATION}/bin/swift build --swift-sdk ${SWIFT_SDK_TARGET} -Xswiftc -plugin-path -Xswiftc ${SWIFT_INSTALLATION}/lib/swift/host/plugins/testing/testing -Xswiftc -DTARGET_OS_ANDROID -Xswiftc -DSKIP_BRIDGE ${{ inputs.swift-build-flags }}" >> $GITHUB_OUTPUT
         echo "swift-sdk=${SWIFT_SDK_TARGET}" >> $GITHUB_OUTPUT
 
     - name: Check Swift Version