From 2215761a5aaaedfd05881be3fdec7f70b4016836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Augustyniak?= Date: Wed, 11 Sep 2024 19:38:50 -0400 Subject: [PATCH] update NDK version to 27.1.12297006 (#40) --- .github/workflows/android.yaml | 2 +- .github/workflows/format.yaml | 2 +- .github/workflows/release_gh.yaml | 2 +- examples/README.md | 2 +- platform/jvm/capture/build.gradle.kts | 2 +- tools/android_sdk_wrapper.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml index fbe5a5f6..952d9b65 100644 --- a/.github/workflows/android.yaml +++ b/.github/workflows/android.yaml @@ -85,7 +85,7 @@ jobs: path: ./bazel-bin/examples/android/android_app.apk gradle_tests: # Requires a "larger runner", for nested virtualization support - runs-on: ubuntu-latest-8-cores + runs-on: ubuntu-latest env: SKIP_PROTO_GEN: 1 if: needs.pre_check.outputs.should_run == 'true' diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml index 67bbb495..3d5e4320 100644 --- a/.github/workflows/format.yaml +++ b/.github/workflows/format.yaml @@ -10,7 +10,7 @@ concurrency: cancel-in-progress: true jobs: format_check: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: # --- Build the project for release diff --git a/.github/workflows/release_gh.yaml b/.github/workflows/release_gh.yaml index 607ecde9..73a8aa4c 100644 --- a/.github/workflows/release_gh.yaml +++ b/.github/workflows/release_gh.yaml @@ -90,7 +90,7 @@ jobs: # Running on ubuntu-latest builds againt a glibc that is more modern than what # instant-android uses in CI, causing a load error. Use 20.04 to link against a compatible # glibc. - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest needs: ["verify-version"] steps: - uses: actions/checkout@v4 diff --git a/examples/README.md b/examples/README.md index c96ece44..e4013ef6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -78,7 +78,7 @@ Setup the environment, open Android Studio. ![](../docs/images/android_local_gradle_error.png) - - Go to Tools > SDK Manager > Android SDK > SDK Tools. Make sure that "Show Package Details" is checked and install the NDK version that is required by the project (currently `27.0.12077973`). + - Go to Tools > SDK Manager > Android SDK > SDK Tools. Make sure that "Show Package Details" is checked and install the NDK version that is required by the project (currently `27.1.12297006`). ![](../docs/images/android_local_gradle_ndk.png) diff --git a/platform/jvm/capture/build.gradle.kts b/platform/jvm/capture/build.gradle.kts index d2cb98ea..fc180376 100644 --- a/platform/jvm/capture/build.gradle.kts +++ b/platform/jvm/capture/build.gradle.kts @@ -74,7 +74,7 @@ android { checkReleaseBuilds = true } - ndkVersion = "27.0.12077973" + ndkVersion = "27.1.12297006" } // Rust cargo build toolchain diff --git a/tools/android_sdk_wrapper.sh b/tools/android_sdk_wrapper.sh index 12e60266..1dc92f8f 100755 --- a/tools/android_sdk_wrapper.sh +++ b/tools/android_sdk_wrapper.sh @@ -23,7 +23,7 @@ readonly softlink_root_dir="/tmp/bitdrift-android-sdk" readonly softlink_unarchived_dir="$softlink_root_dir/android-sdk-$android_sdk_version-unarchived" readonly cmdline_tools_version="6.0" -readonly ndk_version="27.0.12077973" +readonly ndk_version="27.1.12297006" readonly install_android_cmd_line_tools=( "$android_sdk_unarchived_dir/tools/bin/sdkmanager" "--install"