Mirrors/Catima-Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2025-12-28 05:14:28 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #2883 from Iamlooker/fix/jvm-configuration
Some checks failed
Android CI / build (Foss) (push) Waiting to run
Details
Android CI / build (Gplay) (push) Waiting to run
Details
i18n check / build (push) Waiting to run
Details
Write contributors to file / Write contributors to file (push) Has been cancelled
Details

Browse Source 
build: Fix conflicting JVM setup
This commit is contained in:
Sylvia van Os 2025-12-20 12:55:58 +01:00 committed by GitHub
commit 2af9d58f06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/build.gradle.kts
View File

@ -1,4 +1,5 @@
import com.android.build.gradle.internal.tasks.factory.dependsOn
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
alias(libs.plugins.com.android.application)
@ -74,16 +75,6 @@ android {
}
}
compileOptions {
encoding = "UTF-8"
// Flag to enable support for the new language APIs
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
sourceSets {
getByName("test") {
resources.srcDirs("src/test/res")
@ -102,10 +93,16 @@ android {
lint {
lintConfig = file("lint.xml")
}
kotlinOptions {
jvmTarget = "21"
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_21
}
}
compileOptions {
encoding = "UTF-8"
// Flag to enable support for the new language APIs
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}