Update to kotlin 2.2, jdk 21 and gradle 9 (#755)

* Update kotlin to 2.2.20 and gradle to 9.0

* Remove Coordinate3D to avoid KT-54513

https://youtrack.jetbrains.com/issue/KT-54513/

* Update to jdk-21

* Upgrade mockk test version

* Bump minor versions

* Start ktor upgrade

* Fix ktor 3 migration

* Convert gradle to use version catalog

* Convert gradle allprojects to use buildSrc shared.gradle.kts

* Add library versions file

* Remove ExperimentalUnsignedTypes

* Store cache version in versions too

* Remove debug add junit platform launcher

* Revert broken exposed version

* Improved grand exchange clear()

Author: GregHib

.github/workflows/create_release.yml

@@ -21,7 +21,7 @@ jobs:
         run: mkdir -p data/cache/
       - uses: actions/setup-java@v3
         with:
-          java-version: "19"
+          java-version: "21"
           distribution: "temurin"
           architecture: x64
           cache: "gradle"

.github/workflows/test-with-coverage.yml

@@ -21,7 +21,7 @@ jobs:
 
       - uses: actions/setup-java@v3
         with:
-          java-version: "19"
+          java-version: "21"
           distribution: "temurin"
           architecture: x64
           cache: "gradle"
@@ -48,7 +48,7 @@ jobs:
         run: chmod +x gradlew
 
       - name: Get cache version
-        run: echo "cache_version=$(./gradlew -q printCacheVersion)" >> $GITHUB_ENV
+        run: echo "cache_version=$(./gradlew -q printCacheVersion | tail -n1 | xargs)" >> $GITHUB_ENV
 
       - name: Restore game cache files from cache
         id: cache-files

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:19-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 LABEL authors="Greg"
 EXPOSE 43594/tcp
 

README.md

@@ -7,7 +7,7 @@
 [![Release](https://github.com/GregHib/void/actions/workflows/create_release.yml/badge.svg)](https://github.com/GregHib/void/actions/workflows/create_release.yml)
 [![Docker](https://img.shields.io/badge/Docker-latest-blue.svg?logo=docker)](https://hub.docker.com/r/greghib/void)
 [![Codecov](https://codecov.io/gh/GregHib/void/graph/badge.svg?token=7W6PTSHUTT)](https://codecov.io/gh/GregHib/void)
-[![Kotlin](https://img.shields.io/badge/Kotlin-1.9.22-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/Kotlin-2.2.20-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
 <h1>RuneScape Revived</h1>
@@ -37,7 +37,7 @@
 
 ## Quick setup
 
-1. Make sure you have [java 19 or above installed](https://adoptium.net/temurin/releases/?package=jre). (`java --version` on command line)
+1. Make sure you have [java 21 or above installed](https://adoptium.net/temurin/releases/?package=jre). (`java --version` on command line)
 2. Extract the [latest void.zip released bundle](https://github.com/GregHib/void/releases) into a directory.
 3. Extract the [latest pre-modified game files cache.zip](https://mega.nz/folder/ZMN2AQaZ#4rJgfzbVW0_mWsr1oPLh1A) into `/void/data/cache/`.
 4. Run either the `run-server.bat` on Windows, or `run-server.sh` on Linux.
@@ -69,7 +69,7 @@ Selecting `git` version control and entering the void project URL Found under th
 
 Press "clone" and after the download is complete the project will be opened for you.
 
-Under `Project Structure... | Project` settings set `SDK` to JDk 19+ (download as needed) and let it index.
+Under `Project Structure... | Project` settings set `SDK` to JDK 21+ (download as needed) and let it index.
 
 Run the following command in the terminal to set up Gradle or close and re-open the project to trigger IntelliJ's `Open as Gradle Project` popup.
 

buffer/build.gradle.kts

@@ -1,2 +1,3 @@
-dependencies {
+plugins {
+    id("shared")
 }

build.gradle.kts

@@ -1,11 +1,23 @@
-plugins {
-    `kotlin-dsl`
+buildscript {
+    dependencies {
+        classpath(libs.kotlin)
+        classpath(libs.shadow)
+    }
 }
 
-dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20")
+plugins {
+    `kotlin-dsl`
+    alias(libs.plugins.jacoco.aggregation)
+    alias(libs.plugins.spotless)
 }
 
 repositories {
     mavenCentral()
 }
+
+dependencies {
+    implementation(libs.kotlin.gradle)
+    implementation(libs.shadow)
+    implementation(libs.spotless)
+    implementation(libs.kotlin.embeddable)
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,15 @@
+dependencyResolutionManagement {
+
+    @Suppress("UnstableApiUsage")
+    repositories {
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "buildSrc"

buildSrc/settings.gradle.kts

@@ -0,0 +1,54 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    kotlin("jvm")
+    id("kotlin")
+    id("idea")
+    id("jacoco")
+    id("com.diffplug.spotless")
+    id("jacoco-report-aggregation")
+}
+
+group = "world.gregs.void"
+version = System.getenv("GITHUB_REF_NAME") ?: "dev"
+
+java.sourceCompatibility = JavaVersion.VERSION_21
+java.targetCompatibility = java.sourceCompatibility
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_21)
+//         https://youtrack.jetbrains.com/issue/KT-4779/Generate-default-methods-for-implementations-in-interfaces
+        freeCompilerArgs.addAll("-Xinline-classes", "-Xcontext-parameters", "-Xjvm-default=all-compatibility")
+    }
+}
+
+
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+    testImplementation("org.junit.platform:junit-platform-launcher:1.13.4")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.13.4")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.13.4")
+}
+
+if (name != "tools") {
+    tasks.test {
+        maxHeapSize = "5120m"
+        useJUnitPlatform()
+        failFast = true
+        testLogging {
+            events("passed", "skipped", "failed")
+            exceptionFormat = TestExceptionFormat.FULL
+        }
+        finalizedBy(tasks.jacocoTestReport)
+    }
+
+    tasks.jacocoTestReport {
+        dependsOn(tasks.test)
+        reports {
+            xml.required = true
+            csv.required = false
+        }
+    }
+}

buildSrc/src/main/kotlin/shared.gradle.kts

@@ -1,14 +1,18 @@
+plugins {
+    id("shared")
+}
+
 dependencies {
     implementation(project(":buffer"))
     implementation(project(":types"))
-    implementation("com.displee:rs-cache-library:${findProperty("displeeCacheVersion")}")
-    implementation("io.insert-koin:koin-core:${findProperty("koinVersion")}")
+    implementation(libs.displee.cache)
+    implementation(libs.koin)
+
+    implementation(libs.lzma)
+    implementation(libs.kotlinx.coroutines)
+    implementation(libs.fastutil)
 
-    implementation("com.github.jponge:lzma-java:1.3")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:${findProperty("kotlinCoroutinesVersion")}")
-    implementation("it.unimi.dsi:fastutil:${findProperty("fastUtilVersion")}")
-    implementation("ch.qos.logback:logback-classic:${findProperty("logbackVersion")}")
-    implementation("com.michael-bull.kotlin-inline-logger:kotlin-inline-logger-jvm:${findProperty("inlineLoggingVersion")}")
+    implementation(libs.bundles.logging)
 
-    testImplementation("io.mockk:mockk:${findProperty("mockkVersion")}")
+    testImplementation(libs.mockk)
 }