Skip to content

Commit d5ebe2e

Browse files
zarechenskiyzarechenskiy
committed
Reorganize dependencies around kotlin-compiler.jar
#KT-26807 Fixed
1 parent 30c769c commit d5ebe2e

File tree

18 files changed

+98
-31
lines changed

18 files changed

+98
-31
lines changed

‎ant/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sourceSets {
1717
}
1818

1919
runtimeJar {
20-
manifest.attributes.put("Class-Path", "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar kotlin-preloader.jar")
20+
manifest.attributes.put("Class-Path", "$compilerManifestClassPath kotlin-preloader.jar")
2121
}
2222

2323
dist()

‎build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ extra["versions.robolectric"] = "3.1"
167167
extra["versions.org.springframework"] = "4.2.0.RELEASE"
168168
extra["versions.jflex"] = "1.7.0"
169169
extra["versions.markdown"] = "0.1.25"
170+
extra["versions.trove4j"] = "1.0.20181211"
170171

171172
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
172173
val intellijUltimateEnabled = project.getBooleanProperty("intellijUltimateEnabled") ?: isTeamcityBuild

‎buildSrc/src/main/kotlin/dependencies.kt

+3
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ fun Project.firstFromJavaHomeThatExists(vararg paths: String, jdkHome: File = Fi
104104
fun Project.toolsJar(jdkHome: File = File(this.property("JDK_18") as String)): File? =
105105
firstFromJavaHomeThatExists("lib/tools.jar", jdkHome = jdkHome)
106106

107+
val compilerManifestClassPath
108+
get() = "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar trove4j.jar"
109+
107110
object EmbeddedComponents {
108111
val CONFIGURATION_NAME = "embeddedComponents"
109112
}

‎buildSrc/src/main/kotlin/embeddable.kt

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ val packagesToRelocate =
1818
"org.jdom",
1919
"org.picocontainer",
2020
"org.jline",
21-
"gnu",
2221
"org.fusesource",
2322
"kotlinx.coroutines")
2423

‎compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.java

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.jetbrains.annotations.NotNull;
2020

2121
import java.io.File;
22+
import java.util.List;
2223

2324
public interface KotlinPaths {
2425
@NotNull
@@ -60,6 +61,12 @@ public interface KotlinPaths {
6061
@NotNull
6162
File getSamWithReceiverJarPath();
6263

64+
@NotNull
65+
File getTrove4jJarPath();
66+
67+
@NotNull
68+
List<File> getCompilerClasspath();
69+
6370
@NotNull
6471
File getCompilerPath();
6572

‎compiler/util/src/org/jetbrains/kotlin/utils/KotlinPathsFromHomeDir.java

+14
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616

1717
package org.jetbrains.kotlin.utils;
1818

19+
import kotlin.collections.CollectionsKt;
1920
import org.jetbrains.annotations.NotNull;
2021

2122
import java.io.File;
23+
import java.util.List;
2224

2325
public class KotlinPathsFromHomeDir implements KotlinPaths {
2426
// kotlinc directory
@@ -106,6 +108,18 @@ public File getSamWithReceiverJarPath() {
106108
return getLibraryFile(PathUtil.SAM_WITH_RECEIVER_PLUGIN_JAR_NAME);
107109
}
108110

111+
@NotNull
112+
@Override
113+
public File getTrove4jJarPath() {
114+
return getLibraryFile(PathUtil.TROVE4J_NAME);
115+
}
116+
117+
@NotNull
118+
@Override
119+
public List<File> getCompilerClasspath() {
120+
return CollectionsKt.listOf(getStdlibPath(), getReflectPath(), getScriptRuntimePath(), getTrove4jJarPath());
121+
}
122+
109123
@NotNull
110124
@Override
111125
public File getCompilerPath() {

‎compiler/util/src/org/jetbrains/kotlin/utils/PathUtil.kt

+3
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ object PathUtil {
7171

7272
const val KOTLIN_JAVA_STDLIB_SRC_JAR_OLD = "kotlin-runtime-sources.jar"
7373

74+
const val TROVE4J_NAME = "trove4j"
75+
const val TROVE4J_JAR = "$TROVE4J_NAME.jar"
76+
7477
const val KOTLIN_COMPILER_NAME = "kotlin-compiler"
7578
const val KOTLIN_COMPILER_JAR = "$KOTLIN_COMPILER_NAME.jar"
7679

‎idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleKeeper.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ class KotlinConsoleKeeper(val project: Project) {
7070
//paramList.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005")
7171

7272
val kotlinPaths = PathUtil.kotlinPathsForIdeaPlugin
73-
val replClassPath = listOf(kotlinPaths.compilerPath, kotlinPaths.reflectPath, kotlinPaths.stdlibPath, kotlinPaths.scriptRuntimePath)
73+
val replClassPath =
74+
(kotlinPaths.compilerClasspath + kotlinPaths.compilerPath)
7475
.joinToString(File.pathSeparator) { it.absolutePath }
7576

7677
paramList.add("-cp")

‎include/kotlin-compiler/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ val fatJarContentsStripMetadata by configurations.creating
99
val fatJarContentsStripServices by configurations.creating
1010

1111
val compilerModules: Array<String> by rootProject.extra
12-
val compilerManifestClassPath = "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar"
1312

1413
dependencies {
1514
compilerModules.forEach { module ->

‎include/kotlin-compiler/build.gradle.kts.173

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ val fatJarContentsStripMetadata by configurations.creating
99
val fatJarContentsStripServices by configurations.creating
1010

1111
val compilerModules: Array<String> by rootProject.extra
12-
val compilerManifestClassPath = "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar"
1312

1413
dependencies {
1514
compilerModules.forEach { module ->

‎libraries/examples/kotlin-jsr223-daemon-local-eval-example/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
compilerClasspath(project(":kotlin-reflect"))
2121
compilerClasspath(project(":kotlin-stdlib"))
2222
compilerClasspath(project(":kotlin-script-runtime"))
23+
compilerClasspath(commonDep("org.jetbrains.intellij.deps", "trove4j"))
2324
compileOnly(project(":compiler:cli-common")) // TODO: fix import (workaround for jps build)
2425
testCompileOnly(project(":core:util.runtime")) // TODO: fix import (workaround for jps build)
2526
testCompileOnly(project(":compiler:daemon-common")) // TODO: fix import (workaround for jps build)

‎libraries/scripting/jvm/src/kotlin/script/experimental/jvm/util/jvmClasspathUtil.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@ import kotlin.script.templates.standard.ScriptTemplateWithArgs
1616

1717
// TODO: consider moving all these utilites to the build-common or some other shared compiler API module
1818

19+
// Kotlin Compiler dependencies
1920
internal const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar"
2021
internal const val KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"
2122
internal const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"
23+
internal const val TROVE4J_JAR = "trove4j.jar"
24+
2225
internal const val KOTLIN_COMPILER_NAME = "kotlin-compiler"
2326
internal const val KOTLIN_COMPILER_JAR = "$KOTLIN_COMPILER_NAME.jar"
2427

@@ -160,7 +163,8 @@ object KotlinJars {
160163
val kotlinLibsJars = listOf(
161164
KOTLIN_JAVA_STDLIB_JAR,
162165
KOTLIN_JAVA_REFLECT_JAR,
163-
KOTLIN_JAVA_SCRIPT_RUNTIME_JAR
166+
KOTLIN_JAVA_SCRIPT_RUNTIME_JAR,
167+
TROVE4J_JAR
164168
)
165169
val kotlinBaseJars = kotlinCompilerJars + kotlinLibsJars
166170

‎libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/jarSearchingUtil.kt

+23-4
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ private val KOTLIN_SCRIPT_RUNTIME_EXPECTED_CLASS = "kotlin.script.templates.Anno
3838
private val KOTLIN_SCRIPT_ANNOTATION_EXPECTED_CLASS = "kotlin.script.experimental.annotations.KotlinScript"
3939
private val KOTLIN_JVM_SCRIPT_COMPILER_EXPECTED_CLASS = "kotlin.script.experimental.jvm.JvmScriptCompiler"
4040
private val KOTLIN_REFLECT_EXPECTED_CLASS = "kotlin.reflect.full.KClasses"
41+
private val TROVE4J_EXPECTED_CLASS = "gnu.trove.THashMap"
4142
internal const val KOTLIN_MODULE_GROUP = "org.jetbrains.kotlin"
4243
private val KOTLIN_GRADLE_PLUGIN = "kotlin-gradle-plugin"
4344
internal const val KOTLIN_COMPILER_EMBEDDABLE = "kotlin-compiler-embeddable"
@@ -50,27 +51,45 @@ private val KOTLIN_REFLECT = "kotlin-reflect"
5051
internal fun findKotlinJvmCompilerClasspath(project: Project): List<File> =
5152
findKotlinModuleJar(project, K2JVM_COMPILER_CLASS, KOTLIN_COMPILER_EMBEDDABLE).let {
5253
if (it.isEmpty()) it
53-
else it + findKotlinStdlibClasspath(project) + findKotlinScriptRuntimeClasspath(project) + findKotlinReflectClasspath(project)
54+
else it + findKotlinCompilerClasspath(project)
5455
}
5556

5657
internal fun findKotlinJsCompilerClasspath(project: Project): List<File> =
5758
findKotlinModuleJar(project, K2JS_COMPILER_CLASS, KOTLIN_COMPILER_EMBEDDABLE).let {
5859
if (it.isEmpty()) it
59-
else it + findKotlinStdlibClasspath(project) + findKotlinScriptRuntimeClasspath(project) + findKotlinReflectClasspath(project)
60+
else it + findKotlinCompilerClasspath(project)
6061
}
6162

6263
internal fun findKotlinMetadataCompilerClasspath(project: Project): List<File> =
6364
findKotlinModuleJar(project, K2METADATA_COMPILER_CLASS, KOTLIN_COMPILER_EMBEDDABLE).let {
6465
if (it.isEmpty()) it
65-
else it + findKotlinStdlibClasspath(project) + findKotlinScriptRuntimeClasspath(project) + findKotlinReflectClasspath(project)
66+
else it + findKotlinCompilerClasspath(project)
6667
}
6768

6869
internal fun findKotlinJsDceClasspath(project: Project): List<File> =
6970
findKotlinModuleJar(project, K2JS_DCE_CLASS, KOTLIN_COMPILER_EMBEDDABLE).let {
7071
if (it.isEmpty()) it
71-
else it + findKotlinStdlibClasspath(project) + findKotlinScriptRuntimeClasspath(project) + findKotlinReflectClasspath(project)
72+
else it + findKotlinCompilerClasspath(project)
7273
}
7374

75+
internal fun findKotlinCompilerClasspath(project: Project): List<File> {
76+
return findKotlinStdlibClasspath(project) +
77+
findKotlinScriptRuntimeClasspath(project) +
78+
findKotlinReflectClasspath(project) +
79+
listOfNotNull(findTrove4j())
80+
}
81+
82+
internal fun findTrove4j(): File? {
83+
val classLoader = Thread.currentThread().contextClassLoader
84+
val classFromTrove4j = try {
85+
classLoader.loadClass(TROVE4J_EXPECTED_CLASS)
86+
} catch (e: ClassNotFoundException) {
87+
null
88+
} ?: return null
89+
90+
return findJarByClass(classFromTrove4j)
91+
}
92+
7493
internal fun findKotlinStdlibClasspath(project: Project): List<File> =
7594
findKotlinModuleJar(project, KOTLIN_STDLIB_EXPECTED_CLASS, KOTLIN_STDLIB)
7695

‎libraries/tools/kotlin-script-util/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies {
1414
compile(project(":kotlin-stdlib"))
1515
compile(project(":kotlin-script-runtime"))
1616
compile(project(":kotlin-scripting-jvm"))
17+
compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
1718
compileOnly(project(":compiler:cli"))
1819
compileOnly(project(":compiler:daemon-common"))
1920
compile(projectRuntimeJar(":kotlin-daemon-client"))

‎prepare/compiler-embeddable/build.gradle.kts

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ dependencies {
99
runtime(project(":kotlin-stdlib"))
1010
runtime(project(":kotlin-script-runtime"))
1111
runtime(project(":kotlin-reflect"))
12+
runtime(commonDep("org.jetbrains.intellij.deps", "trove4j"))
1213
}
1314

1415
noDefaultJar()

‎prepare/compiler/build.gradle.kts

+12-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ val shrink =
1717
findProperty("kotlin.build.proguard")?.toString()?.toBoolean()
1818
?: hasProperty("teamcity")
1919

20-
val compilerManifestClassPath = "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar"
21-
2220
val fatJarContents by configurations.creating
2321

2422
val fatJarContentsStripMetadata by configurations.creating
@@ -31,6 +29,7 @@ val compile by configurations // maven plugin writes pom compile scope from com
3129
val libraries by configurations.creating {
3230
extendsFrom(compile)
3331
}
32+
val trove4jJar by configurations.creating
3433

3534
val default by configurations
3635
default.extendsFrom(runtimeJar)
@@ -51,6 +50,7 @@ dependencies {
5150
compile(project(":kotlin-stdlib"))
5251
compile(project(":kotlin-script-runtime"))
5352
compile(project(":kotlin-reflect"))
53+
compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
5454

5555
libraries(project(":kotlin-annotations-jvm"))
5656
libraries(
@@ -69,6 +69,8 @@ dependencies {
6969
fatSourcesJarContents(it)
7070
}
7171

72+
trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
73+
7274
fatJarContents(project(":core:builtins", configuration = "builtins"))
7375
fatJarContents(commonDep("javax.inject"))
7476
fatJarContents(commonDep("org.jline", "jline"))
@@ -79,7 +81,11 @@ dependencies {
7981
fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
8082

8183
fatJarContents(intellijCoreDep()) { includeJars("intellij-core", "java-compatibility-1.0.1") }
82-
fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) }
84+
fatJarContents(intellijDep()) {
85+
includeIntellijCoreJarDependencies(project) {
86+
!(it.startsWith("jdom") || it.startsWith("log4j") || it.startsWith("trove4j"))
87+
}
88+
}
8389
fatJarContents(intellijDep()) { includeJars("jna-platform", "lz4-1.3.0") }
8490
fatJarContentsStripServices(intellijDep("jps-standalone")) { includeJars("jps-model") }
8591
fatJarContentsStripMetadata(intellijDep()) { includeJars("oro-2.0.8", "jdom", "log4j" ) }
@@ -136,10 +142,9 @@ val proguard by task<ProGuardTask> {
136142

137143
val pack = if (shrink) proguard else packCompiler
138144

139-
dist(
140-
targetName = "$compilerBaseName.jar",
141-
fromTask = pack
142-
)
145+
dist(targetName = "$compilerBaseName.jar", fromTask = pack) {
146+
from(trove4jJar)
147+
}
143148

144149
runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
145150
name = compilerBaseName

‎prepare/compiler/build.gradle.kts.182

+12-7
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ val shrink =
1717
findProperty("kotlin.build.proguard")?.toString()?.toBoolean()
1818
?: hasProperty("teamcity")
1919

20-
val compilerManifestClassPath = "kotlin-stdlib.jar kotlin-reflect.jar kotlin-script-runtime.jar"
21-
2220
val fatJarContents by configurations.creating
2321

2422
val fatJarContentsStripMetadata by configurations.creating
@@ -31,6 +29,7 @@ val compile by configurations // maven plugin writes pom compile scope from com
3129
val libraries by configurations.creating {
3230
extendsFrom(compile)
3331
}
32+
val trove4jJar by configurations.creating
3433

3534
val default by configurations
3635
default.extendsFrom(runtimeJar)
@@ -51,6 +50,7 @@ dependencies {
5150
compile(project(":kotlin-stdlib"))
5251
compile(project(":kotlin-script-runtime"))
5352
compile(project(":kotlin-reflect"))
53+
compile(commonDep("org.jetbrains.intellij.deps", "trove4j"))
5454

5555
libraries(project(":kotlin-annotations-jvm"))
5656
libraries(
@@ -69,6 +69,8 @@ dependencies {
6969
fatSourcesJarContents(it)
7070
}
7171

72+
trove4jJar(intellijDep()) { includeIntellijCoreJarDependencies(project) { it.startsWith("trove4j") } }
73+
7274
fatJarContents(project(":core:builtins", configuration = "builtins"))
7375
fatJarContents(commonDep("javax.inject"))
7476
fatJarContents(commonDep("org.jline", "jline"))
@@ -79,7 +81,11 @@ dependencies {
7981
fatJarContents(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false }
8082

8183
fatJarContents(intellijCoreDep()) { includeJars("intellij-core") }
82-
fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) }
84+
fatJarContents(intellijDep()) {
85+
includeIntellijCoreJarDependencies(project) {
86+
!(it.startsWith("jdom") || it.startsWith("log4j") || it.startsWith("trove4j"))
87+
}
88+
}
8389
when {
8490
Platform[173].orLower() -> {
8591
fatJarContents(intellijDep()) { includeJars("jna-platform") }
@@ -148,10 +154,9 @@ val proguard by task<ProGuardTask> {
148154

149155
val pack = if (shrink) proguard else packCompiler
150156

151-
dist(
152-
targetName = "$compilerBaseName.jar",
153-
fromTask = pack
154-
)
157+
dist(targetName = "$compilerBaseName.jar", fromTask = pack) {
158+
from(trove4jJar)
159+
}
155160

156161
runtimeJarArtifactBy(pack, pack.outputs.files.singleFile) {
157162
name = compilerBaseName

0 commit comments

Comments
 (0)