Completely remove trove4j dependency

^KTI-1135 Fixed

Author: ALikhachev

compiler/tests-compiler-utils/build.gradle.kts

@@ -30,7 +30,6 @@ dependencies {
     testCompileOnly(intellijCore())
 
     testApi(libs.guava)
-    testApi(commonDependency("org.jetbrains.intellij.deps:trove4j"))
     testApi(libs.intellij.asm)
     testApi(commonDependency("org.jetbrains.intellij.deps:log4j"))
     testApi(intellijJDom())

compiler/util/src/org/jetbrains/kotlin/utils/KotlinPaths.kt

@@ -73,10 +73,6 @@ interface KotlinPaths {
     val samWithReceiverJarPath: File
         get() = jar(Jar.SamWithReceiver)
 
-//    @Deprecated("Obsolete API", ReplaceWith("jar(KotlinPaths.Jars.trove4j)"))
-    val trove4jJarPath: File
-        get() = jar(Jar.Trove4j)
-
 //    @Deprecated("Obsolete API", ReplaceWith("classPath(KotlinPaths.ClassPaths.Compiler)"))
     val compilerClasspath: List<File>
         get() = classPath(ClassPaths.Compiler)
@@ -99,7 +95,6 @@ interface KotlinPaths {
         LombokPlugin(PathUtil.LOMBOK_PLUGIN_NAME),
         SamWithReceiver(PathUtil.SAM_WITH_RECEIVER_PLUGIN_NAME),
         SerializationPlugin(PathUtil.SERIALIZATION_PLUGIN_NAME),
-        Trove4j(PathUtil.TROVE4J_NAME),
         Compiler(PathUtil.KOTLIN_COMPILER_NAME),
         ScriptingPlugin(PathUtil.KOTLIN_SCRIPTING_COMPILER_PLUGIN_NAME),
         ScriptingImpl(PathUtil.KOTLIN_SCRIPTING_COMPILER_IMPL_NAME),
@@ -120,7 +115,7 @@ interface KotlinPaths {
                 else -> emptyList()
             }
         }),
-        Compiler(StdLib, Jar.Compiler, Jar.Reflect, Jar.ScriptRuntime, Jar.Trove4j, Jar.KotlinDaemon, Jar.CoroutinesCore),
+        Compiler(StdLib, Jar.Compiler, Jar.Reflect, Jar.ScriptRuntime, Jar.KotlinDaemon, Jar.CoroutinesCore),
         CompilerWithScripting(Compiler, Jar.ScriptingPlugin, Jar.ScriptingImpl, Jar.ScriptingLib, Jar.ScriptingJvmLib),
         MainKts(StdLib, Jar.MainKts, Jar.ScriptRuntime, Jar.Reflect)
         ;

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

@@ -95,9 +95,6 @@ object PathUtil {
 
     const val KOTLIN_JAVA_STDLIB_SRC_JAR_OLD = "kotlin-runtime-sources.jar"
 
-    const val TROVE4J_NAME = "trove4j"
-    const val TROVE4J_JAR = "$TROVE4J_NAME.jar"
-
     const val KOTLIN_COMPILER_NAME = "kotlin-compiler"
     const val KOTLIN_COMPILER_JAR = "$KOTLIN_COMPILER_NAME.jar"
 

gradle/versions.properties

@@ -18,7 +18,6 @@ versions.oro=2.0.8
 versions.serviceMessages=2019.1.4
 versions.stax2-api=4.2.1
 versions.streamex=0.7.2
-versions.trove4j=1.0.20200330
 versions.lombok=1.18.16
 versions.commons-text=1.10.0
 # should be in sync with libs.versions.toml

js/js.tests/build.gradle.kts

@@ -66,7 +66,6 @@ dependencies {
     testApi(project(":compiler:cli"))
     testApi(project(":compiler:util"))
 
-    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
     testRuntimeOnly(libs.guava)
     testRuntimeOnly(intellijJDom())
 

js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsKlibLinkageTestCase.kt

@@ -264,7 +264,6 @@ internal class ReleasedJsCompiler(private val jsHome: ReleasedJsArtifactsHome) {
 private fun createClassLoader(jsHome: ReleasedJsArtifactsHome): URLClassLoader {
     val jsClassPath = setOf(
         jsHome.compilerEmbeddable,
-        jsHome.trove,
         jsHome.baseStdLib,
     )
         .map { it.toURI().toURL() }
@@ -276,7 +275,6 @@ private fun createClassLoader(jsHome: ReleasedJsArtifactsHome): URLClassLoader {
 
 internal class ReleasedJsArtifactsHome(val dir: File, version: String) {
     val compilerEmbeddable: File = dir.resolve("kotlin-compiler-embeddable-$version.jar")
-    val trove: File = dir.listFiles()?.single { it.name.contains("trove4j") } ?: error("Filed to find trove4j jar in $dir")
     val baseStdLib: File = dir.resolve("kotlin-stdlib-$version.jar")
     val jsStdLib: File = dir.resolve("kotlin-stdlib-js-$version.klib")
 }

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/nativeDistribution/NativeDistribution.kt

@@ -91,7 +91,6 @@ class NativeDistribution(val root: Directory) {
      */
     val compilerClasspath: FileCollection
         get() = compilerJars.asFileTree.matching {
-            include("trove4j.jar")
             include("kotlin-native-compiler-embeddable.jar")
         }
 

kotlin-native/build.gradle

@@ -104,11 +104,6 @@ configurations {
             attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, CppUsage.LIBRARY_RUNTIME))
         }
     }
-
-    trove4j_jar {
-        canBeConsumed = false
-        canBeResolved = true
-    }
 }
 
 apply plugin: CompilationDatabasePlugin
@@ -126,9 +121,6 @@ dependencies {
     nativeLibs project(':kotlin-native:llvmInterop')
     nativeLibs project(':kotlin-native:libclangInterop')
     nativeLibs project(':kotlin-native:Interop:Runtime')
-    use(RepoDependencies) {
-        trove4j_jar commonDependency("org.jetbrains.intellij.deps:trove4j")
-    }
 
     // declared to be included in verification-metadata.xml
     implicitDependencies("org.jetbrains.kotlin:kotlin-native-prebuilt:$bootstrapKotlinVersion:[email protected]")
@@ -195,8 +187,6 @@ def shadowJar = tasks.register("shadowJar", ShadowJar) {
     archiveBaseName.set("kotlin-native")
     archiveVersion.set("")
     archiveClassifier.set("")
-    // Exclude trove4j because of license agreement.
-    exclude "*trove4j*"
     exclude("META-INF/versions/9/module-info.class")
     configurations = [project.configurations.distPack]
 }
@@ -262,13 +252,6 @@ tasks.register("distNativeLibs", Sync) {
 
 tasks.register("distCompilerJars", Sync) {
     from(shadowJar.map { it.archiveFile })
-    from(configurations.trove4j_jar) {
-        include "trove4j*.jar"
-        rename "trove4j(.*).jar", "trove4j.jar"
-        filePermissions {
-            unix("0644")
-        }
-    }
     from(configurations.embeddableJar) {
         rename {
             "kotlin-native-compiler-embeddable.jar"

kotlin-native/cmd/run_konan

@@ -75,8 +75,7 @@ while IFS=$'\r' read -r line || [[ -n "$line" ]]; do
 done < "${KONAN_HOME}/tools/env_blacklist"
 
 KONAN_JAR="${KONAN_HOME}/konan/lib/kotlin-native-compiler-embeddable.jar"
-TROVE_JAR="${KONAN_HOME}/konan/lib/trove4j.jar"
-KONAN_CLASSPATH="$KONAN_JAR:$TROVE_JAR"
+KONAN_CLASSPATH="$KONAN_JAR"
 TOOL_CLASS=org.jetbrains.kotlin.cli.utilities.MainKt
 LIBCLANG_DISABLE_CRASH_RECOVERY=1 \
 $TIMECMD "$JAVACMD" "${java_opts[@]}" "${java_args[@]}" -cp "$KONAN_CLASSPATH" "$TOOL_CLASS" "$TOOL_NAME" "${konan_args[@]}"

kotlin-native/cmd/run_konan.bat

@@ -54,9 +54,8 @@ if not "!ARG!" == "" (
 set "KONAN_LIB=%_KONAN_HOME%\konan\lib"
 
 set "KONAN_JAR=%KONAN_LIB%\kotlin-native-compiler-embeddable.jar"
-set TROVE_JAR="%KONAN_LIB%\trove4j.jar"
 
-set "KONAN_CLASSPATH=%KONAN_JAR%;%TROVE_JAR%"
+set "KONAN_CLASSPATH=%KONAN_JAR%"
 set JAVA_OPTS=-ea ^
     -Xmx3G ^
     -XX:TieredStopAtLevel=1 ^

kotlin-native/prepare/kotlin-native-compiler-embeddable/build.gradle.kts

@@ -118,9 +118,6 @@ projectTest {
      */
     jvmArgumentProviders.add(objects.newInstance<ProjectTestArgumentProvider>().apply {
         compilerClasspath.from(runtimeJar)
-        compilerClasspath.from(configurations.detachedConfiguration(
-                dependencies.create(commonDependency("org.jetbrains.intellij.deps:trove4j"))
-        ))
 
         // The tests run the compiler and try to produce an executable on host.
         // So, distribution with stdlib and runtime for host is required.

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -20,7 +20,6 @@ dependencies {
 
     testRuntimeOnly(project(":kotlin-compiler"))
     testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
-    testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
 }
 
 sourceSets {

libraries/scripting/jvm-host/build.gradle.kts

@@ -19,7 +19,6 @@ dependencies {
     publishedRuntime(project(":kotlin-compiler"))
     publishedRuntime(project(":kotlin-scripting-compiler"))
     publishedRuntime(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
-    publishedRuntime(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
 }
 
 sourceSets {

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

@@ -25,7 +25,6 @@ import kotlin.script.templates.standard.ScriptTemplateWithArgs
 internal const val KOTLIN_JAVA_STDLIB_JAR = "kotlin-stdlib.jar"
 internal const val KOTLIN_JAVA_REFLECT_JAR = "kotlin-reflect.jar"
 internal const val KOTLIN_JAVA_SCRIPT_RUNTIME_JAR = "kotlin-script-runtime.jar"
-internal const val TROVE4J_JAR = "trove4j.jar"
 internal const val KOTLIN_SCRIPTING_COMPILER_JAR = "kotlin-scripting-compiler.jar"
 internal const val KOTLIN_SCRIPTING_COMPILER_EMBEDDABLE_JAR = "kotlin-scripting-compiler-embeddable.jar"
 internal const val KOTLIN_SCRIPTING_COMPILER_IMPL_JAR = "kotlin-scripting-compiler-impl.jar"
@@ -368,7 +367,6 @@ object KotlinJars {
             KOTLIN_JAVA_STDLIB_JAR,
             KOTLIN_JAVA_REFLECT_JAR,
             KOTLIN_JAVA_SCRIPT_RUNTIME_JAR,
-            TROVE4J_JAR
         )
         val kotlinScriptingJars = if (withScripting) listOf(
             KOTLIN_SCRIPTING_COMPILER_JAR,

libraries/tools/ide-plugin-dependencies-validator/build.gradle.kts

@@ -19,7 +19,6 @@ dependencies {
     runtimeOnly(libs.intellij.fastutil)
     runtimeOnly(commonDependency("org.codehaus.woodstox:stax2-api"))
     runtimeOnly(commonDependency("com.fasterxml:aalto-xml"))
-    runtimeOnly(commonDependency("org.jetbrains.intellij.deps:trove4j"))
 
     // test dependencies
     testImplementation(platform(libs.junit.bom))

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -124,7 +124,6 @@ dependencies {
     testImplementation(project(path = ":examples:annotation-processor-example"))
     testImplementation(kotlinStdlib("jdk8"))
     testImplementation(project(":kotlin-parcelize-compiler"))
-    testImplementation(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     testImplementation(libs.kotlinx.serialization.json)
     testImplementation(libs.ktor.client.cio)
     testImplementation(libs.ktor.client.mock)

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/KotlinNativeCompilerDownloadIT.kt

@@ -204,14 +204,12 @@ class KotlinNativeCompilerDownloadIT : KGPBaseTest() {
                 assertNativeTasksClasspath(":native1:compileKotlin${nativeHostTargetName.capitalize()}") {
                     val konanLibsPath = customNativeHomePath.resolve(STABLE_VERSION_DIR_NAME).resolve("konan").resolve("lib")
                     assertContains(it, konanLibsPath.resolve("kotlin-native-compiler-embeddable.jar").absolutePathString())
-                    assertContains(it, konanLibsPath.resolve("trove4j.jar").absolutePathString())
                 }
 
                 // check that in second project we use k/n from default konan location
                 assertNativeTasksClasspath(":native2:compileKotlin${nativeHostTargetName.capitalize()}") {
                     val konanLibsPath = defaultKotlinNativeHomePath.resolve(STABLE_VERSION_DIR_NAME).resolve("konan").resolve("lib")
                     assertContains(it, konanLibsPath.resolve("kotlin-native-compiler-embeddable.jar").absolutePathString())
-                    assertContains(it, konanLibsPath.resolve("trove4j.jar").absolutePathString())
                 }
             }
         }

libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/internal/compilerRunner/native/nativeRunnerHelpers.kt

@@ -30,7 +30,7 @@ internal fun ObjectFactory.nativeCompilerClasspath(
     shouldUseEmbeddableCompilerJar: Provider<Boolean>,
 ) = fileCollection().from(
     nativeHomeDirectory.kotlinNativeCompilerJar(shouldUseEmbeddableCompilerJar),
-    nativeHomeDirectory.map { it.resolve("konan/lib/trove4j.jar") },
+    nativeHomeDirectory.map { it.resolve("konan/lib/trove4j.jar") }, // for compatibility with K/N < 2.2.0
 )
 
 internal fun nativeExecSystemProperties(