From 5d132f70bc59d9b063111bc0576130064f7f9597 Mon Sep 17 00:00:00 2001
From: Johan Kool <johankool@users.noreply.github.com>
Date: Mon, 9 Dec 2024 19:15:09 +0100
Subject: [PATCH] Android support (#133)

* Compile for Android

* Compile for Android on CI
---
 .github/workflows/ci.yml | 44 ++++++++++++++++++++++++++++++++++++++++
 Package.resolved         |  4 ++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48eeb82..a431b01 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,3 +74,47 @@ jobs:
         run: swift build -c ${{ matrix.config }}
       - name: Run tests (debug only)
         run: swift test
+
+  android:
+    name: Android (Swift 6.0.2)
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+      - name: Install Swift
+        uses: tayloraswift/swift-install-action@master
+        with:
+          swift-prefix: swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE
+          swift-id: swift-6.0.2-RELEASE-ubuntu22.04
+      - name: Check Swift
+        run: swift --version
+      - name: Install Android SDK
+        run:
+          swift sdk install https://github.com/finagolfin/swift-android-sdk/releases/download/6.0.2/swift-6.0.2-RELEASE-android-24-0.1.artifactbundle.tar.gz --checksum d75615eac3e614131133c7cc2076b0b8fb4327d89dce802c25cd53e75e1881f4
+      - name: Check Android SDK
+        run:
+          swift sdk configure --show-configuration swift-6.0.2-RELEASE-android-24-0.1 x86_64-unknown-linux-android24
+      - name: Build Tests
+        run:
+          swift build --build-tests --swift-sdk x86_64-unknown-linux-android24 -Xswiftc -Xclang-linker -Xswiftc -fuse-ld=lld
+      - name: Prepare Android Emulator Test Script
+        run: |
+          mkdir pack
+          cp .build/x86_64-unknown-linux-android24/debug/swift-custom-dumpPackageTests.xctest pack
+          
+          cp /home/runner/.config/swiftpm/swift-sdks/swift-6.0.2-RELEASE-android-24-0.1.artifactbundle/swift-6.0.2-release-android-24-sdk/android-27c-sysroot/usr/lib/x86_64-linux-android/24/lib*.so pack
+          rm pack/lib{c,dl,log,m,z}.so
+
+          set -x
+          cat > ~/test-toolchain.sh << EOF
+          adb push pack /data/local/tmp
+          adb shell /data/local/tmp/pack/swift-custom-dumpPackageTests.xctest
+          EOF
+          
+          chmod +x ~/test-toolchain.sh
+      - name: Run Tests on Android Emulator
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          arch: x86_64
+          script: ~/test-toolchain.sh
\ No newline at end of file
diff --git a/Package.resolved b/Package.resolved
index 0f5a145..a357d6d 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "357ca1e5dd31f613a1d43320870ebc219386a495",
-        "version" : "1.2.2"
+        "revision" : "a3f634d1a409c7979cabc0a71b3f26ffa9fc8af1",
+        "version" : "1.4.3"
       }
     }
   ],