diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1201f43..51f7a61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: shell: bash run: | echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV - echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV + echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV - name: Cached Android NDK uses: actions/cache@v2 with: @@ -80,6 +80,8 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: 29 + emulator-build: 7425822 # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160 + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none ndk: ${{ env.ANDROID_NDK_VERSION }} cmake: 3.10.2.4988404 script: ./gradlew connectedCheck diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index f9fdfbb..7cfb084 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -41,7 +41,7 @@ jobs: shell: bash run: | echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV - echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV + echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV - name: Cached Android NDK uses: actions/cache@v2 with: @@ -89,6 +89,8 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: 29 + -build: 7425822 # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160 + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none ndk: ${{ env.ANDROID_NDK_VERSION }} cmake: 3.10.2.4988404 script: ./gradlew connectedCheck @@ -157,4 +159,4 @@ jobs: # env: # BINTRAY_USER: ${{ secrets.bintray_user }} # BINTRAY_APIKEY: ${{ secrets.bintray_apikey }} -# run: ./gradlew postBintrayPublish -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} \ No newline at end of file +# run: ./gradlew postBintrayPublish -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ceafd8d..e65f18b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,7 +47,7 @@ jobs: shell: bash run: | echo "ANDROID_HOME=$ANDROID_HOME" >> $GITHUB_ENV - echo "ANDROID_NDK_VERSION=21.3.6528147" >> $GITHUB_ENV + echo "ANDROID_NDK_VERSION=21.4.7075529" >> $GITHUB_ENV - name: Cached Android NDK uses: actions/cache@v2 with: @@ -95,6 +95,8 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: api-level: 29 + emulator-build: 7425822 # workaround to emulator bug: https://github.com/ReactiveCircus/android-emulator-runner/issues/160 + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none ndk: ${{ env.ANDROID_NDK_VERSION }} cmake: 3.10.2.4988404 script: ./gradlew connectedCheck diff --git a/jni/android/build.gradle.kts b/jni/android/build.gradle.kts index a41b830..2243607 100644 --- a/jni/android/build.gradle.kts +++ b/jni/android/build.gradle.kts @@ -35,7 +35,7 @@ android { setPath("src/main/CMakeLists.txt") } } - ndkVersion = "21.3.6528147" + ndkVersion = "21.4.7075529" afterEvaluate { tasks.withType().all {