[Android] update ci.

Author: alienzh

Android/APIExample-Audio/app/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.application'
-
+apply plugin: 'org.jetbrains.kotlin.android'
 
 def sdkVersionFile = file("../gradle.properties")
 def properties = new Properties()
@@ -11,13 +11,13 @@ println("${rootProject.project.name}   agoraSdkVersion: ${agoraSdkVersion}")
 def localSdkPath= "${rootProject.projectDir.absolutePath}/../../sdk"
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    namespace "io.agora.api.example"
+    compileSdk 35
 
     defaultConfig {
         applicationId "io.agora.api.example.audio"
-        minSdkVersion 21
-        targetSdkVersion 32
+        minSdkVersion 24
+        targetSdkVersion 35
         versionCode 1
         versionName "1.0"
 
@@ -50,11 +50,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
-
-
 
     sourceSets {
         main {
@@ -67,6 +68,7 @@ android {
 
     buildFeatures{
         viewBinding true
+        buildConfig true
     }
 
     applicationVariants.all {
@@ -96,18 +98,19 @@ dependencies {
         // implementation "io.agora.rtc:drm:${agoraSdkVersion}"
     }
 
-    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.22"
 
     // Java language implementation
-    implementation "androidx.navigation:navigation-fragment:2.5.0"
-    implementation "androidx.navigation:navigation-ui:2.5.0"
+    implementation "androidx.navigation:navigation-fragment:2.7.0"
+    implementation "androidx.navigation:navigation-ui:2.7.0"
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
     implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.2.0'
     implementation 'de.javagl:obj:0.2.1'

Android/APIExample-Audio/app/proguard-rules.pro

@@ -22,4 +22,11 @@
 
 -keep class io.agora.**{*;}
 -dontwarn javax.**
--dontwarn com.google.devtools.build.android.**
+-dontwarn com.google.devtools.build.android.**
+
+# OkHttp
+-dontwarn org.bouncycastle.jsse.**
+-dontwarn org.conscrypt.**
+-dontwarn org.openjsse.**
+-dontwarn okhttp3.internal.platform.**
+-dontwarn org.codehaus.mojo.animal_sniffer.**

Android/APIExample-Audio/app/src/main/AndroidManifest.xml

@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.agora.api.example">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.BLUETOOTH"/>
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
-    <permission-group android:name="io.agora.api.example.audio.andpermission"/>
-
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 <!--    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />-->
 

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/basic/JoinChannelAudio.java

@@ -716,11 +716,7 @@ private Notification getDefaultNotification() {
             PendingIntent activityPendingIntent;
             Intent intent = new Intent();
             intent.setClass(this, MainActivity.class);
-            if (Build.VERSION.SDK_INT >= 23) {
-                activityPendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
-            } else {
-                activityPendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT);
-            }
+            activityPendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
 
             Notification.Builder builder = new Notification.Builder(this)
                     .addAction(icon, "Back to app", activityPendingIntent)

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/utils/ClassUtils.java

@@ -21,7 +21,6 @@
 import java.util.regex.Pattern;
 
 import dalvik.system.DexFile;
-import io.agora.api.example.BuildConfig;
 
 public class ClassUtils
 {
@@ -160,7 +159,7 @@ public static List<String> getSourcePaths(Context context) throws PackageManager
             }
         }
 
-        if (BuildConfig.DEBUG)
+        if (io.agora.api.example.BuildConfig.DEBUG)
         { // Search instant run support only debuggable
             sourcePaths.addAll(tryLoadInstantRunDexFile(applicationInfo));
         }

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/utils/PermissonUtils.java

@@ -15,8 +15,6 @@ public class PermissonUtils {
 
     public static String[] getCommonPermission() {
         List<String> permissionList = new ArrayList<>();
-        permissionList.add(Manifest.permission.READ_EXTERNAL_STORAGE);
-        permissionList.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);
         permissionList.add(Manifest.permission.RECORD_AUDIO);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             permissionList.add(Manifest.permission.READ_PHONE_STATE);

Android/APIExample-Audio/build.gradle

@@ -1,9 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.2.0' apply false
-    id 'com.android.library' version '7.2.0' apply false
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+    id 'com.android.application' version '8.5.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.9.24' apply false
 }

Android/APIExample-Audio/cloud_build.sh

@@ -3,6 +3,19 @@
 # cache gradle to /tmp/.gradle
 ls ~/.gradle || (mkdir -p /tmp/.gradle && ln -s /tmp/.gradle ~/.gradle && touch ~/.gradle/ln_$(date "+%y%m%d%H") && ls ~/.gradle)
 
+## use open jdk 17
+SYSTEM=$(uname -s)
+if [ "$SYSTEM" = "Linux" ];then
+if [ ! -d "/tmp/jdk-17.0.2" ];then
+  curl -O https://download.java.net/java/GA/jdk17.0.2/dfd4a8d0985749f896bed50d7138ee7f/8/GPL/openjdk-17.0.2_linux-x64_bin.tar.gz
+  tar zxf openjdk-17.0.2_linux-x64_bin.tar.gz
+  mv jdk-17.0.2 /tmp/
+fi
+export JAVA_HOME=/tmp/jdk-17.0.2
+export PATH=$JAVA_HOME/bin:$PATH
+java --version
+fi
+
 #change android maven to china repos
 sed -ie "s#google()#maven { url \"https\://maven.aliyun.com/repository/public\" }\n        google()#g" settings.gradle
 sed -ie "s#https://services.gradle.org/distributions#https://mirrors.cloud.tencent.com/gradle#g" gradle/wrapper/gradle-wrapper.properties

Android/APIExample-Audio/gradle.properties

@@ -17,6 +17,8 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
 # read enable simple filter section on README first before set this flag to TRUE
 simpleFilter = false

Android/APIExample-Audio/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://mirrors.cloud.tencent.com/gradle/gradle-7.3.3-bin.zip
+distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-8.7-bin.zip