Merge pull request #872 from penkzhou/master

enable AGP 8.0 for audio_steamer lib
cph-cachet · Jan 9, 2024 · 3d0bb6b · 3d0bb6b
2 parents 4b9159b + 49b5a8e
commit 3d0bb6b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 17 deletions.
diff --git a/packages/audio_streamer/android/build.gradle b/packages/audio_streamer/android/build.gradle
@@ -2,7 +2,7 @@ group 'plugins.cachet.audio_streamer'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
         mavenCentral()
@@ -37,9 +37,14 @@ android {
     lintOptions {
         disable 'InvalidPackage'
     }
-    namespace "plugins.cachet.audio_streamer"
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    if (project.android.hasProperty("namespace")) {
+        namespace 'plugins.cachet.audio_streamer'
+    }
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/packages/audio_streamer/example/android/app/build.gradle b/packages/audio_streamer/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -53,15 +53,16 @@ android {
     lint {
         disable 'InvalidPackage'
     }
+    namespace 'plugins.cachet.audio_streamer_example'
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/packages/audio_streamer/example/android/app/src/debug/AndroidManifest.xml b/packages/audio_streamer/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="plugins.cachet.audio_streamer_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/packages/audio_streamer/example/android/app/src/main/AndroidManifest.xml b/packages/audio_streamer/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="plugins.cachet.audio_streamer_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
         android:name="${applicationName}"
         android:label="audio_streamer_example"

diff --git a/packages/audio_streamer/example/android/app/src/profile/AndroidManifest.xml b/packages/audio_streamer/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="plugins.cachet.audio_streamer_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/packages/audio_streamer/example/android/build.gradle b/packages/audio_streamer/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.9.22'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/packages/audio_streamer/example/android/gradle.properties b/packages/audio_streamer/example/android/gradle.properties
@@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/packages/audio_streamer/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/audio_streamer/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Mar 12 17:19:03 CST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME