Merge pull request #82 from AristideVB/feat/agp_jdk_kotlin_upgrade

feat: upgrade AGP to 8.4.1, Gradle to 8.6, JDK to 17, and Kotlin to 1.9.24
matanshukry · Jun 28, 2024 · 8f03f47 · 8f03f47
2 parents 4cfc404 + 7442f8e
commit 8f03f47
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 30 deletions.
diff --git a/flutter_google_places_sdk/example/android/app/build.gradle b/flutter_google_places_sdk/example/android/app/build.gradle
@@ -26,15 +26,22 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 33
-    ndkVersion "21.4.7075529"
+    namespace 'com.msh.flutter_google_places_sdk_example'
+
+    compileSdkVersion 34
+    ndkVersion "26.1.10909125"
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
     }
 
     defaultConfig {
@@ -54,14 +61,18 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    lint {
+        disable 'InvalidPackage'
+    }
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation 'com.android.support:multidex:1.0.3'
 }
diff --git a/flutter_google_places_sdk/example/android/app/src/debug/AndroidManifest.xml b/flutter_google_places_sdk/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.msh.flutter_google_places_sdk_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/flutter_google_places_sdk/example/android/app/src/main/AndroidManifest.xml b/flutter_google_places_sdk/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.msh.flutter_google_places_sdk_example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide

diff --git a/flutter_google_places_sdk/example/android/app/src/profile/AndroidManifest.xml b/flutter_google_places_sdk/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.msh.flutter_google_places_sdk_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/flutter_google_places_sdk/example/android/build.gradle b/flutter_google_places_sdk/example/android/build.gradle
@@ -1,12 +1,11 @@
 buildscript {
-    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/flutter_google_places_sdk/example/android/gradle.properties b/flutter_google_places_sdk/example/android/gradle.properties
@@ -1,4 +1,8 @@
 org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
+kotlin_version=1.9.24
diff --git a/flutter_google_places_sdk/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_google_places_sdk/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-7.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/flutter_google_places_sdk_android/android/build.gradle b/flutter_google_places_sdk_android/android/build.gradle
@@ -2,14 +2,13 @@ group 'com.msh.flutter_google_places_sdk'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,23 +24,24 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    // Conditional for compatibility with AGP <4.2.
-    if (project.android.hasProperty("namespace")) {
-        namespace 'com.msh.flutter_google_places_sdk'
-    }
-    compileSdkVersion 30
+    namespace 'com.msh.flutter_google_places_sdk_example'
+    compileSdkVersion 34
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
     }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
         test.java.srcDirs += 'src/test/kotlin'
     }
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -53,7 +53,7 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "com.google.android.libraries.places:places:$google_places_version"
 
     testImplementation 'junit:junit:4.13.2'

diff --git a/flutter_google_places_sdk_android/android/gradle.properties b/flutter_google_places_sdk_android/android/gradle.properties
@@ -2,4 +2,5 @@ org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
-google_places_version=3.2.0
+google_places_version=3.2.0
+kotlin_version=1.9.24
diff --git a/flutter_google_places_sdk_android/android/gradle/wrapper/gradle-wrapper.properties b/flutter_google_places_sdk_android/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
diff --git a/flutter_google_places_sdk_android/android/src/main/AndroidManifest.xml b/flutter_google_places_sdk_android/android/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.msh.flutter_google_places_sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>