From 241ffdf22bac5cfae58951f97327ba355719bd50 Mon Sep 17 00:00:00 2001
From: thelooter <evekolb2204@gmail.com>
Date: Fri, 10 May 2024 23:20:12 +0200
Subject: [PATCH] Update to 1.20.6 (#168)

* Update to 1.20.6

* Bump version to 1.5.0 and use Java 21

* Move to new Buildscan plugin

* Move to actually working shadow Plugin

* Fix some deprecations in Gradle
---
 .github/workflows/gradle-publish.yml |  2 +-
 .github/workflows/gradle.yml         |  2 +-
 build.gradle.kts                     | 10 ++++++----
 settings.gradle.kts                  | 12 +++---------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
index 7b46d78..a4b13e7 100644
--- a/.github/workflows/gradle-publish.yml
+++ b/.github/workflows/gradle-publish.yml
@@ -29,7 +29,7 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Validate Gradle wrapper
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 39aea57..f20c93c 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
 
       - name: Cache SonarCloud packages
diff --git a/build.gradle.kts b/build.gradle.kts
index 5e58d5b..172c1a1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     kotlin("jvm") version "1.9.24"
-    id("com.github.johnrengelman.shadow") version "8.1.1"
+    id("io.github.goooler.shadow") version "8.1.7"
     jacoco
     id("maven-publish")
 }
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:24.1.0")
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24")
@@ -24,14 +24,16 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
     testImplementation("com.github.seeseemelk:MockBukkit-v1.20:3.86.1")
     testImplementation("org.hamcrest:hamcrest-library:2.2")
+
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
-val jarVersion = "1.4.0"
+val jarVersion = "1.5.0"
 
 tasks {
 
     java {
-        toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
     }
 
     shadowJar {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4869169..8aa3c12 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,15 +1,9 @@
 plugins {
-    id("com.gradle.enterprise") version("3.17.3")
+    id("com.gradle.develocity") version "3.17.3"
 }
 
 rootProject.name = "eventchecker"
 
-gradleEnterprise {
-    if (System.getenv("CI") != null) {
-        buildScan {
-            publishAlways()
-            termsOfServiceUrl = "https://gradle.com/terms-of-service"
-            termsOfServiceAgree = "yes"
-        }
-    }
+develocity {
+    server = "https://scans.gradle.com"
 }
\ No newline at end of file