Update to gradle version 8.13 and target API level 36

.github/workflows/android.yml

@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   test_Android:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
     steps:
 
     - name: Checkout
@@ -15,15 +15,29 @@ jobs:
     - name: Setup JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 11
-
-    - name: Sdl Android Tests
-      # For more info, please check out: https://github.com/marketplace/actions/android-emulator-runner
+        java-version: 17
+
+    - name: Enable KVM group perms
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
+        ls -l /dev/kvm || true
+
+    - name: SDL Android Tests
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
-        script: ./android/gradlew -p ./android :sdl_android:connectedCheck
-
+        api-level: 36
+        target: google_apis
+        arch: x86_64
+        profile: pixel_7
+        ram-size: 2048M
+        disk-size: 4096M
+        disable-animations: true
+        emulator-boot-timeout: 1200
+        emulator-options: "-no-window -no-snapshot -no-audio"
+        script: ./android/gradlew -p ./android :sdl_android:connectedDebugAndroidTest
+
     - name: Hello Sdl Android Tests
       run: ./android/gradlew -p ./android/hello_sdl_android test
 
@@ -33,7 +47,7 @@ jobs:
         yml: ./codecov.yml
 
   test_Java:
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
     steps:
 
     - name: Checkout

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong

android/gradle.properties

@@ -10,6 +10,9 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 

android/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.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

android/hello_sdl_android/build.gradle

@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     defaultConfig {
         applicationId "com.sdl.hellosdlandroid"
-        minSdkVersion 16
-        targetSdkVersion 34
+        minSdkVersion 21
+        targetSdkVersion 36
         versionCode 1
         versionName "1.0"
         resValue "string", "app_name", "Hello Sdl Android"
@@ -61,6 +61,7 @@ android {
     lintOptions {
         disable 'GoogleAppIndexingWarning'
     }
+    namespace 'com.sdl.hellosdlandroid'
 }
 
 
@@ -69,7 +70,7 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation project(path: ':sdl_android')
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 }

android/hello_sdl_android/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.sdl.hellosdlandroid">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"

android/sdl_android/build.gradle

@@ -1,12 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 34
+    compileSdkVersion 36
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 34
-        versionCode 26
-        versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
+        minSdkVersion 21
+        targetSdkVersion 36
         buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'
         resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -38,25 +36,33 @@ android {
         main.java.srcDirs += '../../base/src/main/java'
         androidTest.assets.srcDirs += '../../generator/rpc_spec/'
     }
+
+    buildFeatures {
+        aidl true
+    }
+
+    namespace 'com.smartdevicelink'
+    testNamespace 'com.smartdevicelink.test'
 }
 
 ext { VERSION_NAME = "$project.android.defaultConfig.versionName" }
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     //api 'com.livio.taskmaster:taskmaster:0.6.0'
-    api 'com.smartdevicelink:bson_java_port:1.2.5'
+    api 'com.smartdevicelink:bson_java_port:1.2.6'
     api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    api 'androidx.annotation:annotation:1.1.0'
-    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.2.0'
+    api 'androidx.annotation:annotation:1.9.1'
+    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.9.4'
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:5.7.0'
-    androidTestImplementation 'org.mockito:mockito-core:5.7.0'
-    androidTestImplementation 'org.mockito:mockito-android:5.7.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:5.20.0'
+    androidTestImplementation 'androidx.test:rules:1.7.0'
+    androidTestImplementation 'org.mockito:mockito-core:5.20.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.20.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.7.0'
 }
 
 buildscript {
@@ -65,7 +71,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.13.0'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.34.0'
     }
 }
 

android/sdl_android/src/androidTest/AndroidManifest.xml

@@ -1,7 +1,6 @@
-<manifest package="com.smartdevicelink.test"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-sdk android:minSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="21" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <!-- Required to pair Bluetooth devices -->
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
@@ -13,10 +12,33 @@
         android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="com.smartdevicelink.test" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
+
+    <queries>
+        <intent>
+            <action android:name="com.smartdevicelink.router.service" />
+        </intent>
+        <intent>
+            <action android:name="sdl.router.startservice" />
+        </intent>
+    </queries>
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
         <activity android:name="com.smartdevicelink.managers.lockscreen.SDLLockScreenActivity" />
+        <receiver
+            android:name=".TestSdlReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.smartdevicelink.USB_ACCESSORY_ATTACHED" /> <!--For AOA -->
+                <action android:name="android.bluetooth.device.action.ACL_CONNECTED" />
+                <action android:name="sdl.router.startservice" />
+            </intent-filter>
+        </receiver>
     </application>
 
 </manifest>

android/sdl_android/src/androidTest/java/com/smartdevicelink/TestSdlReceiver.java

@@ -0,0 +1,14 @@
+package com.smartdevicelink;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Added so we pass IntegrationValidator when running unit test.
+ */
+public class TestSdlReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+    }
+}

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/audio/AudioStreamManagerTest.java

@@ -134,99 +134,131 @@ public void onComplete(boolean success) {
     }
 
     public void testWithSquareSampleAudio16BitAnd8KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._8KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(8000, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd16KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(16000, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd22KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._22KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(22050, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd44KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._44KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(44100, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd8KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._8KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(8000, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd16KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(16000, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd22KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._22KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(22050, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd44KhzApi16() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 16);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._44KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(44100, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd8KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._8KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(8000, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd16KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(16000, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd22KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._22KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(22050, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio16BitAnd44KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._44KHZ, BitsPerSample._16_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(44100, SampleType.SIGNED_16_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd8KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._8KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(8000, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd16KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._16KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(16000, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd22KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._22KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(22050, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     public void testWithSquareSampleAudio8BitAnd44KhzApi21() throws Exception {
+        int versionCode = Build.VERSION.SDK_INT;
         setFinalStatic(Build.VERSION.class.getField("SDK_INT"), 21);
         AudioPassThruCapabilities audioPassThruCapabilities = new AudioPassThruCapabilities(SamplingRate._44KHZ, BitsPerSample._8_BIT, AudioType.PCM);
         runFullAudioManagerDecodeFlowWithSquareSampleAudio(44100, SampleType.UNSIGNED_8_BIT, audioPassThruCapabilities);
+        setFinalStatic(Build.VERSION.class.getField("SDK_INT"), versionCode);
     }
 
     private int testFullAudioManagerDecodeFlowCorrectCounter = 0;

android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/SoftButtonManagerTests.java

@@ -178,7 +178,7 @@ public Void answer(InvocationOnMock invocation) {
 
     private void sleep() {
         try {
-            Thread.sleep(100);
+            Thread.sleep(1000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }