@@ -9,7 +9,7 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial
99import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
1010
1111apply plugin : ' jdk-convention'
12- apply from : rootProject. file(" gradle/experimental .gradle" )
12+ apply from : rootProject. file(" gradle/opt-in .gradle" )
1313
1414def coreModule = " kotlinx-coroutines-core"
1515// Not applicable for Kotlin plugin
@@ -36,9 +36,6 @@ buildscript {
3636 throw new IllegalArgumentException (" 'kotlin_snapshot_version' should be defined when building with snapshot compiler" )
3737 }
3838 }
39- // These three flags are enabled in train builds for JVM IR compiler testing
40- ext. jvm_ir_enabled = rootProject. properties[' enable_jvm_ir' ] != null
41- ext. jvm_ir_api_check_enabled = rootProject. properties[' enable_jvm_ir_api_check' ] != null
4239 ext. native_targets_enabled = rootProject. properties[' disable_native_targets' ] == null
4340
4441 // Determine if any project dependency is using a snapshot version
@@ -167,9 +164,8 @@ configure(subprojects.findAll { !sourceless.contains(it.name) }) {
167164
168165 // Configure options for all Kotlin compilation tasks
169166 tasks. withType(org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile ). all {
170- kotlinOptions. freeCompilerArgs + = experimentalAnnotations . collect { " -Xuse-experimental =" + it }
167+ kotlinOptions. freeCompilerArgs + = optInAnnotations . collect { " -Xopt-in =" + it }
171168 kotlinOptions. freeCompilerArgs + = " -progressive"
172- kotlinOptions. freeCompilerArgs + = " -XXLanguage:+InlineClasses"
173169 // Disable KT-36770 for RxJava2 integration
174170 kotlinOptions. freeCompilerArgs + = " -XXLanguage:-ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated"
175171 // Remove null assertions to get smaller bytecode on Android
@@ -289,15 +285,6 @@ dependencies {
289285 dokkaHtmlMultiModulePlugin(" org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version " )
290286}
291287
292- // Disable binary compatibility check for JVM IR compiler output by default
293- if (jvm_ir_enabled) {
294- subprojects { project ->
295- configure(tasks. matching { it. name == " apiCheck" }) {
296- enabled = enabled && jvm_ir_api_check_enabled
297- }
298- }
299- }
300-
301288// Opt-in for build scan in order to troubleshoot Gradle on TC
302289if (hasProperty(' buildScan' )) {
303290 buildScan {
0 commit comments