From 437592ac2a4712b08792c4ac1c10454f7165c6b4 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 24 Mar 2022 11:08:50 +0100 Subject: [PATCH] Migrate kotlin-gradle-plugin-api module to variants ^KT-49227 In Progress --- libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts | 8 ++++---- .../jetbrains/kotlin/gradle/dsl/KaptExtensionConfig.kt | 0 .../jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt | 0 .../kotlin/gradle/dsl/KotlinCommonToolOptions.kt | 0 .../org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt | 0 .../org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt | 0 .../org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt | 0 .../org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt | 0 .../kotlin/gradle/dsl/kotlinTopLevelExtensionConfig.kt | 0 .../plugin/AbstractCompileWithDependenciesTracking.kt | 0 .../jetbrains/kotlin/gradle/plugin/CinteropSettings.kt | 0 .../kotlin/gradle/plugin/HasKotlinDependencies.kt | 0 .../jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt | 0 .../org/jetbrains/kotlin/gradle/plugin/KotlinExecution.kt | 0 .../kotlin/gradle/plugin/KotlinGradleSubplugin.kt | 0 .../kotlin/gradle/plugin/KotlinJsCompilerType.kt | 0 .../kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt | 0 .../jetbrains/kotlin/gradle/plugin/KotlinPlatformType.kt | 0 .../org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt | 0 .../org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt | 0 .../jetbrains/kotlin/gradle/plugin/KotlinTargetPreset.kt | 0 .../kotlin/gradle/plugin/KotlinTargetsContainer.kt | 0 .../org/jetbrains/kotlin/gradle/plugin/KotlinTestRun.kt | 0 .../kotlin/gradle/plugin/LanguageSettingsBuilder.kt | 0 .../org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt | 0 .../kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt | 0 .../gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt | 0 .../gradle/plugin/mpp/pm20/KotlinCompilationData.kt | 0 .../plugin/mpp/pm20/KotlinDependencyConfigurations.kt | 0 .../mpp/pm20/KotlinFragmentDependencyConfigurations.kt | 0 .../kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt | 0 .../kotlin/gradle/plugin/mpp/pm20/KotlinGradleModule.kt | 0 .../kotlin/gradle/plugin/mpp/pm20/KotlinGradleVariant.kt | 0 .../kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt | 0 .../kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt | 0 35 files changed, 4 insertions(+), 4 deletions(-) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KaptExtensionConfig.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/dsl/kotlinTopLevelExtensionConfig.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/AbstractCompileWithDependenciesTracking.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExecution.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerType.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlatformType.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetPreset.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetsContainer.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTestRun.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleModule.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleVariant.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt (100%) rename libraries/tools/kotlin-gradle-plugin-api/src/{main => common}/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt (100%) diff --git a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts index 1ee0832d13d..a575b0b67b7 100644 --- a/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts @@ -4,8 +4,8 @@ plugins { } dependencies { - api(project(":native:kotlin-native-utils")) - api(project(":kotlin-project-model")) - implementation(project(":kotlin-tooling-core")) - compileOnly("com.android.tools.build:gradle:3.6.4") + commonApi(project(":native:kotlin-native-utils")) + commonApi(project(":kotlin-project-model")) + commonImplementation(project(":kotlin-tooling-core")) + commonCompileOnly("com.android.tools.build:gradle:3.6.4") } diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KaptExtensionConfig.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KaptExtensionConfig.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KaptExtensionConfig.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KaptExtensionConfig.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCommonToolOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinCompile.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsDceOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJsOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinJvmOptions.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/kotlinTopLevelExtensionConfig.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/kotlinTopLevelExtensionConfig.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/kotlinTopLevelExtensionConfig.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/dsl/kotlinTopLevelExtensionConfig.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/AbstractCompileWithDependenciesTracking.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/AbstractCompileWithDependenciesTracking.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/AbstractCompileWithDependenciesTracking.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/AbstractCompileWithDependenciesTracking.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/CinteropSettings.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/HasKotlinDependencies.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinCompilation.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExecution.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExecution.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExecution.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinExecution.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinGradleSubplugin.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerType.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerType.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerType.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerType.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinJsCompilerTypeHolder.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlatformType.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlatformType.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlatformType.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlatformType.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinSourceSet.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTarget.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetPreset.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetPreset.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetPreset.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetPreset.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetsContainer.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetsContainer.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetsContainer.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetsContainer.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTestRun.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTestRun.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTestRun.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTestRun.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/LanguageSettingsBuilder.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/NpmConstants.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/NativeBinaryTypes.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/GradleKpmCompilerPlugin.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinCompilationData.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinDependencyConfigurations.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinFragmentDependencyConfigurations.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleFragment.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleModule.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleModule.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleModule.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleModule.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleVariant.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleVariant.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleVariant.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/pm20/KotlinGradleVariant.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/CompileUsingKotlinDaemon.kt diff --git a/libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt b/libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt similarity index 100% rename from libraries/tools/kotlin-gradle-plugin-api/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt rename to libraries/tools/kotlin-gradle-plugin-api/src/common/kotlin/org/jetbrains/kotlin/gradle/tasks/UsesKotlinJavaToolchain.kt