msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-15 02:57:04 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 4

refactor(build): migrate to Kotlin compilerOptions DSL

Browse source
This commit is contained in:
Harsh Shandilya 2023-04-19 12:36:03 +05:30
parent bf104a1d85
commit 6b164f84d9
No known key found for this signature in database
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
build-logic/build.gradle.kts
View file

@ -7,6 +7,7 @@
import org.gradle.api.JavaVersion import org.gradle.api.JavaVersion
import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { `kotlin-dsl` } plugins { `kotlin-dsl` }
@ -17,7 +18,7 @@ tasks.withType<JavaCompile>().configureEach {
} }
tasks.withType<KotlinCompile>().configureEach { tasks.withType<KotlinCompile>().configureEach {
kotlinOptions { jvmTarget = JavaVersion.VERSION_11.toString() } compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
} }
gradlePlugin { gradlePlugin {

19
build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.kt
View file

@ -13,7 +13,9 @@ import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.api.tasks.testing.Test import org.gradle.api.tasks.testing.Test
import org.gradle.api.tasks.testing.logging.TestLogEvent import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.gradle.kotlin.dsl.withType import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
@Suppress("Unused") @Suppress("Unused")
class KotlinCommonPlugin : Plugin<Project> { class KotlinCommonPlugin : Plugin<Project> {
@ -24,13 +26,14 @@ class KotlinCommonPlugin : Plugin<Project> {
sourceCompatibility = JavaVersion.VERSION_11.toString() sourceCompatibility = JavaVersion.VERSION_11.toString()
targetCompatibility = JavaVersion.VERSION_11.toString() targetCompatibility = JavaVersion.VERSION_11.toString()
} }
withType<KotlinCompile>().configureEach { withType<KotlinJvmCompile>().configureEach {
kotlinOptions { compilerOptions {
allWarningsAsErrors = allWarningsAsErrors.set(
false // project.providers.environmentVariable("GITHUB_WORKFLOW").isPresent project.providers.environmentVariable("GITHUB_WORKFLOW").isPresent
jvmTarget = JavaVersion.VERSION_11.toString() )
freeCompilerArgs = freeCompilerArgs + ADDITIONAL_COMPILER_ARGS jvmTarget.set(JvmTarget.JVM_11)
languageVersion = "1.7" freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
languageVersion.set(KotlinVersion.KOTLIN_1_7)
} }
} }
withType<Test>().configureEach { withType<Test>().configureEach {