Skip to content

Commit

Permalink
Add AGP 8.3 to documentation; update product project to current NDK
Browse files Browse the repository at this point in the history
  • Loading branch information
mhsmith committed Mar 9, 2024
1 parent aeb50b8 commit 856b6e8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion product/runtime/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion product/runtime/docs/sphinx/android.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions product/runtime/docs/sphinx/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ Features
<https://github.com/chaquo/chaquopy/issues/886>`__)
- Update CA bundle to certifi 2023.11.17. (`#893
<https://github.com/chaquo/chaquopy/issues/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
<https://github.com/chaquo/chaquopy/issues/908>`__, `#1003
<https://github.com/chaquo/chaquopy/issues/1003>`__)
<https://github.com/chaquo/chaquopy/issues/1003>`__, `#1091
<https://github.com/chaquo/chaquopy/issues/1091>`__)
- Python version 3.12 is now supported. (`#931
<https://github.com/chaquo/chaquopy/issues/931>`__, `#967
<https://github.com/chaquo/chaquopy/issues/967>`__)
Expand Down
2 changes: 1 addition & 1 deletion product/runtime/docs/sphinx/versions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 | |
+-------------------+ +-------------------+ +
Expand Down

0 comments on commit 856b6e8

Please sign in to comment.