From 33065b99313c4283fb64c91c04017b33b5673852 Mon Sep 17 00:00:00 2001 From: Deftu Date: Fri, 7 Jun 2024 12:42:07 +0200 Subject: Clean up Kotlin-specific files & support K2 --- src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt') diff --git a/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt b/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt index 0845e0d..9efd0e4 100644 --- a/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt +++ b/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt @@ -72,11 +72,7 @@ class Transformer(private val map: MappingSet) { config.put(CommonConfigurationKeys.MODULE_NAME, "main") jdkHome?.let {config.setupJdk(it) } config.add(CLIConfigurationKeys.CONTENT_ROOTS, JavaSourceRoot(tmpDir.toFile(), "")) - val kotlinSourceRoot = try { - kotlinSourceRoot1521(tmpDir.toAbsolutePath().toString(), false) - } catch (e: NoSuchMethodError) { - kotlinSourceRoot190(tmpDir.toAbsolutePath().toString(), false) - } + val kotlinSourceRoot = createSourceRoot(tmpDir, false) config.add(CLIConfigurationKeys.CONTENT_ROOTS, kotlinSourceRoot) config.addAll(CLIConfigurationKeys.CONTENT_ROOTS, classpath!!.map { JvmClasspathRoot(File(it)) }) config.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, PrintingMessageCollector(System.err, MessageRenderer.GRADLE_STYLE, true)) @@ -103,11 +99,7 @@ class Transformer(private val map: MappingSet) { val psiFiles = virtualFiles.mapValues { psiManager.findFile(it.value)!! } val ktFiles = psiFiles.values.filterIsInstance() - val analysis = try { - analyze1521(environment, ktFiles) - } catch (e: NoSuchMethodError) { - analyze1620(environment, ktFiles) - } + val analysis = analyze(environment, ktFiles) val remappedEnv = remappedClasspath?.let { setupRemappedProject(disposable, it, processedTmpDir) -- cgit