diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index fa88468bd6f..08e10c87943 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -79,8 +79,8 @@ val kotlinGradlePluginAndItsRequired = arrayOf( ":kotlin-test-js-runner", ":native:kotlin-klib-commonizer-embeddable", ":native:kotlin-klib-commonizer-api", - ":compiler:build-tools:build-tools-api", - ":compiler:build-tools:build-tools-impl", + ":compiler:build-tools:kotlin-build-tools-api", + ":compiler:build-tools:kotlin-build-tools-impl", ) fun Task.dependsOnKotlinGradlePluginInstall() { diff --git a/compiler/build-tools/README.md b/compiler/build-tools/README.md index d9b1c97570b..01ba1a2aaef 100644 --- a/compiler/build-tools/README.md +++ b/compiler/build-tools/README.md @@ -1,3 +1,3 @@ ## Build Tools -Please refer to the [Build Tools API readme](./build-tools-api/README.md). \ No newline at end of file +Please refer to the [Build Tools API readme](kotlin-build-tools-api/README.md). \ No newline at end of file diff --git a/compiler/build-tools/build-tools-api/README.md b/compiler/build-tools/kotlin-build-tools-api/README.md similarity index 82% rename from compiler/build-tools/build-tools-api/README.md rename to compiler/build-tools/kotlin-build-tools-api/README.md index dc1954a4181..bd62f2ab421 100644 --- a/compiler/build-tools/build-tools-api/README.md +++ b/compiler/build-tools/kotlin-build-tools-api/README.md @@ -4,6 +4,6 @@ This module contains public interfaces for Kotlin build tools. Using APIs from this module should be the preferred way to work with Kotlin compiler when integrating Kotlin builds into different build systems. The Kotlin stdlib of at least Kotlin 1.4 is expected to be a dependency of a consumer of the API. -The default implementation of the API is located in the [build-tools-impl](../build-tools-impl) directory. +The default implementation of the API is located in the [kotlin-build-tools-impl](../kotlin-build-tools-impl) directory. Interfaces implementation are expected to be loaded using the [ServiceLoader](https://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html). The purpose of such a segregation is to allow using this API with different Kotlin compiler versions. \ No newline at end of file diff --git a/compiler/build-tools/build-tools-api/api/build-tools-api.api b/compiler/build-tools/kotlin-build-tools-api/api/build-tools-api.api similarity index 100% rename from compiler/build-tools/build-tools-api/api/build-tools-api.api rename to compiler/build-tools/kotlin-build-tools-api/api/build-tools-api.api diff --git a/compiler/build-tools/build-tools-api/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-api/build.gradle.kts similarity index 100% rename from compiler/build-tools/build-tools-api/build.gradle.kts rename to compiler/build-tools/kotlin-build-tools-api/build.gradle.kts diff --git a/compiler/build-tools/build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/CompilationService.kt b/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/CompilationService.kt similarity index 100% rename from compiler/build-tools/build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/CompilationService.kt rename to compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/CompilationService.kt diff --git a/compiler/build-tools/build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/SharedApiClassesClassLoader.kt b/compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/SharedApiClassesClassLoader.kt similarity index 100% rename from compiler/build-tools/build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/SharedApiClassesClassLoader.kt rename to compiler/build-tools/kotlin-build-tools-api/src/main/kotlin/org/jetbrains/kotlin/buildtools/api/SharedApiClassesClassLoader.kt diff --git a/compiler/build-tools/build-tools-impl/build.gradle.kts b/compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts similarity index 68% rename from compiler/build-tools/build-tools-impl/build.gradle.kts rename to compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts index 115ef62ac92..8323766d643 100644 --- a/compiler/build-tools/build-tools-impl/build.gradle.kts +++ b/compiler/build-tools/kotlin-build-tools-impl/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } dependencies { - api(project(":compiler:build-tools:build-tools-api")) + api(project(":compiler:build-tools:kotlin-build-tools-api")) implementation(kotlinStdlib()) } diff --git a/compiler/build-tools/build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/CompilationServiceImpl.kt b/compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/CompilationServiceImpl.kt similarity index 100% rename from compiler/build-tools/build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/CompilationServiceImpl.kt rename to compiler/build-tools/kotlin-build-tools-impl/src/main/kotlin/org/jetbrains/kotlin/buildtools/internal/CompilationServiceImpl.kt diff --git a/compiler/build-tools/build-tools-impl/src/main/resources/META-INF/services/org.jetbrains.kotlin.buildtools.api.CompilationService b/compiler/build-tools/kotlin-build-tools-impl/src/main/resources/META-INF/services/org.jetbrains.kotlin.buildtools.api.CompilationService similarity index 100% rename from compiler/build-tools/build-tools-impl/src/main/resources/META-INF/services/org.jetbrains.kotlin.buildtools.api.CompilationService rename to compiler/build-tools/kotlin-build-tools-impl/src/main/resources/META-INF/services/org.jetbrains.kotlin.buildtools.api.CompilationService diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 445035c7784..4b54061e49a 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -12,13 +12,13 @@ - - + + diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 28404f2e141..9c82d8bca86 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -65,7 +65,7 @@ dependencies { commonImplementation(project(":kotlin-util-klib")) commonImplementation(project(":native:kotlin-klib-commonizer-api")) commonImplementation(project(":kotlin-project-model")) - commonImplementation(project(":compiler:build-tools:build-tools-api")) + commonImplementation(project(":compiler:build-tools:kotlin-build-tools-api")) commonRuntimeOnly(project(":kotlin-compiler-embeddable")) commonRuntimeOnly(project(":kotlin-annotation-processing-embeddable")) diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt index e6dbbb6ea0c..8fd53550f67 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/internal/KotlinDependenciesManagement.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.gradle.utils.withType internal const val KOTLIN_MODULE_GROUP = "org.jetbrains.kotlin" internal const val KOTLIN_COMPILER_EMBEDDABLE = "kotlin-compiler-embeddable" -internal const val KOTLIN_BUILD_TOOLS_API_IMPL = "build-tools-impl" +internal const val KOTLIN_BUILD_TOOLS_API_IMPL = "kotlin-build-tools-impl" internal const val PLATFORM_INTEGERS_SUPPORT_LIBRARY = "platform-integers" internal fun customizeKotlinDependencies(project: Project) { diff --git a/settings.gradle b/settings.gradle index 99302773ffb..8b51c7d68ea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -378,8 +378,8 @@ if (!buildProperties.inJpsBuildIdeaSync) { ":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide" } -include ":compiler:build-tools:build-tools-api", - ":compiler:build-tools:build-tools-impl" +include ":compiler:build-tools:kotlin-build-tools-api", + ":compiler:build-tools:kotlin-build-tools-impl" void intellij(String imlPath) { File imlFile = new File("${rootDir}/intellij/community/plugins/kotlin/${imlPath}")