Update gradlew and fix android build

.github/workflows/rust.yml

@@ -154,11 +154,11 @@ jobs:
 
       - uses: Swatinem/rust-cache@v2
 
-      - name: set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
-          distribution: 'temurin'
+          java-version: 17
+          distribution: adopt
           cache: gradle
 
       - name: Install dependencies
@@ -190,7 +190,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build Android
-        run: ./gradlew build
+        run: ./gradlew assembleRelease
 
       - name: Archive release APK
         uses: actions/upload-artifact@v3

Cargo.toml

@@ -96,7 +96,7 @@ features = ['Document', 'Element', 'Storage', 'Window', 'File', 'FileReader']
 
 ndk-glue = { version = "0.7.0", features = ["logger"] }
 ndk-context = { version = "0.1.1" }
-jni = "0.21.0"
+jni = "0.19.0"
 urlencoding = "2.1.3"
 
 [patch.crates-io]

android/Cargo.toml

@@ -25,7 +25,7 @@ default = ["threads", "audio-engine", "static", "rfd"]
 [dependencies]
 gameroy = { path = "..", default-features = false }
 log = "0.4.22"
-jni = "0.21.1"
+jni = "0.19.0"
 
 [target.'cfg(target_os = "android")'.dependencies]
 ndk-glue = { version = "0.7.0", features = ["logger"] }

android/app/build.gradle

@@ -14,7 +14,7 @@ android {
 
     compileSdk 30
 
-    ndkVersion "24.0.8215888"
+    ndkVersion "26.3.11579264"
 
     defaultConfig {
         applicationId "io.github.rodrigodd.gameroy"
@@ -83,12 +83,15 @@ tasks.whenTaskAdded { task ->
     if (task.name == 'mergeDebugJniLibFolders' || task.name == 'mergeReleaseJniLibFolders') {
         task.dependsOn 'cargoBuild'
     }
-    if (/*task.name == 'generateDebugAssets' ||*/ task.name == 'generateReleaseAssets') {
+    if (/*task.name == 'mergeDebugAssets' ||*/ task.name == 'mergeReleaseAssets') {
         task.dependsOn 'generateLicenseAsset'
     }
     if (task.name == 'lintVitalAnalyzeRelease') {
         task.dependsOn 'generateLicenseAsset'
     }
+    if (task.name == 'generateReleaseLintVitalReportModel') {
+        task.dependsOn 'generateLicenseAsset'
+    }
     for (target in cargo.targets) {
         if (task.name == "cargoBuild${target.capitalize()}") {
             task.dependsOn "copy_libc++_shared${target.capitalize()}"

android/build.gradle

@@ -1,11 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.0' apply false
+    id 'com.android.application' version '8.7.0' apply false
     id 'com.android.library' version '7.1.2' apply false
     id 'org.mozilla.rust-android-gradle.rust-android' version "0.9.3" apply false
     id "com.dorongold.task-tree" version "2.1.0"
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

android/gradle.properties

@@ -19,3 +19,5 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,9 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +134,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +201,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \