mirror of
https://codeberg.org/Freeyourgadget/Gadgetbridge.git
synced 2026-07-31 07:44:24 +02:00
Merge pull request 'Gradle: update compile SDK from 36.0.0 to 36.1.0 and migrate kotlinOptions to compilerOptions' (#6319)
Reviewed-on: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/6319
This commit is contained in:
+14
-6
@@ -1,3 +1,5 @@
|
|||||||
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
@@ -87,6 +89,12 @@ java {
|
|||||||
toolchain.languageVersion = JavaLanguageVersion.of(21)
|
toolchain.languageVersion = JavaLanguageVersion.of(21)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
compilerOptions {
|
||||||
|
jvmTarget = JvmTarget.JVM_17
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileOptions {
|
compileOptions {
|
||||||
coreLibraryDesugaringEnabled = true
|
coreLibraryDesugaringEnabled = true
|
||||||
@@ -94,13 +102,13 @@ android {
|
|||||||
targetCompatibility = JavaVersion.VERSION_17
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = JavaVersion.VERSION_17
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace = 'nodomain.freeyourgadget.gadgetbridge'
|
namespace = 'nodomain.freeyourgadget.gadgetbridge'
|
||||||
compileSdk = 36
|
compileSdk {
|
||||||
buildToolsVersion = '36.0.0'
|
version = release(36) {
|
||||||
|
it.minorApiLevel = 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
buildToolsVersion = '36.1.0'
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "nodomain.freeyourgadget.gadgetbridge"
|
applicationId "nodomain.freeyourgadget.gadgetbridge"
|
||||||
|
|||||||
Reference in New Issue
Block a user