update Java and install NDK 25c

gradle.properties: remove deprecated option proguard-rules.pro: add more classes Signed-off-by: Daniel Schnell <[email protected]>
grammatek · Feb 6, 2024 · 4df5d1e · 4df5d1e
1 parent e78178d
commit 4df5d1e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/.github/scripts/dl_3rdparty.sh b/.github/scripts/dl_3rdparty.sh
@@ -7,7 +7,7 @@
 #
 # These are downloaded from their corresponding Github Release pages according to the following
 # environment variables:
-#   OPENFST_TAG, THRAX_TAG, FLITE_THRAX_TAG
+#   OPENFST_TAG, THRAX_TAG
 
 set -o pipefail
 #set -x

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,10 +10,10 @@ jobs:
     env:
       OPENFST_TAG: 1.8.1-android
       THRAX_TAG: 1.3.6-android
-      NDK_VER: 23.1.7779620
+      NDK_VER: 25.2.9519653
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Decode Keystore
         env:
           ENCODED_KS: ${{ secrets.KEYSTORE }}
@@ -23,13 +23,20 @@ jobs:
           echo "$ENCODED_KS" | base64 -di > "${TMP_KEYSTORE_FILE_PATH}"/simaromur_ks.jks
           ls -al "${TMP_KEYSTORE_FILE_PATH}"
       - name: set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          distribution: 'zulu'
+          java-version: '17'
+          cache: 'gradle'
+      - uses: nttld/setup-ndk@v1
+        with:
+          ndk-version: r25c
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew
       - name: Get CMake
         uses: lukka/[email protected]
-      - name: Install NDK
-        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VER}" --sdk_root=${ANDROID_SDK_ROOT}
+      #- name: Install NDK
+      #  run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;${NDK_VER}" --sdk_root=${ANDROID_SDK_ROOT}
       - name: Setup NDK
         run: |
           echo "ANDROID_NDK=$ANDROID_HOME/ndk/${NDK_VER}" >> $GITHUB_ENV

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -30,6 +30,11 @@
 -keep class com.facebook.** { *; }
 -keep class org.kohsuke.github** { *; }
 -keep class ai.onnxruntime.** { *; }
+-keep class io.jsonwebtoken.** { *; }
+-keep class okhttp3.** { *; }
+-keep class javax.naming.NamingException.** { *; }
+-keep class javax.naming.directory.Attributes.** { *; }
+-keep class androidx.appcompat.view.ContextThemeWrapper.** { *; }
 
 # warnings generated via kohsuke github api
 -dontwarn com.infradna.tool.bridge_method_injector.BridgeMethodsAdded

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4096m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects