From 1f10b927ae8b0f813f9fb73ba01b74a66075ae43 Mon Sep 17 00:00:00 2001
From: Ming Ming <nkming2@gmail.com>
Date: Fri, 26 May 2023 15:30:24 +0800
Subject: [PATCH] Update kotlin and android dependecies
---
app/android/app/build.gradle | 7 ++++---
app/android/build.gradle | 4 ++--
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
plugin/android/build.gradle | 14 +++++++-------
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
5 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle
index 9541de68..5be34b01 100644
--- a/app/android/app/build.gradle
+++ b/app/android/app/build.gradle
@@ -116,9 +116,10 @@ flutter {
}
dependencies {
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
// fix crash on sdk33, need investigation
implementation "androidx.window:window:1.0.0"
- implementation 'com.google.android.gms:play-services-maps:18.0.2'
- coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.8'
+ implementation 'com.google.android.gms:play-services-maps:18.1.0'
+ coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3"
}
diff --git a/app/android/build.gradle b/app/android/build.gradle
index 68b05e9c..ec3244ca 100644
--- a/app/android/build.gradle
+++ b/app/android/build.gradle
@@ -1,12 +1,12 @@
buildscript {
- ext.kotlin_version = '1.6.21'
+ ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.2.2'
+ classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties
index 562c5e44..6b665338 100644
--- a/app/android/gradle/wrapper/gradle-wrapper.properties
+++ b/app/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-7.5-all.zip
diff --git a/plugin/android/build.gradle b/plugin/android/build.gradle
index d2346eee..172c1411 100644
--- a/plugin/android/build.gradle
+++ b/plugin/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.nkming.nc_photos.plugin'
version '1.0-SNAPSHOT'
buildscript {
- ext.kotlin_version = '1.6.21'
+ ext.kotlin_version = '1.8.20'
repositories {
google()
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.4'
+ classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@@ -62,9 +62,9 @@ android {
}
dependencies {
- coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.8"
- implementation "androidx.annotation:annotation:1.4.0"
- implementation "androidx.core:core-ktx:1.8.0"
- implementation "androidx.exifinterface:exifinterface:1.3.3"
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.3"
+ implementation "androidx.annotation:annotation:1.6.0"
+ implementation "androidx.core:core-ktx:1.10.1"
+ implementation "androidx.exifinterface:exifinterface:1.3.6"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
diff --git a/plugin/android/gradle/wrapper/gradle-wrapper.properties b/plugin/android/gradle/wrapper/gradle-wrapper.properties
index f338a880..3c472b99 100644
--- a/plugin/android/gradle/wrapper/gradle-wrapper.properties
+++ b/plugin/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-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip