Skip to content

Commit 7302b8c

Browse files
committed
Move from kotlinOptions to compilerOptions.
1 parent b5f043e commit 7302b8c

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

buildSrc/src/main/kotlin/reactivecircus/flowbinding/ProjectConfigurations.kt

+10-9
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package reactivecircus.flowbinding
33
import com.android.build.api.variant.LibraryAndroidComponentsExtension
44
import com.android.build.gradle.LibraryExtension
55
import com.android.build.gradle.TestedExtension
6-
import com.vanniktech.maven.publish.MavenPublishPlugin
7-
import com.vanniktech.maven.publish.SonatypeHost
86
import org.gradle.StartParameter
97
import org.gradle.api.JavaVersion
108
import org.gradle.api.Project
@@ -15,6 +13,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
1513
import org.gradle.kotlin.dsl.configure
1614
import org.gradle.kotlin.dsl.getByType
1715
import org.gradle.kotlin.dsl.withType
16+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
1817
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
1918
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
2019
import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper
@@ -127,14 +126,16 @@ fun Project.configureForAllProjects(enableExplicitApi: Property<Boolean>) {
127126
configureMavenPublishing()
128127

129128
tasks.withType<KotlinCompile>().configureEach {
130-
kotlinOptions {
131-
jvmTarget = JavaVersion.VERSION_11.toString()
132-
freeCompilerArgs = freeCompilerArgs + buildList {
133-
addAll(additionalCompilerArgs)
134-
if (enableExplicitApi.get() && !name.contains("test", ignoreCase = true)) {
135-
add("-Xexplicit-api=strict")
129+
compilerOptions {
130+
jvmTarget.set(JvmTarget.JVM_11)
131+
freeCompilerArgs.set(
132+
buildList {
133+
addAll(additionalCompilerArgs)
134+
if (enableExplicitApi.get() && !name.contains("test", ignoreCase = true)) {
135+
add("-Xexplicit-api=strict")
136+
}
136137
}
137-
}
138+
)
138139
}
139140
}
140141

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kotlin = "1.8.0"
33
dokka = "1.7.20"
44
androidGradlePlugin = "7.3.1"
55
androidLint = "30.3.1"
6-
gradleMavenPublishPlugin = "0.23.0"
6+
gradleMavenPublishPlugin = "0.23.1"
77
binaryCompatibilityValidator = "0.12.1"
88
detekt = "1.22.0"
99
kotlinx-coroutines = "1.6.4"

0 commit comments

Comments
 (0)