Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed kotlin jvm and source compatibility versions

Browse source
This commit is contained in:
Thibault Deckers 2024-10-14 19:28:33 +02:00
parent 78a28e6762
commit 0a99dc24b6
8 changed files with 21 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
android/app/build.gradle
View file

@ -1,5 +1,3 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id 'com.android.application' id 'com.android.application'
id 'com.google.devtools.ksp' id 'com.google.devtools.ksp'
@ -30,17 +28,16 @@ if (keystorePropertiesFile.exists()) {
keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: "<NONE>" keystoreProperties["googleApiKey"] = System.getenv("AVES_GOOGLE_API_KEY") ?: "<NONE>"
} }
kotlin {
jvmToolchain 17
}
android { android {
namespace 'deckers.thibault.aves' namespace 'deckers.thibault.aves'
compileSdk 35 compileSdk 35
// cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp // cf https://developer.android.com/studio/projects/install-ndk#default-ndk-per-agp
ndkVersion '26.1.10909125' ndkVersion '26.1.10909125'
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
defaultConfig { defaultConfig {
applicationId packageName applicationId packageName
minSdk flutter.minSdkVersion minSdk flutter.minSdkVersion
@ -133,15 +130,6 @@ android {
} }
} }
tasks.withType(KotlinCompile).configureEach {
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
kotlin {
jvmToolchain(21)
}
flutter { flutter {
source '../..' source '../..'
} }

4
android/exifinterface/build.gradle
View file

@ -20,8 +20,8 @@ android {
} }
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_21 sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_21 targetCompatibility JavaVersion.VERSION_17
} }
} }

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

2
android/settings.gradle
View file

@ -10,7 +10,7 @@ pluginManagement {
settings.ext.kotlin_version = '1.9.24' settings.ext.kotlin_version = '1.9.24'
settings.ext.ksp_version = "$kotlin_version-1.0.20" 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") includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")

13
plugins/aves_platform_meta/android/build.gradle
View file

@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
buildscript { buildscript {
ext { ext {
kotlin_version = '1.9.24' kotlin_version = '1.9.24'
agp_version = '8.4.1' agp_version = '8.7.0'
} }
repositories { repositories {
@ -28,14 +28,13 @@ allprojects {
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
kotlin {
jvmToolchain 17
}
android { android {
namespace 'deckers.thibault.aves.aves_platform_meta' namespace 'deckers.thibault.aves.aves_platform_meta'
compileSdk 34 compileSdk 35
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
lintOptions { lintOptions {
checkAllWarnings true checkAllWarnings true

2
plugins/aves_platform_meta/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip

11
plugins/aves_screen_state/android/build.gradle
View file

@ -4,7 +4,7 @@ version '1.0-SNAPSHOT'
buildscript { buildscript {
ext { ext {
kotlin_version = '1.9.24' kotlin_version = '1.9.24'
agp_version = '8.6.1' agp_version = '8.7.0'
} }
repositories { repositories {
@ -28,15 +28,14 @@ allprojects {
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
apply plugin: 'kotlin-android' apply plugin: 'kotlin-android'
kotlin {
jvmToolchain 17
}
android { android {
namespace 'deckers.thibault.aves.aves_screen_state' namespace 'deckers.thibault.aves.aves_screen_state'
compileSdk 35 compileSdk 35
compileOptions {
sourceCompatibility JavaVersion.VERSION_21
targetCompatibility JavaVersion.VERSION_21
}
lintOptions { lintOptions {
checkAllWarnings true checkAllWarnings true
warningsAsErrors true warningsAsErrors true

2
plugins/aves_screen_state/android/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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