Skip to content

Commit 7a2b83c

Browse files
authored
Merge pull request #37 from readdle/upadte-ci-for-swift-5.7
Update Github Action scripts for Swift 5.7
2 parents 9dae0aa + 5243ec5 commit 7a2b83c

File tree

5 files changed

+65
-84
lines changed

5 files changed

+65
-84
lines changed

.github/workflows/CI.yml

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: CI Test
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
7+
android-x86_64:
8+
runs-on: macos-13
9+
10+
steps:
11+
- uses: actions/checkout@v1
12+
- name: Select XCode 14.2
13+
run: sudo xcode-select --switch /Applications/Xcode_14.2.app
14+
- name: Install NDK
15+
run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "ndk;25.2.9519653"
16+
- name: Install Swift Android Toolchain
17+
run: wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android.zip;
18+
unzip swift-android.zip;
19+
swift-android/bin/swift-android tools --update;
20+
- name: Install Android Emulator
21+
run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-29;google_apis;x86_64"
22+
- name: Create Android Emulator
23+
run: $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n ci-test -k "system-images;android-29;google_apis;x86_64" -d "pixel" --force
24+
- name: Start Android Emulator
25+
run: $ANDROID_HOME/emulator/emulator -no-window -avd ci-test -noaudio > /dev/null &
26+
- name: Run connected android tests
27+
run: export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/25.2.9519653;
28+
export SWIFT_ANDROID_HOME=$(pwd)/swift-android;
29+
export PATH=$ANDROID_NDK_HOME:$PATH;
30+
export PATH=$SWIFT_ANDROID_HOME/bin:$SWIFT_ANDROID_HOME/build-tools/current:$PATH;
31+
adb wait-for-device;
32+
./gradlew sample:cAT
33+
34+
# It looks like macos-13-arm64 is quite busy on Gtihub CI, skip for now
35+
36+
# android-arm64-v8a:
37+
# runs-on: macos-13-arm64
38+
39+
# steps:
40+
# - uses: actions/checkout@v1
41+
# - name: Select XCode 14.2
42+
# run: sudo xcode-select --switch /Applications/Xcode_14.2.app
43+
# - name: Install NDK
44+
# run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "ndk;25.2.9519653"
45+
# - name: Install Swift Android Toolchain
46+
# run: wget https://github.com/readdle/swift-android-toolchain/releases/latest/download/swift-android.zip;
47+
# unzip swift-android.zip;
48+
# swift-android/bin/swift-android tools --update;
49+
# - name: Accept Android SDK licenses
50+
# run: yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
51+
# - name: Install Android Emulator
52+
# run: $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-29;google_apis;arm64-v8a"
53+
# - name: Create Android Emulator
54+
# run: $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n ci-test -k "system-images;android-29;google_apis;arm64-v8a" -d "pixel" --force
55+
# - name: Start Android Emulator
56+
# run: $ANDROID_HOME/emulator/emulator -no-window -avd ci-test -noaudio > /dev/null &
57+
# - name: Run connected android tests
58+
# run: export ANDROID_NDK_HOME=$ANDROID_HOME/ndk/25.2.9519653;
59+
# export SWIFT_ANDROID_HOME=$(pwd)/swift-android;
60+
# export PATH=$ANDROID_NDK_HOME:$PATH;
61+
# export PATH=$SWIFT_ANDROID_HOME/bin:$SWIFT_ANDROID_HOME/build-tools/current:$PATH;
62+
# adb wait-for-device;
63+
# ./gradlew sample:cAT

.github/workflows/android_x86.yml

-41
This file was deleted.

.github/workflows/android_x86_64.yml

-41
This file was deleted.

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111

1212
dependencies {
1313
classpath 'com.android.tools.build:gradle:7.4.2'
14-
classpath "com.readdle.android.swift:gradle:1.4.4"
14+
classpath "com.readdle.android.swift:gradle:1.4.5"
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
1717
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'

sample/src/main/swift/Package.resolved

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"repositoryURL": "https://github.com/readdle/swift-java-coder.git",
4343
"state": {
4444
"branch": null,
45-
"revision": "c2980b1eab70202b09d31db7cdce317b1c05c2b2",
45+
"revision": "b0b66fa90d7b04c7214da15a17ec5ba14df61c8d",
4646
"version": "1.1.0"
4747
}
4848
}

0 commit comments

Comments
 (0)