From a8e9fd3d60653c72ed482d04e472b399f0cdc017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20St=C3=A4ding?= <alexanderstaeding@gmail.com>
Date: Fri, 17 May 2024 21:05:41 +0200
Subject: [PATCH] Update to mc 1.20.6

---
 build.gradle.kts                                    | 10 +++++++---
 example/paper/docker-compose/docker-compose.yaml    |  4 +---
 example/velocity/docker-compose/docker-compose.yaml |  5 ++---
 gradle/libs.versions.toml                           |  4 ++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 175a206..d74d6cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,14 +44,18 @@ allprojects {
         }
     }
 
+    java {
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    }
+
     tasks {
         withType<KotlinCompile> {
-            kotlinOptions.jvmTarget = "17"
+            kotlinOptions.jvmTarget = "21"
         }
         withType<JavaCompile> {
             options.encoding = "UTF-8"
-            sourceCompatibility = "17"
-            targetCompatibility = "17"
+            sourceCompatibility = "21"
+            targetCompatibility = "21"
         }
     }
 }
diff --git a/example/paper/docker-compose/docker-compose.yaml b/example/paper/docker-compose/docker-compose.yaml
index 2689c77..43f2be9 100644
--- a/example/paper/docker-compose/docker-compose.yaml
+++ b/example/paper/docker-compose/docker-compose.yaml
@@ -2,7 +2,6 @@
 # how OnTime may be deployed in a container environment.
 # Carefully read and understand the entire configuration before using any part of it.
 # By using this file, you are indicating your acceptance of the Minecraft EULA (https://www.minecraft.net/en-us/eula).
-version: "3.8"
 name: ontime-paper
 
 services:
@@ -41,8 +40,7 @@ services:
       - "25565:25565"
     environment:
       TYPE: PAPER
-      VERSION: "1.20.4"
-      PAPER_DOWNLOAD_URL: "https://nexus.anvilpowered.org/repository/paper-bin/paper/paper-PR8235-1.20.4-1.jar"
+      VERSION: "1.20.6"
       EULA: true # By using this environment variable, you are indicating your acceptance of the Minecraft EULA
       ONLINE_MODE: true
       PLUGINS: |
diff --git a/example/velocity/docker-compose/docker-compose.yaml b/example/velocity/docker-compose/docker-compose.yaml
index 0d6479c..75184ac 100644
--- a/example/velocity/docker-compose/docker-compose.yaml
+++ b/example/velocity/docker-compose/docker-compose.yaml
@@ -2,7 +2,6 @@
 # how OnTime may be deployed in a container environment.
 # Carefully read and understand the entire configuration before using any part of it.
 # By using this file, you are indicating your acceptance of the Minecraft EULA (https://www.minecraft.net/en-us/eula).
-version: "3.8"
 name: ontime-velocity
 
 services:
@@ -83,7 +82,7 @@ services:
       - 25565
     environment:
       TYPE: PAPER
-      VERSION: "1.20.4"
+      VERSION: "1.20.6"
       EULA: true # By using this environment variable, you are indicating your acceptance of the Minecraft EULA
       ONLINE_MODE: false
       PATCH_DEFINITIONS: /config/paper-patch-set.json
@@ -99,7 +98,7 @@ services:
       - 25565
     environment:
       TYPE: PAPER
-      VERSION: "1.20.4"
+      VERSION: "1.20.6"
       EULA: true # By using this environment variable, you are indicating your acceptance of the Minecraft EULA
       ONLINE_MODE: false
       PATCH_DEFINITIONS: /config/paper-patch-set.json
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2a2d80d..99fd951 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ driver-postgresql = "org.postgresql:postgresql:42.7.2"
 kotest = "io.kotest:kotest-runner-junit5-jvm:5.8.0"
 kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 luckperms = "net.luckperms:api:5.4"
-paper = "io.papermc.paper:paper-api:1.20.4-brigadier-SNAPSHOT"
+paper = "io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT"
 velocity = "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT"
 
 [plugins]
@@ -22,5 +22,5 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ktlint = "org.jlleitschuh.gradle.ktlint:11.6.1"
 pluginyml = "net.minecrell.plugin-yml.paper:0.6.0"
-shadow = "com.github.johnrengelman.shadow:8.1.1"
+shadow = "io.github.goooler.shadow:8.1.7"
 sponge = "org.spongepowered.gradle.plugin:2.2.0"