From 07ca8bdb5e0d02f724078cccb1e719f80b9d9414 Mon Sep 17 00:00:00 2001 From: Tianyu Zhu Date: Wed, 8 Jan 2025 03:24:17 -0700 Subject: [PATCH 1/3] Upgrade to Kotlin 2.1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index ddd6b87..cba890a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.jetbrains.kotlin.jvm' version '2.0.0' + id 'org.jetbrains.kotlin.jvm' version '2.1.0' } allprojects { From 1fd91db8d2bdd1e3845ca917fe114bfef744af71 Mon Sep 17 00:00:00 2001 From: Tianyu Zhu Date: Wed, 8 Jan 2025 03:25:28 -0700 Subject: [PATCH 2/3] Disable embedded. It is causing gradle exception --- gradle-plugin/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-plugin/build.gradle b/gradle-plugin/build.gradle index e711846..0bc8e81 100644 --- a/gradle-plugin/build.gradle +++ b/gradle-plugin/build.gradle @@ -26,5 +26,5 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-gradle-plugin-api" - embedded project(':kotlin-plugin') +// embedded project(':kotlin-plugin') } From a14c6ca2c768450a7cb1dc9b43c1d9c8acd78b1f Mon Sep 17 00:00:00 2001 From: Tianyu Zhu Date: Wed, 8 Jan 2025 03:50:52 -0700 Subject: [PATCH 3/3] Fix naming of parameterized test --- .../src/test/kotlin/me/shika/ObjectSerializationFixTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kotlin-plugin/src/test/kotlin/me/shika/ObjectSerializationFixTest.kt b/kotlin-plugin/src/test/kotlin/me/shika/ObjectSerializationFixTest.kt index c0f408a..c476874 100644 --- a/kotlin-plugin/src/test/kotlin/me/shika/ObjectSerializationFixTest.kt +++ b/kotlin-plugin/src/test/kotlin/me/shika/ObjectSerializationFixTest.kt @@ -14,7 +14,7 @@ import java.lang.reflect.Method @RunWith(Parameterized::class) class ObjectSerializationFixTest(enableFir: Boolean) { companion object { - @Parameters(name = "FIR: {1}") + @Parameters(name = "FIR: {0}") @JvmStatic fun data() = arrayOf(false, true) }