diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ec0800a1..c67d981c8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -654,10 +654,10 @@ jobs: name: Build - Android steps: - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v6 - with: - gradle-version: '8.14.5' + #- name: Setup Gradle + # uses: gradle/actions/setup-gradle@v6 + # with: + # gradle-version: '8.14.5' - uses: actions/checkout@v6 - name: Build example_android_opengl3 diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index bbef65980..1119b7ab6 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -140,10 +140,12 @@ Other Changes: when available, fixing OpenGL DPI scaling issues as e.g. NVIDIA drivers tends to spawn multiple-thread to manage OpenGL. (#9403) - Examples: + - Android: update to AGP 9.2.0 to support Gradle 9.6.0. - SDL2/SDL3: use `SDL_GetWindowSizeInPixels()` to create frame-buffers. Fixes issues with non-fractional framebuffer size on Wayland. (#8761, #9124) [@billtran1632001] - SDL3+Metal4: added new example. (#9458, #9451) [@AmelieHeinrich] + ----------------------------------------------------------------------- VERSION 1.92.8 (Released 2026-05-12) ----------------------------------------------------------------------- diff --git a/examples/example_android_opengl3/android/app/build.gradle b/examples/example_android_opengl3/android/app/build.gradle index e142f1917..65555fb6e 100644 --- a/examples/example_android_opengl3/android/app/build.gradle +++ b/examples/example_android_opengl3/android/app/build.gradle @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) } android { @@ -25,9 +24,6 @@ android { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } - kotlinOptions { - jvmTarget = '11' - } externalNativeBuild { cmake { path file('../../CMakeLists.txt') diff --git a/examples/example_android_opengl3/android/gradle/libs.versions.toml b/examples/example_android_opengl3/android/gradle/libs.versions.toml index 82971810b..43d9021eb 100644 --- a/examples/example_android_opengl3/android/gradle/libs.versions.toml +++ b/examples/example_android_opengl3/android/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] -agp = "8.12.0" -kotlin = "2.0.21" +agp = "9.2.0" +kotlin = "2.3.21" [plugins] android-application = { id = "com.android.application", version.ref = "agp" }