From 8364b56178f6d428bbb5c57371ec1edf5ebe1c1e Mon Sep 17 00:00:00 2001 From: nyne Date: Sat, 14 Dec 2024 21:26:51 +0800 Subject: [PATCH] fix android --- android/app/build.gradle | 20 ++++++------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 4 ++-- pubspec.lock | 2 +- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 318bd7b..c1e12fb 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,25 +34,19 @@ android { ndkVersion flutter.ndkVersion compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + kotlinOptions{ + jvmTarget = JavaVersion.VERSION_17 } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.github.wgh136.pixes" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion flutter.minSdkVersion - targetSdkVersion 34 + targetSdk = flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -74,9 +68,7 @@ android { buildTypes { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e1ca574..b5fc5a7 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 1d6d19b..2b25ebe 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -19,8 +19,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "com.android.application" version "8.2.1" apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app" diff --git a/pubspec.lock b/pubspec.lock index 8063fe2..01464dc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -331,7 +331,7 @@ packages: description: path: "." ref: master - resolved-ref: "3f8c4d2cc41002d3ffdb770cab3b62583326ce01" + resolved-ref: "38a38c45d3ed229cbc1d827eb2b5aaad1a4519cd" url: "https://github.com/wgh136/image_gallery_saver" source: git version: "2.0.0"