Upgrade Plugin to use flutter 3.24.4 and AGP 8.9

ened · Nov 5, 2024 · f873467 · f873467
1 parent 849f028
commit f873467
Show file tree

Hide file tree

Showing 11 changed files with 115 additions and 112 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
@@ -22,10 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 32
+    namespace 'asia.ivity.mediainfo'
+    compileSdk 34
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -45,6 +46,6 @@ repositories {
 }
 dependencies {
     implementation 'com.github.bumptech.glide:glide:4.13.1'
-    implementation 'com.google.android.exoplayer:exoplayer-core:2.18.1'
+    implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1'
     implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1 +1,3 @@
+package android
+
 rootProject.name = 'media_info'
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -1,3 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="asia.ivity.mediainfo">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"/>
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -25,12 +25,13 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
+    namespace 'asia.ivity.mediainfoexample'
+    compileSdk 34
 
     defaultConfig {
         applicationId "asia.ivity.mediainfoexample"
-        minSdkVersion 16
-        targetSdkVersion 33
+        minSdkVersion 23
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.7.2'
     }
 }
 
@@ -24,6 +24,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/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.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -76,7 +76,7 @@ class _MyAppState extends State<MyApp> {
                     (_mediaInfoCache?.keys ?? <String>[])
                         .map((String k) => '$k: ${_mediaInfoCache![k]}')
                         .join(',\n\n'),
-                    style: Theme.of(context).textTheme.bodyText2,
+                    style: Theme.of(context).textTheme.bodyMedium,
                   ),
                   Builder(
                     builder: (BuildContext context) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		org.gradle.jvmargs=-Xmx1536M
		android.useAndroidX=true