Up JDK 11 -> 22 & Gradle 8.9.

blurite · Jul 31, 2024 · 1f2cd46 · 1f2cd46
1 parent b12fdf9
commit 1f2cd46
Show file tree

Hide file tree

Showing 7 changed files with 209 additions and 153 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     `maven-publish`
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "2.0.0"
 }
 
 dependencies {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,10 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-val javaVersion = JavaVersion.VERSION_11
+val javaVersion = JavaVersion.VERSION_22
 
 plugins {
     base
-    kotlin("jvm") version "1.7.10"
+    kotlin("jvm") version "2.0.0"
 }
 
 allprojects {

diff --git a/frontend/build.gradle.kts b/frontend/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    kotlin("jvm") version "1.7.10"
-    id("org.openjfx.javafxplugin") version "0.0.13"
+    kotlin("jvm") version "2.0.0"
+    id("org.openjfx.javafxplugin") version "0.0.14"
 }
 
 val gprUser: String? = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") ?: System.getenv("GITHUB_ACTOR")
@@ -19,18 +19,15 @@ repositories {
 dependencies {
     implementation(projects.backend)
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
     implementation("com.displee:disio:2.2")
     implementation("com.displee:rs-cache-library:6.8.1")
-//    if (gprUser != null && gprKey != null) {
-//        implementation("io.blurite:rscm:1.0")
-//    }
     implementation("org.fxmisc.richtext:richtextfx:0.10.9")
     implementation("com.google.code.gson:gson:2.9.0")
 }
 
 javafx {
-    version = "11"
+    version = "22"
     modules = listOf("javafx.controls", "javafx.fxml")
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists