@@ -9,7 +9,7 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial
9
9
import org.jetbrains.dokka.gradle.DokkaMultiModuleTask
10
10
11
11
apply plugin : ' jdk-convention'
12
- apply from : rootProject. file(" gradle/experimental .gradle" )
12
+ apply from : rootProject. file(" gradle/opt-in .gradle" )
13
13
14
14
def coreModule = " kotlinx-coroutines-core"
15
15
// Not applicable for Kotlin plugin
@@ -36,9 +36,6 @@ buildscript {
36
36
throw new IllegalArgumentException (" 'kotlin_snapshot_version' should be defined when building with snapshot compiler" )
37
37
}
38
38
}
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
42
39
ext. native_targets_enabled = rootProject. properties[' disable_native_targets' ] == null
43
40
44
41
// Determine if any project dependency is using a snapshot version
@@ -167,9 +164,8 @@ configure(subprojects.findAll { !sourceless.contains(it.name) }) {
167
164
168
165
// Configure options for all Kotlin compilation tasks
169
166
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 }
171
168
kotlinOptions. freeCompilerArgs + = " -progressive"
172
- kotlinOptions. freeCompilerArgs + = " -XXLanguage:+InlineClasses"
173
169
// Disable KT-36770 for RxJava2 integration
174
170
kotlinOptions. freeCompilerArgs + = " -XXLanguage:-ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated"
175
171
// Remove null assertions to get smaller bytecode on Android
@@ -289,15 +285,6 @@ dependencies {
289
285
dokkaHtmlMultiModulePlugin(" org.jetbrains.kotlinx:dokka-pathsaver-plugin:$knit_version " )
290
286
}
291
287
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
-
301
288
// Opt-in for build scan in order to troubleshoot Gradle on TC
302
289
if (hasProperty(' buildScan' )) {
303
290
buildScan {
0 commit comments