[Build] Add the kotlin- prefix to the build tools API modules names
KT-57396
This commit is contained in:
committed by
Space Team
parent
b6fdc2dbfc
commit
ec4fab57a7
@@ -79,8 +79,8 @@ val kotlinGradlePluginAndItsRequired = arrayOf(
|
|||||||
":kotlin-test-js-runner",
|
":kotlin-test-js-runner",
|
||||||
":native:kotlin-klib-commonizer-embeddable",
|
":native:kotlin-klib-commonizer-embeddable",
|
||||||
":native:kotlin-klib-commonizer-api",
|
":native:kotlin-klib-commonizer-api",
|
||||||
":compiler:build-tools:build-tools-api",
|
":compiler:build-tools:kotlin-build-tools-api",
|
||||||
":compiler:build-tools:build-tools-impl",
|
":compiler:build-tools:kotlin-build-tools-impl",
|
||||||
)
|
)
|
||||||
|
|
||||||
fun Task.dependsOnKotlinGradlePluginInstall() {
|
fun Task.dependsOnKotlinGradlePluginInstall() {
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
## Build Tools
|
## Build Tools
|
||||||
|
|
||||||
Please refer to the [Build Tools API readme](./build-tools-api/README.md).
|
Please refer to the [Build Tools API readme](kotlin-build-tools-api/README.md).
|
||||||
+1
-1
@@ -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.
|
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 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).
|
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.
|
The purpose of such a segregation is to allow using this API with different Kotlin compiler versions.
|
||||||
+1
-1
@@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api(project(":compiler:build-tools:build-tools-api"))
|
api(project(":compiler:build-tools:kotlin-build-tools-api"))
|
||||||
implementation(kotlinStdlib())
|
implementation(kotlinStdlib())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -12,13 +12,13 @@
|
|||||||
<trust file=".*[.]pom" regex="true"/>
|
<trust file=".*[.]pom" regex="true"/>
|
||||||
<trust file="kotlin-native-prebuilt-.*" regex="true"/>
|
<trust file="kotlin-native-prebuilt-.*" regex="true"/>
|
||||||
<trust group="gradle" name="gradle" file="gradle-.*-src[.]zip" regex="true"/>
|
<trust group="gradle" name="gradle" file="gradle-.*-src[.]zip" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="build-tools-api" version="1.9.[0-9](-.+)?" regex="true"/>
|
|
||||||
<trust group="org.jetbrains.kotlin" name="build-tools-impl" version="1.9.[0-9](-.+)?" regex="true"/>
|
|
||||||
<trust group="org.jetbrains.kotlin" name="builtins" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="builtins" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-embeddable" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-embeddable" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
|
<trust group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
|
<trust group="org.jetbrains.kotlin" name="kotlin-build-tools-impl" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-compiler-embeddable" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-compiler-runner" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.9.[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-daemon-client" version="1.9.[0-9](-.+)?" regex="true"/>
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ dependencies {
|
|||||||
commonImplementation(project(":kotlin-util-klib"))
|
commonImplementation(project(":kotlin-util-klib"))
|
||||||
commonImplementation(project(":native:kotlin-klib-commonizer-api"))
|
commonImplementation(project(":native:kotlin-klib-commonizer-api"))
|
||||||
commonImplementation(project(":kotlin-project-model"))
|
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-compiler-embeddable"))
|
||||||
commonRuntimeOnly(project(":kotlin-annotation-processing-embeddable"))
|
commonRuntimeOnly(project(":kotlin-annotation-processing-embeddable"))
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.gradle.utils.withType
|
|||||||
|
|
||||||
internal const val KOTLIN_MODULE_GROUP = "org.jetbrains.kotlin"
|
internal const val KOTLIN_MODULE_GROUP = "org.jetbrains.kotlin"
|
||||||
internal const val KOTLIN_COMPILER_EMBEDDABLE = "kotlin-compiler-embeddable"
|
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 const val PLATFORM_INTEGERS_SUPPORT_LIBRARY = "platform-integers"
|
||||||
|
|
||||||
internal fun customizeKotlinDependencies(project: Project) {
|
internal fun customizeKotlinDependencies(project: Project) {
|
||||||
|
|||||||
+2
-2
@@ -378,8 +378,8 @@ if (!buildProperties.inJpsBuildIdeaSync) {
|
|||||||
":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide"
|
":prepare:ide-plugin-dependencies:kotlin-compiler-fir-for-ide"
|
||||||
}
|
}
|
||||||
|
|
||||||
include ":compiler:build-tools:build-tools-api",
|
include ":compiler:build-tools:kotlin-build-tools-api",
|
||||||
":compiler:build-tools:build-tools-impl"
|
":compiler:build-tools:kotlin-build-tools-impl"
|
||||||
|
|
||||||
void intellij(String imlPath) {
|
void intellij(String imlPath) {
|
||||||
File imlFile = new File("${rootDir}/intellij/community/plugins/kotlin/${imlPath}")
|
File imlFile = new File("${rootDir}/intellij/community/plugins/kotlin/${imlPath}")
|
||||||
|
|||||||
Reference in New Issue
Block a user