From 6e38dc5281aca983521edf1186576061f009b288 Mon Sep 17 00:00:00 2001 From: Peng Zhou Date: Sun, 7 Jan 2024 23:59:09 +0800 Subject: [PATCH 1/4] enable agp 8.0 for audio_steamer --- .../audio_streamer/example/android/app/build.gradle | 11 ++++++----- .../example/android/app/src/debug/AndroidManifest.xml | 3 +-- .../example/android/app/src/main/AndroidManifest.xml | 3 +-- .../android/app/src/profile/AndroidManifest.xml | 3 +-- packages/audio_streamer/example/android/build.gradle | 4 ++-- .../audio_streamer/example/android/gradle.properties | 3 +++ .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/audio_streamer/example/android/app/build.gradle b/packages/audio_streamer/example/android/app/build.gradle index 90cee466f..7309b6231 100644 --- 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,6 +53,7 @@ android { lint { disable 'InvalidPackage' } + namespace 'plugins.cachet.audio_streamer_example' } flutter { @@ -60,8 +61,8 @@ flutter { } 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 index 63a6632f9..d47484dbb 100644 --- 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 @@ - + diff --git a/packages/audio_streamer/example/android/app/src/main/AndroidManifest.xml b/packages/audio_streamer/example/android/app/src/main/AndroidManifest.xml index 0ea4943fb..b3917be86 100644 --- 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 @@ - + + diff --git a/packages/audio_streamer/example/android/build.gradle b/packages/audio_streamer/example/android/build.gradle index cd89d3a8b..31779ac6e 100644 --- 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 index 38c8d4544..c32a4ef08 100644 --- 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 index d69ee4c8b..8ca9573b9 100644 --- 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 From 855505b213a6dd412aaeb7cc3de27ddb03688ec9 Mon Sep 17 00:00:00 2001 From: Peng Zhou Date: Mon, 8 Jan 2024 00:11:01 +0800 Subject: [PATCH 2/4] enable agp 8.0 for audio_steamer --- packages/audio_streamer/android/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/audio_streamer/android/build.gradle b/packages/audio_streamer/android/build.gradle index fb3b1ddef..722793053 100644 --- a/packages/audio_streamer/android/build.gradle +++ b/packages/audio_streamer/android/build.gradle @@ -37,6 +37,9 @@ android { lintOptions { disable 'InvalidPackage' } + if (project.android.hasProperty("namespace")) { + namespace 'plugins.cachet.audio_streamer' + } } dependencies { From e0b8579b17ecbf1d989cbbfa18f46997df518551 Mon Sep 17 00:00:00 2001 From: Peng Zhou Date: Mon, 8 Jan 2024 00:14:19 +0800 Subject: [PATCH 3/4] enable agp 8.0 for audio_steamer --- packages/audio_streamer/android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/audio_streamer/android/build.gradle b/packages/audio_streamer/android/build.gradle index 722793053..0355f319e 100644 --- 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() @@ -43,5 +43,5 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } From d0a766fb05459353c2c42de90f8f58c645b53ee8 Mon Sep 17 00:00:00 2001 From: Peng Zhou Date: Mon, 8 Jan 2024 00:17:40 +0800 Subject: [PATCH 4/4] enable agp 8.0 for audio_steamer --- packages/audio_streamer/android/build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/audio_streamer/android/build.gradle b/packages/audio_streamer/android/build.gradle index 0355f319e..13219dfd6 100644 --- a/packages/audio_streamer/android/build.gradle +++ b/packages/audio_streamer/android/build.gradle @@ -37,6 +37,9 @@ android { lintOptions { disable 'InvalidPackage' } + kotlinOptions { + jvmTarget = '1.8' + } if (project.android.hasProperty("namespace")) { namespace 'plugins.cachet.audio_streamer' }