diff options
| author | DJtheRedstoner <52044242+DJtheRedstoner@users.noreply.github.com> | 2024-04-25 04:18:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 10:18:36 +0200 |
| commit | 9bb86792bf4740b6650ccd40b0d47318cf1a3929 (patch) | |
| tree | 339575b9f17ff75a871b0500e1cd8031b89dd638 /src/main/kotlin/com | |
| parent | 3a12dc22d6ec3924067c7b32582cb6a1ed113344 (diff) | |
| download | Remap-9bb86792bf4740b6650ccd40b0d47318cf1a3929.tar.gz Remap-9bb86792bf4740b6650ccd40b0d47318cf1a3929.tar.bz2 Remap-9bb86792bf4740b6650ccd40b0d47318cf1a3929.zip | |
Add support for Kotlin 1.9.0 (#21)
The KotlinSourceRoot constructor was updated to include an additional
argument related to Kotlin Multiplatform. We always pass null for this
argument.
Co-authored-by: Wyvest <wyvestbusiness@gmail.com>
Diffstat (limited to 'src/main/kotlin/com')
| -rw-r--r-- | src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt b/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt index 6e8dae1..0845e0d 100644 --- a/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt +++ b/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt @@ -4,7 +4,6 @@ import com.replaymod.gradle.remap.legacy.LegacyMapping import org.cadixdev.lorenz.MappingSet import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.config.ContentRoot -import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector @@ -73,7 +72,12 @@ class Transformer(private val map: MappingSet) { config.put(CommonConfigurationKeys.MODULE_NAME, "main") jdkHome?.let {config.setupJdk(it) } config.add<ContentRoot>(CLIConfigurationKeys.CONTENT_ROOTS, JavaSourceRoot(tmpDir.toFile(), "")) - config.add<ContentRoot>(CLIConfigurationKeys.CONTENT_ROOTS, KotlinSourceRoot(tmpDir.toAbsolutePath().toString(), false)) + val kotlinSourceRoot = try { + kotlinSourceRoot1521(tmpDir.toAbsolutePath().toString(), false) + } catch (e: NoSuchMethodError) { + kotlinSourceRoot190(tmpDir.toAbsolutePath().toString(), false) + } + config.add<ContentRoot>(CLIConfigurationKeys.CONTENT_ROOTS, kotlinSourceRoot) config.addAll<ContentRoot>(CLIConfigurationKeys.CONTENT_ROOTS, classpath!!.map { JvmClasspathRoot(File(it)) }) config.put<MessageCollector>(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, PrintingMessageCollector(System.err, MessageRenderer.GRADLE_STYLE, true)) |