From 29787218e162fc59fd06679636089b6a58a5b203 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 27 Sep 2021 20:17:44 +0300 Subject: [PATCH] Build: Add proper kotlin-compiler-runner-unshaded for ide artifacts Fixes tests in kt-212-master branch of kotlin plugin in intellij-community repository --- build.gradle.kts | 2 +- .../compiler-runner-unshaded/build.gradle.kts | 25 +++++++++++++++++++ .../compilerRunner/CompilerEnvironment.kt | 0 .../compilerRunner/CompilerOutputParser.kt | 0 .../compilerRunner/KotlinCompilerClass.kt | 0 .../KotlinCompilerRunnerUtils.kt | 0 .../kotlin/compilerRunner/KotlinLogger.kt | 0 .../jetbrains/kotlin/compilerRunner/utils.kt | 0 compiler/compiler-runner/build.gradle.kts | 16 +++++------- .../build.gradle.kts | 2 +- .../kotlin-compiler-for-ide/build.gradle.kts | 2 +- settings.gradle | 2 ++ 12 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 compiler/compiler-runner-unshaded/build.gradle.kts rename compiler/{compiler-runner => compiler-runner-unshaded}/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt (100%) rename compiler/{compiler-runner => compiler-runner-unshaded}/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.kt (100%) rename compiler/{compiler-runner => compiler-runner-unshaded}/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerClass.kt (100%) rename compiler/{compiler-runner => compiler-runner-unshaded}/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt (100%) rename compiler/{compiler-runner => compiler-runner-unshaded}/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt (100%) rename compiler/{compiler-runner => compiler-runner-unshaded}/src/org/jetbrains/kotlin/compilerRunner/utils.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index aa9ae5fa553..178e56eb147 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -280,7 +280,7 @@ extra["compilerModulesForJps"] = listOf( ":kotlin-util-klib", ":kotlin-util-klib-metadata", ":compiler:cli-common", - ":kotlin-compiler-runner", + ":kotlin-compiler-runner-unshaded", ":daemon-common", ":daemon-common-new", ":core:compiler.common", diff --git a/compiler/compiler-runner-unshaded/build.gradle.kts b/compiler/compiler-runner-unshaded/build.gradle.kts new file mode 100644 index 00000000000..e72c440205e --- /dev/null +++ b/compiler/compiler-runner-unshaded/build.gradle.kts @@ -0,0 +1,25 @@ +description = "Compiler runner + daemon client unshaded" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + api(project(":kotlin-build-common")) + api(project(":kotlin-daemon-client")) + api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + + compileOnly(project(":compiler:cli-common")) + compileOnly(project(":kotlin-preloader")) + compileOnly(project(":compiler:frontend.java")) + compileOnly(project(":daemon-common")) + compileOnly(project(":daemon-common-new")) + compileOnly(project(":compiler:util")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } +} + +sourceSets { + "main" { projectDefault() } + "test" {} +} diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt similarity index 100% rename from compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt rename to compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.kt similarity index 100% rename from compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.kt rename to compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.kt diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerClass.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerClass.kt similarity index 100% rename from compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerClass.kt rename to compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerClass.kt diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt similarity index 100% rename from compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt rename to compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunnerUtils.kt diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt similarity index 100% rename from compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt rename to compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/KotlinLogger.kt diff --git a/compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/utils.kt b/compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/utils.kt similarity index 100% rename from compiler/compiler-runner/src/org/jetbrains/kotlin/compilerRunner/utils.kt rename to compiler/compiler-runner-unshaded/src/org/jetbrains/kotlin/compilerRunner/utils.kt diff --git a/compiler/compiler-runner/build.gradle.kts b/compiler/compiler-runner/build.gradle.kts index db7edad44a3..a864f169c60 100644 --- a/compiler/compiler-runner/build.gradle.kts +++ b/compiler/compiler-runner/build.gradle.kts @@ -6,22 +6,18 @@ plugins { } dependencies { + embedded(project(":kotlin-compiler-runner-unshaded")) { isTransitive = false } + api(project(":kotlin-build-common")) - compileOnly(project(":compiler:cli-common")) - compileOnly(project(":kotlin-preloader")) - compileOnly(project(":compiler:frontend.java")) - compileOnly(project(":daemon-common")) - compileOnly(project(":daemon-common-new")) api(project(":kotlin-daemon-client")) - compileOnly(project(":compiler:util")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - runtimeOnly(project(":kotlin-compiler-embeddable")) api(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } + + runtimeOnly(project(":kotlin-compiler-embeddable")) } sourceSets { - "main" { projectDefault() } - "test" {} + "main" { } + "test" { } } publish() diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts index e8ef7480459..8253749a6ac 100644 --- a/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-compiler-common-for-ide/build.gradle.kts @@ -11,7 +11,7 @@ val excludedCompilerModules = listOf( ) val projects = commonCompilerModules.asList() - excludedCompilerModules + listOf( - ":kotlin-compiler-runner", + ":kotlin-compiler-runner-unshaded", ":kotlin-preloader", ":daemon-common", ":kotlin-daemon-client" diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts index 5882153acfa..ac25a5e360f 100644 --- a/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-compiler-for-ide/build.gradle.kts @@ -23,7 +23,7 @@ val excludedCompilerModules = listOf( ) val projects = compilerModules.asList() - excludedCompilerModules + listOf( - ":kotlin-compiler-runner", + ":kotlin-compiler-runner-unshaded", ":kotlin-preloader", ":daemon-common", ":kotlin-daemon-client" diff --git a/settings.gradle b/settings.gradle index c5924630dc7..df59aca57ea 100644 --- a/settings.gradle +++ b/settings.gradle @@ -122,6 +122,7 @@ include ":benchmarks", ":compiler:frontend.common-psi", ":compiler:frontend.java", ":compiler:frontend:cfg", + ":kotlin-compiler-runner-unshaded", ":kotlin-compiler-runner", ":compiler:cli-common", ":compiler:ir.tree", @@ -551,6 +552,7 @@ project(':daemon-common-new').projectDir = "$rootDir/compiler/daemon/daemon-comm project(':kotlin-daemon-client').projectDir = "$rootDir/compiler/daemon/daemon-client" as File project(':kotlin-daemon-client-new').projectDir = "$rootDir/compiler/daemon/daemon-client-new" as File project(':kotlin-daemon-tests').projectDir = "$rootDir/compiler/daemon/daemon-tests" as File +project(':kotlin-compiler-runner-unshaded').projectDir = "$rootDir/compiler/compiler-runner-unshaded" as File project(':kotlin-compiler-runner').projectDir = "$rootDir/compiler/compiler-runner" as File project(':kotlin-ant').projectDir = "$rootDir/ant" as File project(':compiler:ir.tree').projectDir = "$rootDir/compiler/ir/ir.tree" as File