From 0333985445387493090976c3f99ffde2b6b43623 Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Tue, 31 Oct 2023 15:14:42 +0100 Subject: [PATCH] [Build] Remove `kotlin-gradle-plugin-compiler-dependencies` We should consider the information from the removed buildscript to resolve KT-61706 ^KT-62650 Fixed --- .../build.gradle.kts | 51 ------------------- ...in-gradle-plugin-compiler-dependencies.pom | 29 ----------- .../buildsrc-compat/src/main/kotlin/tasks.kt | 1 - settings.gradle | 3 +- 4 files changed, 1 insertion(+), 83 deletions(-) delete mode 100644 prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts delete mode 100644 repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugin-compiler-dependencies/kotlin-gradle-plugin-compiler-dependencies.pom diff --git a/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts b/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts deleted file mode 100644 index 6e4ec561e3e..00000000000 --- a/prepare/kotlin-gradle-plugin-compiler-dependencies/build.gradle.kts +++ /dev/null @@ -1,51 +0,0 @@ -description = "Kotlin Compiler dependencies (used directly in KGP)" - -plugins { - `java` -} - -// avoid adding new dependencies here -val compilerModules = listOf( - ":compiler:cli", // for MessageRenderer, related to MessageCollector usage - ":compiler:cli-base", // for kotlinx-benchmark - ":compiler:cli-common", // for compiler arguments setup, for logging via MessageCollector, CompilerSystemProperties, ExitCode - ":compiler:compiler.version", // for user projects buildscripts - ":compiler:config", // for kotlinx-benchmark - ":compiler:config.jvm", // for K2JVMCompilerArguments initialization - ":compiler:frontend", // for kotlinx-benchmark - ":compiler:ir.serialization.common", // for kotlinx-benchmark - ":compiler:ir.tree", // for PartialLinkageMode (K/N) - ":compiler:util", // for CommonCompilerArguments initialization, K/N - ":core:compiler.common", // for kotlinx-benchmark - ":core:compiler.common.jvm", // for FUS statistics parsing all the compiler arguments, otherwise it fails silently - ":core:compiler.common.native", // for kotlinx-benchmark - ":core:descriptors", // for kotlinx-benchmark - ":core:deserialization", // for kotlinx-benchmark - ":core:deserialization.common", // for kotlinx-benchmark - ":core:metadata", // for kotlinx-benchmark - ":core:util.runtime", // for stdlib extensions - ":js:js.config", // for k/js task - ":kotlin-build-common", // for incremental compilation setup -) - -dependencies { - for (dependency in compilerModules) { - embedded(project(dependency)) { isTransitive = false } - } - embedded(intellijUtilRt()) { isTransitive = false } // for kapt (PathUtil.getJdkClassesRoots) - embedded(intellijPlatformUtil()) { isTransitive = false } // for kapt (JavaVersion), KotlinToolRunner (escapeStringCharacters) - embedded(intellijPlatformUtilBase()) { isTransitive = false } // for kapt (PathUtil.getJdkClassesRoots) - embedded(commonDependency("org.jetbrains.intellij.deps.fastutil:intellij-deps-fastutil")) { isTransitive = false } // for kapt (PathUtil.getJdkClassesRoots) - embedded(jpsModelImpl()) { isTransitive = false } // for kapt (PathUtil.getJdkClassesRoots) - embedded(protobufLite()) { isTransitive = false } // for kotlinx-benchmark - embedded(commonDependency("org.jetbrains.intellij.deps:trove4j")) { isTransitive = false } // for k/js task -} - -publish() - -runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) - -sourcesJar { - dependsOn(":compiler:ir.tree:generateTree") -} -javadocJar() diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugin-compiler-dependencies/kotlin-gradle-plugin-compiler-dependencies.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugin-compiler-dependencies/kotlin-gradle-plugin-compiler-dependencies.pom deleted file mode 100644 index 64637e73854..00000000000 --- a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugin-compiler-dependencies/kotlin-gradle-plugin-compiler-dependencies.pom +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - org.jetbrains.kotlin - kotlin-gradle-plugin-compiler-dependencies - ArtifactsTest.version - Kotlin Gradle Plugin Compiler Dependencies - Kotlin Compiler dependencies (used directly in KGP) - https://kotlinlang.org/ - - - The Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Kotlin Team - JetBrains - https://www.jetbrains.com - - - - scm:git:https://github.com/JetBrains/kotlin.git - scm:git:https://github.com/JetBrains/kotlin.git - https://github.com/JetBrains/kotlin - - diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt index 0154968ef2c..c61bcb6e5c5 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt @@ -79,7 +79,6 @@ val kotlinGradlePluginAndItsRequired = arrayOf( ":kotlin-test-js-runner", ":native:kotlin-klib-commonizer-embeddable", ":native:kotlin-klib-commonizer-api", - ":prepare:kotlin-gradle-plugin-compiler-dependencies", ":compiler:build-tools:kotlin-build-statistics", ":compiler:build-tools:kotlin-build-tools-api", ":compiler:build-tools:kotlin-build-tools-impl", diff --git a/settings.gradle b/settings.gradle index 51d361d3d12..d158dd05410 100644 --- a/settings.gradle +++ b/settings.gradle @@ -270,8 +270,7 @@ include ":kotlin-imports-dumper-compiler-plugin", ":wasm:wasm.frontend", ":wasm:wasm.config", ":repo:codebase-tests", - ":repo:artifacts-tests", - ":prepare:kotlin-gradle-plugin-compiler-dependencies" + ":repo:artifacts-tests" include ":kotlin-atomicfu-compiler-plugin", ":kotlin-atomicfu-compiler-plugin-embeddable",