Bump Kotlin to 2.0.0

- Bump kotlin version to related gradle files
- Includes some code cleanup and improvements

gradle.properties

@@ -1,2 +1,2 @@
-version=1.3.10
+version=1.3.11
 javaVersion=11

platform/build.gradle.kts

@@ -6,7 +6,7 @@ javaPlatform {
     allowDependencies()
 }
 
-val kotlinVersion = "1.9.20"
+val kotlinVersion = "2.0.0"
 val exposedVersion = "0.37.3"
 val lsp4jVersion = "0.21.2"
 

server/src/test/kotlin/org/javacs/kt/OneFilePerformance.kt

@@ -53,7 +53,7 @@ class OneFilePerformance {
         }
 
         internal fun compile(compile: Collection<KtFile>, sourcePath: Collection<KtFile>): BindingTraceContext {
-            val trace = CliBindingTrace()
+            val trace = CliBindingTrace(env.projectEnvironment.project)
             val container = CompilerFixtures.createContainer(
                 env.project,
                 sourcePath,

server/src/test/resources/additionalWorkspace/build.gradle

@@ -1,3 +1,5 @@
+package additionalWorkspace
+
 plugins {
     id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
 }

server/src/test/resources/additionalWorkspace/gradle.properties

@@ -1 +1 @@
-kotlinVersion=1.9.20
+kotlinVersion=2.0.0

shared/src/main/kotlin/org/javacs/kt/classpath/BackupClassPathResolver.kt

@@ -1,25 +1,26 @@
 package org.javacs.kt.classpath
 
+import org.javacs.kt.LOG
+import org.javacs.kt.util.findCommandOnPath
+import org.javacs.kt.util.tryResolving
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path
+import java.nio.file.Paths
 import java.nio.file.attribute.BasicFileAttributes
 import java.util.function.BiPredicate
-import org.javacs.kt.util.tryResolving
-import org.javacs.kt.util.findCommandOnPath
-import org.javacs.kt.LOG
-import java.nio.file.Paths
 
 /** Backup classpath that find Kotlin in the user's Maven/Gradle home or kotlinc's libraries folder. */
 object BackupClassPathResolver : ClassPathResolver {
     override val resolverType: String = "Backup"
     override val classpath: Set<ClassPathEntry> get() = findKotlinStdlib()?.let { setOf(it) }.orEmpty().map { ClassPathEntry(it, null) }.toSet()
 }
 
-fun findKotlinStdlib(): Path? =
-    findKotlinCliCompilerLibrary("kotlin-stdlib")
-    ?: findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib")
-    ?: findAlternativeLibraryLocation("kotlin-stdlib")
+fun findKotlinStdlib(): Path? {
+    return findKotlinCliCompilerLibrary("kotlin-stdlib")
+        ?: findLocalArtifact("org.jetbrains.kotlin", "kotlin-stdlib")
+        ?: findAlternativeLibraryLocation("kotlin-stdlib")
+}
 
 private fun findLocalArtifact(group: String, artifact: String) =
     tryResolving("$artifact using Maven") { tryFindingLocalArtifactUsing(group, artifact, findLocalArtifactDirUsingMaven(group, artifact)) }
@@ -84,10 +85,11 @@ private fun Path.existsOrNull() =
     if (Files.exists(this)) this else null
 
 private fun findLocalArtifactDirUsingMaven(group: String, artifact: String) =
-    LocalArtifactDirectoryResolution(mavenRepository
-        ?.resolve(group.replace('.', File.separatorChar))
-        ?.resolve(artifact)
-        ?.existsOrNull(), "Maven")
+    LocalArtifactDirectoryResolution(
+        mavenRepository
+            .resolve(group.replace('.', File.separatorChar))
+            .resolve(artifact)
+            .existsOrNull(), "Maven")
 
 private fun findLocalArtifactDirUsingGradle(group: String, artifact: String) =
     LocalArtifactDirectoryResolution(gradleCaches
@@ -109,7 +111,7 @@ private fun compareVersions(left: Path, right: Path): Int {
     val leftVersion = extractVersion(left)
     val rightVersion = extractVersion(right)
 
-    for (i in 0 until Math.min(leftVersion.size, rightVersion.size)) {
+    for (i in 0 until leftVersion.size.coerceAtMost(rightVersion.size)) {
         val leftRev = leftVersion[i].reversed()
         val rightRev = rightVersion[i].reversed()
         val compare = leftRev.compareTo(rightRev)

shared/src/main/kotlin/org/javacs/kt/util/Debouncer.kt

@@ -2,12 +2,10 @@ package org.javacs.kt.util
 
 import org.javacs.kt.LOG
 import java.time.Duration
-import java.util.function.Supplier
 import java.util.concurrent.atomic.AtomicReference
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Future
 
 private var threadCount = 0