aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/com
diff options
context:
space:
mode:
authorev chang <wyvestbusiness@gmail.com>2024-05-16 16:08:39 -0400
committerev chang <wyvestbusiness@gmail.com>2024-05-16 16:08:39 -0400
commit764eedd6ad31ed826b02e61611b690d65ec77fa3 (patch)
tree01a92e4f86247318509cd90000f096ab8216a2c3 /src/main/kotlin/com
parentacb66b1d652c61f8a49ff3d776758e6dcfeac488 (diff)
downloadRemap-764eedd6ad31ed826b02e61611b690d65ec77fa3.tar.gz
Remap-764eedd6ad31ed826b02e61611b690d65ec77fa3.tar.bz2
Remap-764eedd6ad31ed826b02e61611b690d65ec77fa3.zip
Revert "Add Kotlin 1.9.0 support"
This reverts commit fcd760df97454eeed436334808da51ea9ba20540.
Diffstat (limited to 'src/main/kotlin/com')
-rw-r--r--src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt8
-rw-r--r--src/main/kotlin/com/replaymod/gradle/remap/version.kt29
2 files changed, 6 insertions, 31 deletions
diff --git a/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt b/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt
index b26c987..6e8dae1 100644
--- a/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt
+++ b/src/main/kotlin/com/replaymod/gradle/remap/Transformer.kt
@@ -73,7 +73,7 @@ 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, createSourceRoot(tmpDir.toAbsolutePath(), false))
+ config.add<ContentRoot>(CLIConfigurationKeys.CONTENT_ROOTS, KotlinSourceRoot(tmpDir.toAbsolutePath().toString(), false))
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))
@@ -99,7 +99,11 @@ class Transformer(private val map: MappingSet) {
val psiFiles = virtualFiles.mapValues { psiManager.findFile(it.value)!! }
val ktFiles = psiFiles.values.filterIsInstance<KtFile>()
- val analysis = analyze(environment, ktFiles)
+ val analysis = try {
+ analyze1521(environment, ktFiles)
+ } catch (e: NoSuchMethodError) {
+ analyze1620(environment, ktFiles)
+ }
val remappedEnv = remappedClasspath?.let {
setupRemappedProject(disposable, it, processedTmpDir)
diff --git a/src/main/kotlin/com/replaymod/gradle/remap/version.kt b/src/main/kotlin/com/replaymod/gradle/remap/version.kt
deleted file mode 100644
index 79b133e..0000000
--- a/src/main/kotlin/com/replaymod/gradle/remap/version.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.replaymod.gradle.remap
-
-import org.jetbrains.kotlin.analyzer.AnalysisResult
-import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot
-import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
-import org.jetbrains.kotlin.psi.KtFile
-import java.nio.file.Path
-
-fun analyze(
- environment: KotlinCoreEnvironment,
- ktFiles: List<KtFile>
-): AnalysisResult {
- return try {
- analyze1521(environment, ktFiles)
- } catch (e: Throwable) {
- analyze1620(environment, ktFiles)
- }
-}
-
-fun createSourceRoot(
- tempDir: Path,
- isCommon: Boolean
-): KotlinSourceRoot {
- return try {
- KotlinSourceRoot(tempDir.toString(), isCommon)
- } catch (e: Throwable) {
- createSourceRoot190(tempDir, isCommon)
- }
-}