Merge branch 'feature/agp_compatibility' into minor

ryanheise · May 31, 2023 · 4f07e35 · 4f07e35
2 parents 79d8741 + af44d46
commit 4f07e35
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 8 deletions.
diff --git a/just_audio/CHANGELOG.md b/just_audio/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.34
+
+* Support AGP 8 (@josephcrowell).
+* Update AGP to 7.3.0.
+
 ## 0.9.33
 
 * Update minimum flutter version to 3.0.

diff --git a/just_audio/android/build.gradle b/just_audio/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
@@ -27,7 +27,11 @@ project.getTasks().withType(JavaCompile) {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 31
+    // Conditional for compatibility with AGP <4.2.
+    if (project.android.hasProperty("namespace")) {
+        namespace 'com.ryanheise.just_audio'
+    }
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 16
@@ -45,7 +49,7 @@ android {
 }
 
 dependencies {
-    def exoplayer_version = "2.18.1"
+    def exoplayer_version = "2.18.7"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayer_version"
     implementation "com.google.android.exoplayer:exoplayer-hls:$exoplayer_version"

diff --git a/just_audio/android/gradle/wrapper/gradle-wrapper.properties b/just_audio/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/just_audio/example/android/app/build.gradle b/just_audio/example/android/app/build.gradle
@@ -25,7 +25,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    namespace 'com.ryanheise.just_audio_example'
+    compileSdkVersion 33
 
     lintOptions {
         disable 'InvalidPackage'

diff --git a/just_audio/example/android/build.gradle b/just_audio/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
     }
 }
 
@@ -14,6 +14,13 @@ allprojects {
         google()
         mavenCentral()
     }
+
+    gradle.projectsEvaluated{
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-Xlint:deprecation"
+            options.compilerArgs << "-Xlint:unchecked"
+        }
+    }
 }
 
 rootProject.buildDir = '../build'

diff --git a/just_audio/example/android/gradle/wrapper/gradle-wrapper.properties b/just_audio/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/just_audio/pubspec.yaml b/just_audio/pubspec.yaml
@@ -1,6 +1,6 @@
 name: just_audio
 description: A feature-rich audio player for Flutter. Loop, clip and concatenate any sound from any source (asset/file/URL/stream) in a variety of audio formats with gapless playback.
-version: 0.9.33
+version: 0.9.34
 repository: https://github.com/ryanheise/just_audio/tree/minor/just_audio
 issue_tracker: https://github.com/ryanheise/just_audio/issues
 topics: