refactor : update gradle build version

m-kilic · May 19, 2023 · a24aac1 · a24aac1
1 parent e263a8e
commit a24aac1
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -48,4 +48,5 @@ build/
 /example/lib/src/test_bottom_nav/app_with_bottom_nav.dart
 /example/.env
 /example/pubspec.lock
-pubspec.lock
+pubspec.lock
+.vscode/**
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,7 +2,7 @@ group 'hamza.dali.flutter_osm_plugin'
 version '1.0'
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
@@ -28,14 +28,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 32
+    compileSdk 33
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         minSdkVersion 19
+        multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
@@ -44,14 +45,25 @@ android {
     buildFeatures {
         viewBinding  true
     }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        // Sets Java compatibility to Java 8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+}
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
 }
 dependencies {
 
     def coroutines_version ="1.6.1"
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.7.0-alpha02'
     //implementation 'androidx.core:core-ktx:1.9.0'
     //implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     // Retrofit and relevant converters
@@ -72,6 +84,8 @@ dependencies {
 
     implementation 'org.osmdroid:osmdroid-android:6.1.13'
     implementation 'com.github.MKergall:osmbonuspack:6.9.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.9.0'
+
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 }
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -49,16 +49,17 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    namespace 'hamza.dali.flutter_osm_plugin_example'
 }
 
 flutter {
     source '../..'
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     def multidex_version = "2.0.1"
     implementation "androidx.multidex:multidex:$multidex_version"
 }
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 

diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -15,3 +15,6 @@ android.enableR8=true
 org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1536M"
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ buildscript { @@
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:7.3.1'
+            classpath 'com.android.tools.build:gradle:7.4.2'
         }
     }
@@ Expand Down @@