From 0a99dc24b6469c94a47c76e934c825362516fcc2 Mon Sep 17 00:00:00 2001 From: Thibault Deckers Date: Mon, 14 Oct 2024 19:28:33 +0200 Subject: [PATCH] fixed kotlin jvm and source compatibility versions --- android/app/build.gradle | 20 ++++--------------- android/exifinterface/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 2 +- .../aves_platform_meta/android/build.gradle | 13 ++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../aves_screen_state/android/build.gradle | 11 +++++----- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 21 insertions(+), 35 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 2bf34a887..4fbc11e49 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { id 'com.android.application' id 'com.google.devtools.ksp' @@ -30,17 +28,16 @@ if (keystorePropertiesFile.exists()) { keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: "" } +kotlin { + jvmToolchain 17 +} + android { namespace 'deckers.thibault.aves' compileSdk 35 // cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp ndkVersion '26.1.10909125' - compileOptions { - sourceCompatibility JavaVersion.VERSION_21 - targetCompatibility JavaVersion.VERSION_21 - } - defaultConfig { applicationId packageName minSdk flutter.minSdkVersion @@ -133,15 +130,6 @@ android { } } -tasks.withType(KotlinCompile).configureEach { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - -kotlin { - jvmToolchain(21) -} - flutter { source '../..' } diff --git a/android/exifinterface/build.gradle b/android/exifinterface/build.gradle index d2e62e0d5..46bfa54d8 100644 --- a/android/exifinterface/build.gradle +++ b/android/exifinterface/build.gradle @@ -20,8 +20,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_21 - targetCompatibility JavaVersion.VERSION_21 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 45181329e..81a4301fc 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-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip diff --git a/android/settings.gradle b/android/settings.gradle index e262ed8f1..76ed740ec 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { settings.ext.kotlin_version = '1.9.24' settings.ext.ksp_version = "$kotlin_version-1.0.20" - settings.ext.agp_version = '8.6.1' + settings.ext.agp_version = '8.7.0' includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") diff --git a/plugins/aves_platform_meta/android/build.gradle b/plugins/aves_platform_meta/android/build.gradle index 3a4eafe4d..c2e5a094c 100644 --- a/plugins/aves_platform_meta/android/build.gradle +++ b/plugins/aves_platform_meta/android/build.gradle @@ -4,7 +4,7 @@ version '1.0-SNAPSHOT' buildscript { ext { kotlin_version = '1.9.24' - agp_version = '8.4.1' + agp_version = '8.7.0' } repositories { @@ -28,14 +28,13 @@ allprojects { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +kotlin { + jvmToolchain 17 +} + android { namespace 'deckers.thibault.aves.aves_platform_meta' - compileSdk 34 - - compileOptions { - sourceCompatibility JavaVersion.VERSION_21 - targetCompatibility JavaVersion.VERSION_21 - } + compileSdk 35 lintOptions { checkAllWarnings true diff --git a/plugins/aves_platform_meta/android/gradle/wrapper/gradle-wrapper.properties b/plugins/aves_platform_meta/android/gradle/wrapper/gradle-wrapper.properties index 00fb30350..41f4bed65 100644 --- a/plugins/aves_platform_meta/android/gradle/wrapper/gradle-wrapper.properties +++ b/plugins/aves_platform_meta/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-8.6-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip \ No newline at end of file diff --git a/plugins/aves_screen_state/android/build.gradle b/plugins/aves_screen_state/android/build.gradle index d9c4eebad..3c3c2c0eb 100644 --- a/plugins/aves_screen_state/android/build.gradle +++ b/plugins/aves_screen_state/android/build.gradle @@ -4,7 +4,7 @@ version '1.0-SNAPSHOT' buildscript { ext { kotlin_version = '1.9.24' - agp_version = '8.6.1' + agp_version = '8.7.0' } repositories { @@ -28,15 +28,14 @@ allprojects { apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +kotlin { + jvmToolchain 17 +} + android { namespace 'deckers.thibault.aves.aves_screen_state' compileSdk 35 - compileOptions { - sourceCompatibility JavaVersion.VERSION_21 - targetCompatibility JavaVersion.VERSION_21 - } - lintOptions { checkAllWarnings true warningsAsErrors true diff --git a/plugins/aves_screen_state/android/gradle/wrapper/gradle-wrapper.properties b/plugins/aves_screen_state/android/gradle/wrapper/gradle-wrapper.properties index a10c8212e..1ae95f17d 100644 --- a/plugins/aves_screen_state/android/gradle/wrapper/gradle-wrapper.properties +++ b/plugins/aves_screen_state/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-8.7-bin.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip \ No newline at end of file