Upgrade gradle version + Update proguard rules

TarekTolba1 · TarekTolba1 · commit 7009c9274faa · 2025-05-12T15:29:21.000+03:00
diff --git a/arcgis_map_sdk_android/android/build.gradle b/arcgis_map_sdk_android/android/build.gradle
@@ -2,7 +2,7 @@ group 'dev.fluttercommunity.arcgis_map_sdk_android'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.9.0'
+    ext.kotlin_version = '2.1.20'
     repositories {
         google()
         mavenCentral()
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.7.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -59,6 +59,7 @@ android {
 
     defaultConfig {
         minSdkVersion 26
+        consumerProguardFiles 'proguard-rules.pro'
     }
 }
 
@@ -67,5 +68,5 @@ dependencies {
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     implementation 'com.esri:arcgis-maps-kotlin:200.7.0'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.13.1'
 }
diff --git a/arcgis_map_sdk_android/android/gradle/wrapper/gradle-wrapper.properties b/arcgis_map_sdk_android/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Thu Oct 24 09:10:14 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/arcgis_map_sdk_android/android/proguard-rules.pro b/arcgis_map_sdk_android/android/proguard-rules.pro
@@ -0,0 +1,2 @@
+-keep class dev.fluttercommunity.arcgis_map_sdk_android.model.** { *; }
+-keep class dev.fluttercommunity.arcgis_map_sdk_android.util.** { *; }
diff --git a/arcgis_map_sdk_android/android/src/main/kotlin/dev/fluttercommunity/arcgis_map_sdk_android/ArcgisMapView.kt b/arcgis_map_sdk_android/android/src/main/kotlin/dev/fluttercommunity/arcgis_map_sdk_android/ArcgisMapView.kt
@@ -149,6 +149,8 @@ internal class ArcgisMapView(
         methodChannel.invokeMethod("onStatusChanged", status.jsonValue())
     }
 
+    override fun dispose() {}
+
     // region helper
 
     private fun setupMethodChannel() {
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -25,7 +25,7 @@ if (flutterVersionName == null) {
 android {
 
     compileSdkVersion flutter.compileSdkVersion
-    ndkVersion = "25.1.8937393"
+    ndkVersion = "27.0.12077973"
 
     namespace 'com.example.example'
 
diff --git a/example/android/app/proguard-rules.pro b/example/android/app/proguard-rules.pro
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/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-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.2" apply false
+    id "com.android.application" version "8.7.3" apply false
     id "org.jetbrains.kotlin.android" version "2.1.20" apply false
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ group 'dev.fluttercommunity.arcgis_map_sdk_android'`
`2`	`2`	`version '1.0-SNAPSHOT'`
`3`	`3`
`4`	`4`	`buildscript {`
`5`		`- ext.kotlin_version = '1.9.0'`
	`5`	`+ ext.kotlin_version = '2.1.20'`
`6`	`6`	`repositories {`
`7`	`7`	`google()`
`8`	`8`	`mavenCentral()`
`@@ -12,7 +12,7 @@ buildscript {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- classpath 'com.android.tools.build:gradle:8.3.2'`
	`15`	`+ classpath 'com.android.tools.build:gradle:8.7.3'`
`16`	`16`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`17`	`17`	`}`
`18`	`18`	`}`
`@@ -59,6 +59,7 @@ android {`
`59`	`59`
`60`	`60`	`defaultConfig {`
`61`	`61`	`minSdkVersion 26`
	`62`	`+ consumerProguardFiles 'proguard-rules.pro'`
`62`	`63`	`}`
`63`	`64`	`}`
`64`	`65`
`@@ -67,5 +68,5 @@ dependencies {`
`67`	`68`
`68`	`69`	`implementation 'androidx.constraintlayout:constraintlayout:2.1.3'`
`69`	`70`	`implementation 'com.esri:arcgis-maps-kotlin:200.7.0'`
`70`		`- implementation 'com.google.code.gson:gson:2.8.8'`
	`71`	`+ implementation 'com.google.code.gson:gson:2.13.1'`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-keep class dev.fluttercommunity.arcgis_map_sdk_android.model.** { *; }`
	`2`	`+-keep class dev.fluttercommunity.arcgis_map_sdk_android.util.** { *; }`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ internal class ArcgisMapView(`
`149`	`149`	`methodChannel.invokeMethod("onStatusChanged", status.jsonValue())`
`150`	`150`	`}`
`151`	`151`
	`152`	`+ override fun dispose() {}`
	`153`	`+`
`152`	`154`	`// region helper`
`153`	`155`
`154`	`156`	`private fun setupMethodChannel() {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "8.3.2" apply false`
	`21`	`+ id "com.android.application" version "8.7.3" apply false`
`22`	`22`	`id "org.jetbrains.kotlin.android" version "2.1.20" apply false`
`23`	`23`	`}`
`24`	`24`