From 1a8496757ebc74622cfc7c1065e5a0e3ba22ecea Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 27 Jun 2022 10:05:23 +0300 Subject: [PATCH] [Compiler] Mark all entrypoints to compiler API as experimental --- .../api/fir/utils/compilerPluginConfiguration.kt | 2 ++ .../api/fir/test/base/compilerPluginConfiguration.kt | 2 ++ buildSrc/src/main/kotlin/tasks.kt | 8 ++++++++ compiler/build.gradle.kts | 2 ++ compiler/cli/build.gradle.kts | 4 ++++ compiler/cli/cli-common/build.gradle.kts | 2 ++ compiler/daemon/build.gradle.kts | 2 ++ compiler/plugin-api/build.gradle.kts | 2 ++ .../kotlin/compiler/plugin/CommandLineProcessor.kt | 3 ++- .../kotlin/compiler/plugin/CompilerPluginRegistrar.kt | 1 + .../kotlin/compiler/plugin/ComponentRegistrar.kt | 1 + .../kotlin/compiler/plugin/ExperimentalCompilerApi.kt | 9 +++++++++ compiler/test-infrastructure/build.gradle.kts | 2 ++ compiler/tests-common-new/build.gradle.kts | 2 ++ compiler/tests-common/build.gradle.kts | 2 ++ js/js.tests/build.gradle.kts | 2 ++ .../kotlin-gradle-subplugin-example/build.gradle | 1 + libraries/scripting/js-test/build.gradle.kts | 2 ++ .../tools/kotlin-annotation-processing-maven/pom.xml | 3 +++ .../incrementalChangeInPlugin/plugin/build.gradle | 1 + libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 1 + libraries/tools/kotlin-maven-allopen/pom.xml | 5 +++++ libraries/tools/kotlin-maven-lombok/pom.xml | 5 +++++ libraries/tools/kotlin-maven-noarg/pom.xml | 3 +++ .../src/it/test-plugins/test-extension/pom.xml | 5 +++++ libraries/tools/kotlin-maven-sam-with-receiver/pom.xml | 5 +++++ libraries/tools/kotlin-maven-serialization/pom.xml | 1 + libraries/tools/kotlin-script-util/build.gradle.kts | 2 ++ plugins/allopen/allopen.cli/build.gradle.kts | 2 ++ plugins/allopen/build.gradle.kts | 2 ++ .../android-extensions-compiler/build.gradle.kts | 2 ++ plugins/atomicfu/atomicfu-compiler/build.gradle.kts | 4 ++++ plugins/fir-plugin-prototype/build.gradle.kts | 2 ++ plugins/imports-dumper/build.gradle.kts | 2 ++ plugins/jvm-abi-gen/build.gradle.kts | 2 ++ plugins/kapt3/kapt3-compiler/build.gradle.kts | 2 ++ .../kotlin-serialization-compiler/build.gradle.kts | 4 +++- plugins/lombok/build.gradle.kts | 2 ++ plugins/lombok/lombok.cli/build.gradle.kts | 2 ++ plugins/noarg/build.gradle.kts | 4 ++++ plugins/noarg/noarg.cli/build.gradle.kts | 2 ++ plugins/parcelize/parcelize-compiler/build.gradle.kts | 2 ++ .../parcelize-compiler/parcelize.cli/build.gradle.kts | 2 ++ plugins/sam-with-receiver/build.gradle.kts | 2 ++ .../sam-with-receiver.cli/build.gradle.kts | 2 ++ plugins/scripting/scripting-compiler/build.gradle.kts | 2 ++ 46 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ExperimentalCompilerApi.kt diff --git a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt index 046cc4fcc61..cc8c4bbf402 100644 --- a/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt +++ b/analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/compilerPluginConfiguration.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.api.fir.utils import com.intellij.openapi.project.Project import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.LanguageVersion @@ -65,6 +66,7 @@ private class EnabledByDirectiveConfiguratorDecorator( original.legacyRegisterCompilerExtensions(project, module, configuration) } + @OptIn(ExperimentalCompilerApi::class) override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( module: TestModule, configuration: CompilerConfiguration diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/compilerPluginConfiguration.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/compilerPluginConfiguration.kt index 6d2a86f2761..eb17e4231cf 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/compilerPluginConfiguration.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/base/compilerPluginConfiguration.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.test.base import com.intellij.openapi.project.Project import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar +import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi import org.jetbrains.kotlin.config.AnalysisFlag import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.LanguageVersion @@ -65,6 +66,7 @@ private class EnabledByDirectiveConfiguratorDecorator( original.legacyRegisterCompilerExtensions(project, module, configuration) } + @OptIn(ExperimentalCompilerApi::class) override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions( module: TestModule, configuration: CompilerConfiguration diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index ad90c7958e5..73857d7020e 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -330,3 +330,11 @@ fun Project.confugureFirPluginAnnotationsDependency(testTask: TaskProvider } } } + +fun Project.optInToExperimentalCompilerApi() { + tasks.withType>().configureEach { + kotlinOptions { + freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi" + } + } +} diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 1107178f6d9..655829eb90a 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -44,6 +44,8 @@ dependencies { antLauncherJar(toolsJar()) } +optInToExperimentalCompilerApi() + sourceSets { "main" {} "test" { diff --git a/compiler/cli/build.gradle.kts b/compiler/cli/build.gradle.kts index e3cd51e3fd9..4f97555e156 100644 --- a/compiler/cli/build.gradle.kts +++ b/compiler/cli/build.gradle.kts @@ -53,6 +53,10 @@ sourceSets { "test" { } } +allprojects { + optInToExperimentalCompilerApi() +} + tasks.withType> { kotlinOptions { languageVersion = "1.4" diff --git a/compiler/cli/cli-common/build.gradle.kts b/compiler/cli/cli-common/build.gradle.kts index 8f4f39d7fbe..8a752de2609 100644 --- a/compiler/cli/cli-common/build.gradle.kts +++ b/compiler/cli/cli-common/build.gradle.kts @@ -21,6 +21,8 @@ sourceSets { "test" {} } +optInToExperimentalCompilerApi() + tasks.getByName("jar") { //excludes unused bunch files exclude("META-INF/extensions/*.xml.**") diff --git a/compiler/daemon/build.gradle.kts b/compiler/daemon/build.gradle.kts index 724a47c041d..addbbfd7a61 100644 --- a/compiler/daemon/build.gradle.kts +++ b/compiler/daemon/build.gradle.kts @@ -24,6 +24,8 @@ dependencies { } } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" {} diff --git a/compiler/plugin-api/build.gradle.kts b/compiler/plugin-api/build.gradle.kts index 85e5d609e16..ae55dc27d5f 100644 --- a/compiler/plugin-api/build.gradle.kts +++ b/compiler/plugin-api/build.gradle.kts @@ -18,3 +18,5 @@ sourceSets { tasks.withType().configureEach { kotlinOptions.freeCompilerArgs += "-Xjvm-default=all-compatibility" } + +optInToExperimentalCompilerApi() diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt index b1bb3b94b7a..504b3a0ab5b 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CommandLineProcessor.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.compiler.plugin import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey +@ExperimentalCompilerApi interface CommandLineProcessor { val pluginId: String val pluginOptions: Collection @@ -63,4 +64,4 @@ interface CommandLineProcessor { return this.toMutableList() } -} \ No newline at end of file +} diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar.kt index 727a1da7420..60dc8ae1113 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/CompilerPluginRegistrar.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor +@ExperimentalCompilerApi abstract class CompilerPluginRegistrar { companion object { val COMPILER_PLUGIN_REGISTRARS: CompilerConfigurationKey> = diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt index 581ad088b01..161c884ec21 100644 --- a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ComponentRegistrar.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.config.CompilerConfigurationKey replaceWith = ReplaceWith("CompilerPluginRegistrar", "org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar"), level = DeprecationLevel.WARNING ) +@ExperimentalCompilerApi interface ComponentRegistrar { companion object { @Suppress("DEPRECATION") diff --git a/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ExperimentalCompilerApi.kt b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ExperimentalCompilerApi.kt new file mode 100644 index 00000000000..0bb3389e657 --- /dev/null +++ b/compiler/plugin-api/src/org/jetbrains/kotlin/compiler/plugin/ExperimentalCompilerApi.kt @@ -0,0 +1,9 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.compiler.plugin + +@RequiresOptIn("This API is experimental. There are no stability guarantees for it") +annotation class ExperimentalCompilerApi diff --git a/compiler/test-infrastructure/build.gradle.kts b/compiler/test-infrastructure/build.gradle.kts index 6160d1cc46e..b08093f797a 100644 --- a/compiler/test-infrastructure/build.gradle.kts +++ b/compiler/test-infrastructure/build.gradle.kts @@ -17,6 +17,8 @@ dependencies { testRuntimeOnly(commonDependency("net.java.dev.jna:jna")) } +optInToExperimentalCompilerApi() + sourceSets { "main" { none() } "test" { projectDefault() } diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index f7140a2201d..6416376b175 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -40,6 +40,8 @@ dependencies { testApi(toolsJar()) } +optInToExperimentalCompilerApi() + val generationRoot = projectDir.resolve("tests-gen") sourceSets { diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 1dc7dc05488..8d4a404148e 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -82,6 +82,8 @@ dependencies { testApiJUnit5() } +optInToExperimentalCompilerApi() + sourceSets { "main" { } "test" { projectDefault() } diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index f2fb9db123b..619004dce5d 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -81,6 +81,8 @@ dependencies { val generationRoot = projectDir.resolve("tests-gen") +optInToExperimentalCompilerApi() + sourceSets { "main" { } "test" { diff --git a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle index 00f35cbcfef..ec1f6c48ab3 100644 --- a/libraries/examples/kotlin-gradle-subplugin-example/build.gradle +++ b/libraries/examples/kotlin-gradle-subplugin-example/build.gradle @@ -38,6 +38,7 @@ dependencies { GradleCommonKt.configureCommonPublicationSettingsForGradle(project) GradleCommonKt.configureKotlinCompileTasksGradleCompatibility(project) GradleCommonKt.excludeGradleCommonDependencies(project, sourceSets.main) +TasksKt.optInToExperimentalCompilerApi(project) extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false" diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 0db2c589892..f3457242940 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -21,6 +21,8 @@ dependencies { testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j")) } +optInToExperimentalCompilerApi() + sourceSets { "main" {} "test" { projectDefault() } diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml index 50a9a7ee66f..ba66e238172 100755 --- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml +++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml @@ -79,6 +79,9 @@ ${basedir}/kotlinAnnotation + + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/compilerPlugins/incrementalChangeInPlugin/plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/compilerPlugins/incrementalChangeInPlugin/plugin/build.gradle index 73c06f3a9d2..56ca4c0fc42 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/compilerPlugins/incrementalChangeInPlugin/plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/compilerPlugins/incrementalChangeInPlugin/plugin/build.gradle @@ -10,4 +10,5 @@ dependencies { compileKotlin { kotlinOptions.jvmTarget = "1.8" + kotlinOptions.freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi" } diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index d466c86aa06..ae20259daeb 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -27,6 +27,7 @@ kotlin.sourceSets.all { languageSettings.optIn("org.jetbrains.kotlin.gradle.plugin.mpp.pm20.AdvancedKotlinGradlePluginApi") languageSettings.optIn("org.jetbrains.kotlin.gradle.kpm.idea.InternalKotlinGradlePluginApi") languageSettings.optIn("org.jetbrains.kotlin.gradle.plugin.ExperimentalKotlinGradlePluginApi") + languageSettings.optIn("org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi") } dependencies { diff --git a/libraries/tools/kotlin-maven-allopen/pom.xml b/libraries/tools/kotlin-maven-allopen/pom.xml index 96f46caa829..64a4b221c6b 100755 --- a/libraries/tools/kotlin-maven-allopen/pom.xml +++ b/libraries/tools/kotlin-maven-allopen/pom.xml @@ -77,6 +77,11 @@ compile + + + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi + + org.codehaus.plexus diff --git a/libraries/tools/kotlin-maven-lombok/pom.xml b/libraries/tools/kotlin-maven-lombok/pom.xml index 4b582ee3a45..672efb1946f 100755 --- a/libraries/tools/kotlin-maven-lombok/pom.xml +++ b/libraries/tools/kotlin-maven-lombok/pom.xml @@ -83,6 +83,11 @@ + + + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi + + org.codehaus.plexus diff --git a/libraries/tools/kotlin-maven-noarg/pom.xml b/libraries/tools/kotlin-maven-noarg/pom.xml index 2481dc5f0fd..bbf396fb8d0 100755 --- a/libraries/tools/kotlin-maven-noarg/pom.xml +++ b/libraries/tools/kotlin-maven-noarg/pom.xml @@ -83,6 +83,9 @@ 1.8 + + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi + diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml index 8f564844199..0f6a128b0bf 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/test-extension/pom.xml @@ -54,6 +54,11 @@ + + + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi + + org.codehaus.plexus diff --git a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml index 650d5fcc51b..4fc0dbebb04 100755 --- a/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml +++ b/libraries/tools/kotlin-maven-sam-with-receiver/pom.xml @@ -80,6 +80,11 @@ compile + + + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi + + org.codehaus.plexus diff --git a/libraries/tools/kotlin-maven-serialization/pom.xml b/libraries/tools/kotlin-maven-serialization/pom.xml index cc7945b52cf..197088baef9 100755 --- a/libraries/tools/kotlin-maven-serialization/pom.xml +++ b/libraries/tools/kotlin-maven-serialization/pom.xml @@ -77,6 +77,7 @@ -Xjvm-default=enable -opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI + -opt-in=org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index 9f4e349135f..ba7e11e978e 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -30,6 +30,8 @@ dependencies { testApi(intellijCore()) } +optInToExperimentalCompilerApi() + configurations.all { resolutionStrategy { force(commonDependency("junit:junit")) diff --git a/plugins/allopen/allopen.cli/build.gradle.kts b/plugins/allopen/allopen.cli/build.gradle.kts index d033d581b36..2b6729caac8 100644 --- a/plugins/allopen/allopen.cli/build.gradle.kts +++ b/plugins/allopen/allopen.cli/build.gradle.kts @@ -24,6 +24,8 @@ dependencies { runtimeOnly(kotlinStdlib()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { none() } diff --git a/plugins/allopen/build.gradle.kts b/plugins/allopen/build.gradle.kts index b6b8f2fa420..3583f093482 100644 --- a/plugins/allopen/build.gradle.kts +++ b/plugins/allopen/build.gradle.kts @@ -33,6 +33,8 @@ dependencies { testRuntimeOnly(project(":core:descriptors.runtime")) } +optInToExperimentalCompilerApi() + sourceSets { "main" { none() } "test" { diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 4da2486de64..960d284658a 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -43,6 +43,8 @@ dependencies { androidExtensionsRuntimeForTests(project(":kotlin-android-extensions-runtime")) { isTransitive = false } } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts index 5ed97455e17..4e12edb5ffe 100644 --- a/plugins/atomicfu/atomicfu-compiler/build.gradle.kts +++ b/plugins/atomicfu/atomicfu-compiler/build.gradle.kts @@ -92,11 +92,15 @@ dependencies { testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.6.2") } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { projectDefault() } } +optInToExperimentalCompilerApi() + runtimeJar() sourcesJar() javadocJar() diff --git a/plugins/fir-plugin-prototype/build.gradle.kts b/plugins/fir-plugin-prototype/build.gradle.kts index 290ab430c1e..df22e8a5eae 100644 --- a/plugins/fir-plugin-prototype/build.gradle.kts +++ b/plugins/fir-plugin-prototype/build.gradle.kts @@ -39,6 +39,8 @@ dependencies { testRuntimeOnly(toolsJar()) } +optInToExperimentalCompilerApi() + val generationRoot = projectDir.resolve("tests-gen") sourceSets { diff --git a/plugins/imports-dumper/build.gradle.kts b/plugins/imports-dumper/build.gradle.kts index d65a11b5c8c..a2aec2ccf76 100644 --- a/plugins/imports-dumper/build.gradle.kts +++ b/plugins/imports-dumper/build.gradle.kts @@ -30,4 +30,6 @@ projectTest { dependsOn(":dist") } +optInToExperimentalCompilerApi() + runtimeJar() diff --git a/plugins/jvm-abi-gen/build.gradle.kts b/plugins/jvm-abi-gen/build.gradle.kts index c78ea3eae04..43342611a5a 100644 --- a/plugins/jvm-abi-gen/build.gradle.kts +++ b/plugins/jvm-abi-gen/build.gradle.kts @@ -46,6 +46,8 @@ dependencies { testImplementation(projectTests(":compiler:incremental-compilation-impl")) } +optInToExperimentalCompilerApi() + publish() noDefaultJar() diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index 18311e318aa..ce558d64f0e 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -39,6 +39,8 @@ dependencies { embedded(project(":kotlin-annotation-processing-base")) { isTransitive = false } } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts index 69dd63faf7a..eec076848d2 100644 --- a/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts +++ b/plugins/kotlin-serialization/kotlin-serialization-compiler/build.gradle.kts @@ -47,6 +47,8 @@ tasks.withType> { } } +optInToExperimentalCompilerApi() + runtimeJar() sourcesJar() javadocJar() @@ -57,4 +59,4 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) { useJUnitPlatform() } -val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt") \ No newline at end of file +val generateTests by generator("org.jetbrains.kotlinx.serialization.TestGeneratorKt") diff --git a/plugins/lombok/build.gradle.kts b/plugins/lombok/build.gradle.kts index a90d5222511..8e0130b604f 100644 --- a/plugins/lombok/build.gradle.kts +++ b/plugins/lombok/build.gradle.kts @@ -44,6 +44,8 @@ dependencies { testRuntimeOnly(toolsJar()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { none() } "test" { diff --git a/plugins/lombok/lombok.cli/build.gradle.kts b/plugins/lombok/lombok.cli/build.gradle.kts index edcf121d288..5e4f50b5c3b 100644 --- a/plugins/lombok/lombok.cli/build.gradle.kts +++ b/plugins/lombok/lombok.cli/build.gradle.kts @@ -20,6 +20,8 @@ dependencies { compileOnly(intellijCore()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { none() } diff --git a/plugins/noarg/build.gradle.kts b/plugins/noarg/build.gradle.kts index 045947cde1c..a512758495e 100644 --- a/plugins/noarg/build.gradle.kts +++ b/plugins/noarg/build.gradle.kts @@ -29,6 +29,8 @@ dependencies { testApi(intellijCore()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { none() } "test" { @@ -37,6 +39,8 @@ sourceSets { } } +optInToExperimentalCompilerApi() + runtimeJar() sourcesJar() javadocJar() diff --git a/plugins/noarg/noarg.cli/build.gradle.kts b/plugins/noarg/noarg.cli/build.gradle.kts index 4ce43ad4973..c994b4a7afa 100644 --- a/plugins/noarg/noarg.cli/build.gradle.kts +++ b/plugins/noarg/noarg.cli/build.gradle.kts @@ -18,6 +18,8 @@ dependencies { compileOnly(intellijCore()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { none() } diff --git a/plugins/parcelize/parcelize-compiler/build.gradle.kts b/plugins/parcelize/parcelize-compiler/build.gradle.kts index 671c52ddfe4..bb369a1d95c 100644 --- a/plugins/parcelize/parcelize-compiler/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/build.gradle.kts @@ -61,6 +61,8 @@ dependencies { layoutLibApi("com.android.tools.layoutlib:layoutlib-api:26.5.0") { isTransitive = false } } +optInToExperimentalCompilerApi() + sourceSets { "main" { none() } "test" { diff --git a/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts b/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts index 096c307b9a2..8ae3c58da6f 100644 --- a/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts +++ b/plugins/parcelize/parcelize-compiler/parcelize.cli/build.gradle.kts @@ -23,6 +23,8 @@ sourceSets { "test" { none() } } +optInToExperimentalCompilerApi() + runtimeJar() javadocJar() sourcesJar() diff --git a/plugins/sam-with-receiver/build.gradle.kts b/plugins/sam-with-receiver/build.gradle.kts index 1f47cead904..67c8255beca 100644 --- a/plugins/sam-with-receiver/build.gradle.kts +++ b/plugins/sam-with-receiver/build.gradle.kts @@ -35,6 +35,8 @@ dependencies { testApi(intellijCore()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { none() } "test" { diff --git a/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts index 8cac09c1ca9..48d8a7edaf9 100644 --- a/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver.cli/build.gradle.kts @@ -15,6 +15,8 @@ dependencies { compileOnly(intellijCore()) } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { none() } diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts index a8d8710e8f1..2ca96745d8c 100644 --- a/plugins/scripting/scripting-compiler/build.gradle.kts +++ b/plugins/scripting/scripting-compiler/build.gradle.kts @@ -36,6 +36,8 @@ dependencies { testImplementation(project(":kotlin-reflect")) } +optInToExperimentalCompilerApi() + sourceSets { "main" { projectDefault() } "test" { projectDefault() }