bump gradle

Picovoice · Nov 21, 2024 · a341c9f · a341c9f
1 parent 84f6b67
commit a341c9f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/binding/android/RhinoTestApp/build.gradle b/binding/android/RhinoTestApp/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 ext {
-    defaultTargetSdkVersion = 31
+    defaultTargetSdkVersion = 33
 }
 
 buildscript {
@@ -10,14 +10,16 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.4.2'
     }
 }
 
 allprojects {
     gradle.projectsEvaluated {
-        tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:deprecation"
+        tasks.withType(JavaCompile).tap {
+            configureEach {
+                options.compilerArgs << "-Xlint:deprecation"
+            }
         }
     }
 
@@ -27,6 +29,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/binding/android/RhinoTestApp/gradle.properties b/binding/android/RhinoTestApp/gradle.properties
@@ -6,7 +6,10 @@
 # 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.
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.

diff --git a/binding/android/RhinoTestApp/gradle/wrapper/gradle-wrapper.properties b/binding/android/RhinoTestApp/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
diff --git a/binding/android/RhinoTestApp/rhino-test-app/build.gradle b/binding/android/RhinoTestApp/rhino-test-app/build.gradle
@@ -30,7 +30,7 @@ if (rootProject.file("local.properties").exists()) {
 }
 
 android {
-    compileSdkVersion defaultTargetSdkVersion
+    compileSdk defaultTargetSdkVersion
 
     defaultConfig {
         applicationId "ai.picovoice.rhino.testapp"
@@ -138,6 +138,7 @@ android {
     lint {
         abortOnError false
     }
+    namespace 'ai.picovoice.rhino.testapp'
 }
 
 dependencies {

diff --git a/binding/android/RhinoTestApp/rhino-test-app/src/main/AndroidManifest.xml b/binding/android/RhinoTestApp/rhino-test-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ai.picovoice.rhino.testapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />