chore: support for kotlin `2.x` #147

sgammon · 2024-02-14T05:46:08Z

Summary

Initial changes to support Kotlin 2.x.x beta.

Changelog

chore: changes to support kotlin 2.x
chore: changes to support newer serialization plugin
chore: upgrade gradle → 8.6
chore: upgrade detekt → latest

Signed-off-by: Sam Gammon <[email protected]>

- chore: changes to support kotlin `2.x` - chore: changes to support newer serialization plugin - chore: upgrade gradle → `8.6` - chore: upgrade detekt → latest Signed-off-by: Sam Gammon <[email protected]>

CommanderTvis · 2024-02-14T10:12:17Z

using-embedded-kotlin/build.gradle.kts

@@ -102,7 +102,7 @@ subprojects {
                    localDirectory = [email protected]("src/main/kotlin")

                    remoteUrl =
-                        URL("https://github.com/JetBrains-Research/reflekt/tree/master/using-embedded-kotlin/${[email protected]}/src/main/kotlin/")
+                        uri("https://github.com/JetBrains-Research/reflekt/tree/master/using-embedded-kotlin/${[email protected]}/src/main/kotlin/").toURL()


Is it relevant? :/

Fixes a build warning, I can roll it back if you want

CommanderTvis · 2024-02-14T10:15:44Z

build-logic/src/main/kotlin/org.jetbrains.reflekt.conventions.gradle.kts

+kotlin {
+  compilerOptions {
+      apiVersion = ktTarget
+      languageVersion = ktTarget
+      freeCompilerArgs = freeCompilerArgs.get().plus(ktCompilerArgs)
+  }
+}
+
+afterEvaluate {
+    tasks.withType(KotlinCompile::class).configureEach {
+        kotlinOptions {
+            apiVersion = ktTarget.version
+            languageVersion = ktTarget.version
+            freeCompilerArgs = freeCompilerArgs.plus(ktCompilerArgs)
+        }
+    }
+}


Unnecessary duplication?

Hopefully this can replace the duplication in other modules, but I can roll back this project if you'd rather express these flags in each module.

CommanderTvis · 2024-02-14T10:20:23Z

gradle.properties

@@ -1,2 +1,4 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+org.gradle.caching=true


It's useless for local builds. Build cache is good for CI, because on CI, you can grab the caches after build to reuse them in the next run.

Suggested change

org.gradle.caching=true

CommanderTvis · 2024-02-14T10:20:41Z

gradle.properties

@@ -1,2 +1,4 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
+org.gradle.caching=true
+org.gradle.parallel=true


It's true by default.

Suggested change

org.gradle.parallel=true

CommanderTvis · 2024-02-14T10:21:47Z

build-logic/src/main/kotlin/org.jetbrains.reflekt.conventions.gradle.kts

+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+val libs = the<LibrariesForLibs>()


Unused val.

CommanderTvis · 2024-02-14T10:25:05Z

settings.gradle.kts

 includeBuild("using-embedded-kotlin")
+
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")


Feature preview enabled, but never used.

CommanderTvis · 2024-02-14T10:26:16Z

settings.gradle.kts

 includeBuild("using-embedded-kotlin")
+
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")


Please explain how this preview helps.

I added this because it improves the configuration cache experience, at least for me; doesn't need to be in this PR, though. I'll remove it.

CommanderTvis · 2024-02-14T10:27:09Z

build-logic/build.gradle.kts

+
+dependencies {
+    implementation(libs.plugin.kotlin)
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))


What is going on here?

This is a fix from the Gradle team which makes Version Catalog symbols visible within the precompiled build script (the convention plugin). I can add a comment which explains it because otherwise it's pretty mysterious.

CommanderTvis · 2024-02-14T10:28:43Z

build-logic/src/main/kotlin/org.jetbrains.reflekt.conventions.gradle.kts

Any reason why can't this logic be just in a couple of build files? buildSrc and convention plugins were avoided for clarity, preventing mix-up of classpathes and build performance.

I've structured this as a single convention plugin, so that compiler flags are consistent across modules. To use Kotlin 2.0.0 beta, we'll need to pass at least some compiler flags to solve OptIns and allow unstable outputs.

I don't think the flags need to be kept after Kotlin 2.0.0 release, so I can add them to each module.

Please make it so. If we had more modules, of course, a convention plugin would be necessary.

CommanderTvis · 2024-02-14T10:29:55Z

build-logic/src/main/kotlin/org.jetbrains.reflekt.conventions.gradle.kts

+    "-Xskip-prerelease-check",
+    "-Xsuppress-version-warnings",
+    "-Xallow-unstable-dependencies",
+    "-opt-in=org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI",


Why do we need all these compiler keys now, considering that everything was fine?

Some of these are needed for Kotlin 2.0, in particular the final two. I will check if the first two are needed.

sgammon · 2024-02-14T18:52:15Z

@CommanderTvis thank you for the quick review, sorry for the mess 😅 we are trying this downstream to see if it works as expected.

sgammon · 2024-02-14T19:09:49Z

With regard to the NoSuchMethodError, here is the exception silenced by that code:

java.lang.NoSuchMethodError: 'void com.intellij.openapi.util.io.NioFiles.deleteRecursively(java.nio.file.Path)'
	at org.jetbrains.kotlin.test.services.impl.TemporaryDirectoryManagerImpl.cleanupTemporaryDirectories(TemporaryDirectoryManagerImpl.kt:45)
	at org.jetbrains.kotlin.test.TestRunner.runTest(TestRunner.kt:32)

I remember now. This deleteRecursively function on com.intellij.openapi.util.io.NioFiles is called by AbstractKotlinCompilerTest.runTest. It seems the Open API dependency for IntelliJ may need to be upgraded, but I don't see where it is being pulled in. Do you have any ideas? Full stacktrace below.

Stacktrace

java.lang.NoSuchMethodError: 'void com.intellij.openapi.util.io.NioFiles.deleteRecursively(java.nio.file.Path)'
	at org.jetbrains.kotlin.test.services.impl.TemporaryDirectoryManagerImpl.cleanupTemporaryDirectories(TemporaryDirectoryManagerImpl.kt:45)
	at org.jetbrains.kotlin.test.TestRunner.runTest(TestRunner.kt:32)
	at org.jetbrains.kotlin.test.TestRunner.runTest$default(TestRunner.kt:27)
	at org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerTest.runTest(AbstractKotlinCompilerTest.kt:88)
	at org.jetbrains.reflekt.plugin.compiler.runners.general.ReflektWithLibraryTestGenerated$Classes$Classes_1.testClasses_1(ReflektWithLibraryTestGenerated.java:46)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.tryRemoveAndExec(ForkJoinPool.java:1351)
	at java.base/java.util.concurrent.ForkJoinTask.awaitDone(ForkJoinTask.java:422)
	at java.base/java.util.concurrent.ForkJoinTask.join(ForkJoinTask.java:651)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.tryRemoveAndExec(ForkJoinPool.java:1351)
	at java.base/java.util.concurrent.ForkJoinTask.awaitDone(ForkJoinTask.java:422)
	at java.base/java.util.concurrent.ForkJoinTask.join(ForkJoinTask.java:651)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.tryRemoveAndExec(ForkJoinPool.java:1351)
	at java.base/java.util.concurrent.ForkJoinTask.awaitDone(ForkJoinTask.java:422)
	at java.base/java.util.concurrent.ForkJoinTask.join(ForkJoinTask.java:651)
	at java.base/java.util.concurrent.RecursiveAction.exec(RecursiveAction.java:194)
	at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:387)
	at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1312)
	at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1843)
	at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1808)
	at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:188)

It was being suppressed because it's deleting temporary files, otherwise the tests seem to pass.

sgammon added 2 commits February 13, 2024 20:57

chore: support for kotlin 1.9.x

06add47

Signed-off-by: Sam Gammon <[email protected]>

chore: support for kotlin 2.x

ee4712b

- chore: changes to support kotlin `2.x` - chore: changes to support newer serialization plugin - chore: upgrade gradle → `8.6` - chore: upgrade detekt → latest Signed-off-by: Sam Gammon <[email protected]>

CommanderTvis requested changes Feb 14, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: support for kotlin `2.x` #147

chore: support for kotlin `2.x` #147

sgammon commented Feb 14, 2024

CommanderTvis Feb 14, 2024

sgammon Feb 14, 2024

CommanderTvis Feb 14, 2024

sgammon Feb 14, 2024

CommanderTvis Feb 14, 2024

CommanderTvis Feb 14, 2024

CommanderTvis Feb 14, 2024

CommanderTvis Feb 14, 2024

CommanderTvis Feb 14, 2024

sgammon Feb 14, 2024

CommanderTvis Feb 14, 2024

sgammon Feb 14, 2024

CommanderTvis Feb 14, 2024

sgammon Feb 14, 2024

CommanderTvis Feb 20, 2024

CommanderTvis Feb 14, 2024

sgammon Feb 14, 2024

sgammon commented Feb 14, 2024

sgammon commented Feb 14, 2024

		includeBuild("using-embedded-kotlin")

		enableFeaturePreview("STABLE_CONFIGURATION_CACHE")

chore: support for kotlin 2.x #147

Are you sure you want to change the base?

chore: support for kotlin 2.x #147

Conversation

sgammon commented Feb 14, 2024

Summary

Changelog

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sgammon commented Feb 14, 2024

sgammon commented Feb 14, 2024

chore: support for kotlin `2.x` #147

chore: support for kotlin `2.x` #147