Implement generation testing for Android demos

Picovoice · Feb 19, 2025 · 679fb91 · 679fb91
1 parent 7172173
commit 679fb91
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 10 deletions.
diff --git a/.github/workflows/android-demos.yml b/.github/workflows/android-demos.yml
@@ -18,18 +18,40 @@ on:
 jobs:
   build-leopard-demo:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: [11, 17, 21]
+        include:
+        - java-version: 11
+          gradle-version: 6.5
+          agp-version: 4.1.3
+        - java-version: 17
+          gradle-version: 7.5
+          agp-version: 7.4.2
+        - java-version: 21
+          gradle-version: 8.5
+          agp-version: 8.2.2
+
     defaults:
       run:
         working-directory: demo/android/LeopardDemo
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: set up JDK 17
+    - name: Override gradle settings
+      run: sed -i "s/com.android.tools.build:gradle:[0-9]*\.[0-9]*\.[0-9]*/com.android.tools.build:gradle:${{ matrix.agp-version }}/g" build.gradle
+
+    - name: set up JDK ${{ matrix.java-version }}
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: ${{ matrix.java-version }}
         distribution: 'temurin'
 
+    - name: Use Gradle ${{ matrix.gradle-version }}
+      uses: gradle/actions/setup-gradle@v3
+      with:
+        gradle-version: ${{ matrix.gradle-version }}
+
     - name: Build
-      run: ./gradlew assembleDebug
+      run: gradle assembleDebug
diff --git a/demo/android/LeopardDemo/gradle.properties b/demo/android/LeopardDemo/gradle.properties
@@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+android.nonTransitiveRClass=false
diff --git a/demo/android/LeopardDemo/leopard-demo-app/build.gradle b/demo/android/LeopardDemo/leopard-demo-app/build.gradle
@@ -3,6 +3,7 @@ import groovy.json.JsonSlurper
 apply plugin: 'com.android.application'
 
 android {
+    def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
     compileSdk defaultTargetSdkVersion
 
     defaultConfig {
@@ -30,8 +31,10 @@ android {
 
     flavorDimensions "language"
     productFlavors {
-        en {
-            getIsDefault().set(true)
+        if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+            en {
+                getIsDefault().set(true)
+            }
         }
 
         languages.each { language ->
@@ -49,11 +52,11 @@ android {
                 if (flavor.name != 'en') {
                     from("$projectDir/../../../../lib/common/")
                     include("leopard_params_${flavor.name}.pv")
-                    into("$projectDir/src/main/assets/models")
+                    into("$projectDir/src/${flavor.name}/assets/models")
                 } else {
                     from("$projectDir/../../../../lib/common/")
                     include("leopard_params.pv")
-                    into("$projectDir/src/main/assets/models")
+                    into("$projectDir/src/${flavor.name}/assets/models")
                 }
             }
         }
@@ -62,10 +65,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    lint {
+    lintOptions {
         abortOnError false
     }
-    namespace 'ai.picovoice.leoparddemo'
+    if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
+        namespace 'ai.picovoice.leoparddemo'
+    }
 }
 
 dependencies {

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