Merge pull request solid-software#455 from CodeAtlas/feature/gradle_8…

…_upgrade Update Gradle to 8.2 and AGP to 8.2.0
xujim · Dec 13, 2023 · 19dcd75 · 19dcd75
2 parents eb8ff33 + e24b989
commit 19dcd75
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git a/flutter_vlc_player/android/build.gradle b/flutter_vlc_player/android/build.gradle
@@ -22,6 +22,8 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
+    namespace 'software.solid.fluttervlcplayer'
+
     compileSdk 33
 
     defaultConfig {

diff --git a/flutter_vlc_player/android/src/main/AndroidManifest.xml b/flutter_vlc_player/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="software.solid.fluttervlcplayer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>
diff --git a/flutter_vlc_player/example/android/app/build.gradle b/flutter_vlc_player/example/android/app/build.gradle
@@ -25,6 +25,8 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
+    namespace 'software.solid.fluttervlcplayerexample'
+
     compileSdkVersion 33
 
     lintOptions {

diff --git a/flutter_vlc_player/example/android/app/src/main/AndroidManifest.xml b/flutter_vlc_player/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="software.solid.fluttervlcplayerexample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application

diff --git a/flutter_vlc_player/example/android/build.gradle b/flutter_vlc_player/example/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.0'
     }
 }
 

diff --git a/flutter_vlc_player/example/android/gradle.properties b/flutter_vlc_player/example/android/gradle.properties
@@ -2,3 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
+android.enableR8.fullMode=false
diff --git a/flutter_vlc_player/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_vlc_player/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.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ buildscript { @@
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:7.4.2'
+            classpath 'com.android.tools.build:gradle:8.2.0'
         }
     }
@@ Expand Down @@