diff --git a/product/runtime/build.gradle b/product/runtime/build.gradle index 50fa972f75..ec3160e21e 100644 --- a/product/runtime/build.gradle +++ b/product/runtime/build.gradle @@ -275,7 +275,7 @@ if (!(cmakeBuildType in KNOWN_BUILD_TYPES)) { // This must be one of the NDK versions which are pre-installed on the // GitHub Actions runner. Ideally it would also match the version in // target/build-common.sh, but the latter is more difficult to change. - def ndkDir = sdkPath("ndk/26.1.10909125") + def ndkDir = sdkPath("ndk/26.2.11394342") def prefixDir = "$projectDir/../../target/prefix/$abi" args "-DCMAKE_TOOLCHAIN_FILE=$ndkDir/build/cmake/android.toolchain.cmake", diff --git a/product/runtime/docs/sphinx/android.rst b/product/runtime/docs/sphinx/android.rst index 8b35e4524f..3117341d08 100644 --- a/product/runtime/docs/sphinx/android.rst +++ b/product/runtime/docs/sphinx/android.rst @@ -38,7 +38,7 @@ In your *top-level* `build.gradle` file, set the Chaquopy version: } Also check the Android Gradle plugin version (`com.android.application` or -`com.android.library`): it should be between 7.0.x and 8.2.x. Older versions as far back +`com.android.library`): it should be between 7.0.x and 8.3.x. Older versions as far back as 2.2 are supported by :doc:`older versions of Chaquopy <../versions>`. Then apply the Chaquopy plugin in the *module-level* `build.gradle` file (usually in the diff --git a/product/runtime/docs/sphinx/changelog.rst b/product/runtime/docs/sphinx/changelog.rst index aae85ec6d0..504e5323f9 100644 --- a/product/runtime/docs/sphinx/changelog.rst +++ b/product/runtime/docs/sphinx/changelog.rst @@ -25,9 +25,10 @@ Features `__) - Update CA bundle to certifi 2023.11.17. (`#893 `__) -- Android Gradle plugin versions 8.1 and 8.2 are now supported. (`#908 +- Android Gradle plugin versions 8.1, 8.2 and 8.3 are now supported. (`#908 `__, `#1003 - `__) + `__, `#1091 + `__) - Python version 3.12 is now supported. (`#931 `__, `#967 `__) diff --git a/product/runtime/docs/sphinx/versions.rst b/product/runtime/docs/sphinx/versions.rst index d100cd5c12..5462691350 100644 --- a/product/runtime/docs/sphinx/versions.rst +++ b/product/runtime/docs/sphinx/versions.rst @@ -9,7 +9,7 @@ Version summary | | |Gradle plugin |level | | | |versions | | +===================+===================+===================+===================+ -|15.0 |3.8 - 3.12 |7.0 - 8.2 | | +|15.0 |3.8 - 3.12 |7.0 - 8.3 | | +-------------------+-------------------+-------------------+ + |14.0 | |4.1 - 8.0 | | +-------------------+ +-------------------+ +