android/ImageToolbox
1
0
Fork 0
mirror of https://github.com/T8RIN/ImageToolbox.git synced 2025-05-17 13:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

unified dependecies with jvmTarget

Browse Source
This commit is contained in:
T8RIN
2024-01-14 19:39:35 +03:00
parent 9684b95c48
commit a6137c5ac6
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -102,8 +102,8 @@ android {
}
}
compileOptions {
sourceCompatibility = rootProject.extra.get("javaCompile") as JavaVersion
targetCompatibility = rootProject.extra.get("javaCompile") as JavaVersion
sourceCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
targetCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
isCoreLibraryDesugaringEnabled = true
}

4
benchmark/build.gradle.kts
View File

@ -18,8 +18,8 @@ android {
}
compileOptions {
sourceCompatibility = rootProject.extra.get("javaCompile") as JavaVersion
targetCompatibility = rootProject.extra.get("javaCompile") as JavaVersion
sourceCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
targetCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get())
}
kotlinOptions {

10
build-logic/convention/src/main/kotlin/com/t8rin/imagetoolbox/ConfigureKotlinAndroid.kt
View File

@ -31,8 +31,10 @@ internal fun Project.configureKotlinAndroid(
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility =
JavaVersion.toVersion(libs.findVersion("jvmTarget").get().toString())
targetCompatibility =
JavaVersion.toVersion(libs.findVersion("jvmTarget").get().toString())
isCoreLibraryDesugaringEnabled = true
}
@ -61,13 +63,13 @@ internal fun Project.configureKotlinAndroid(
"-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi",
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
)
jvmTarget = JavaVersion.VERSION_17.toString()
jvmTarget = libs.findVersion("jvmTarget").get().toString()
}
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17.toString()
jvmTarget = libs.findVersion("jvmTarget").get().toString()
}
}

4
build.gradle.kts
View File

@ -1,8 +1,4 @@
buildscript {
rootProject.extra.apply {
set("javaCompile", JavaVersion.VERSION_17)
}
repositories {
gradlePluginPortal()
google()