From a5020e729efc42d959adf44e91595c1cc4bcfe88 Mon Sep 17 00:00:00 2001 From: Inex Code Date: Wed, 30 Oct 2024 14:35:23 +0300 Subject: [PATCH] chore: Upgrade Java version --- android/app/build.gradle | 12 ++++++------ android/gradle.properties | 1 - android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a5fc42bb..4dc3f7f5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,14 +34,14 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '1.8' + jvmTarget = JavaVersion.VERSION_17 } - + sourceSets { main.java.srcDirs += 'src/main/kotlin' } @@ -58,7 +58,7 @@ android { versionCode flutterVersionCode.toInteger() versionName flutterVersionName } - + buildTypes { debug { @@ -67,7 +67,7 @@ android { } release { - + } } buildFeatures { diff --git a/android/gradle.properties b/android/gradle.properties index 85faa95d..598d13fe 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true android.enableJetifier=true -android.bundle.enableUncompressedNativeLibs=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index aeaff6f8..fb5eb592 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/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.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 14d2478f..3e30f2f0 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.3.1" apply false id "org.jetbrains.kotlin.android" version "1.9.21" apply false } -include ":app" \ No newline at end of file +include ":app"