From 94a7c9e98290761864d3b7cd3082ba16c076333a Mon Sep 17 00:00:00 2001 From: chenli Date: Thu, 22 Aug 2024 12:03:33 +0800 Subject: [PATCH] - kotlin_version to 1.5.20 --- android/build.gradle | 4 ++-- android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/local.properties | 11 +++++++++-- example/android/app/build.gradle | 2 +- example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/local.properties | 4 ++-- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 05255ba..5737221 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ group 'net.niuxiaoer.device_identity' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.5.20' repositories { google() mavenCentral() @@ -27,7 +27,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 30 + compileSdkVersion 31 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 3c9d085..ffed3a2 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/android/local.properties b/android/local.properties index 2f13c5b..8442ab2 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,2 +1,9 @@ -sdk.dir=/Users/jlq/Library/Android/sdk -flutter.sdk=/Users/jlq/flutter \ No newline at end of file +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Thu Aug 22 11:49:13 CST 2024 +flutter.sdk=/Users/jlq/flutter +sdk.dir=E\:\\Develop_For_Android\\Android_SDK diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 75eb01a..b875baa 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/example/android/build.gradle b/example/android/build.gradle index ed45c65..e7ac0d9 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..cfe88f6 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/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-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/example/android/local.properties b/example/android/local.properties index 6d15054..13dee5b 100644 --- a/example/android/local.properties +++ b/example/android/local.properties @@ -1,3 +1,3 @@ -sdk.dir=/Users/jlq/Library/Android/sdk -flutter.sdk=/Users/jlq/flutter +sdk.dir=E:\\Develop_For_Android\\Android_SDK +flutter.sdk=E:\\Develop_For_Flutter\\fvm\\versions\\3.19.1 flutter.buildMode=debug \ No newline at end of file