From 9bb86792bf4740b6650ccd40b0d47318cf1a3929 Mon Sep 17 00:00:00 2001 From: DJtheRedstoner <52044242+DJtheRedstoner@users.noreply.github.com> Date: Thu, 25 Apr 2024 04:18:36 -0400 Subject: 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 --- build.gradle.kts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index b6214a3..4215a6a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.5.21" + kotlin("jvm") version "1.9.23" `maven-publish` } @@ -22,6 +22,7 @@ val testB by sourceSets.creating kotlinVersion("1.5.21", isPrimaryVersion = true) kotlinVersion("1.6.20") +kotlinVersion("1.9.0") dependencies { api("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.21") @@ -53,6 +54,13 @@ tasks.test { useJUnitPlatform() } +tasks.withType { + kotlinOptions { + apiVersion = "1.5" + languageVersion = "1.5" + } +} + fun kotlinVersion(version: String, isPrimaryVersion: Boolean = false) { val name = version.replace(".", "") -- cgit From 764eedd6ad31ed826b02e61611b690d65ec77fa3 Mon Sep 17 00:00:00 2001 From: ev chang Date: Thu, 16 May 2024 16:08:39 -0400 Subject: Revert "Add Kotlin 1.9.0 support" This reverts commit fcd760df97454eeed436334808da51ea9ba20540. --- build.gradle.kts | 3 +-- .../kotlin/com/replaymod/gradle/remap/kotlin190.kt | 11 -------- .../com/replaymod/gradle/remap/Transformer.kt | 8 ++++-- .../kotlin/com/replaymod/gradle/remap/version.kt | 29 ---------------------- 4 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 src/kotlin190/kotlin/com/replaymod/gradle/remap/kotlin190.kt delete mode 100644 src/main/kotlin/com/replaymod/gradle/remap/version.kt (limited to 'build.gradle.kts') diff --git a/build.gradle.kts b/build.gradle.kts index ba80454..f32d4c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "1.5.21" `maven-publish` } @@ -22,7 +22,6 @@ val testB by sourceSets.creating kotlinVersion("1.5.21", isPrimaryVersion = true) kotlinVersion("1.6.20") -kotlinVersion("1.9.0") dependencies { api("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.21") diff --git a/src/kotlin190/kotlin/com/replaymod/gradle/remap/kotlin190.kt b/src/kotlin190/kotlin/com/replaymod/gradle/remap/kotlin190.kt deleted file mode 100644 index 0d05a7f..0000000 --- a/src/kotlin190/kotlin/com/replaymod/gradle/remap/kotlin190.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.replaymod.gradle.remap - -import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot -import java.nio.file.Path - -fun createSourceRoot190( - tempDir: Path, - isCommon: Boolean -): KotlinSourceRoot { - return KotlinSourceRoot(tempDir.toString(), isCommon, null) -} 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(CLIConfigurationKeys.CONTENT_ROOTS, JavaSourceRoot(tmpDir.toFile(), "")) - config.add(CLIConfigurationKeys.CONTENT_ROOTS, createSourceRoot(tmpDir.toAbsolutePath(), false)) + config.add(CLIConfigurationKeys.CONTENT_ROOTS, KotlinSourceRoot(tmpDir.toAbsolutePath().toString(), false)) config.addAll(CLIConfigurationKeys.CONTENT_ROOTS, classpath!!.map { JvmClasspathRoot(File(it)) }) config.put(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() - 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 -): 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) - } -} -- cgit