From 498a4f31907300b771edf04891d128a7a2684f89 Mon Sep 17 00:00:00 2001 From: "Lukas Rieger (Blue)" Date: Fri, 29 Mar 2024 13:08:59 +0100 Subject: [PATCH] Minimum required Java version is now 16, drop support for spigot versions < 1.16.5 --- BlueMapCommon/build.gradle.kts | 2 +- BlueMapCore/build.gradle.kts | 2 +- implementations/cli/build.gradle.kts | 2 +- implementations/spigot/build.gradle.kts | 9 +++------ implementations/spigot/src/main/resources/plugin.yml | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/BlueMapCommon/build.gradle.kts b/BlueMapCommon/build.gradle.kts index 86130a6c..1506a076 100644 --- a/BlueMapCommon/build.gradle.kts +++ b/BlueMapCommon/build.gradle.kts @@ -12,7 +12,7 @@ plugins { group = "de.bluecolored.bluemap.common" version = "0.0.0" -val javaTarget = 11 +val javaTarget = 16 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/BlueMapCore/build.gradle.kts b/BlueMapCore/build.gradle.kts index a8a72074..28c4b459 100644 --- a/BlueMapCore/build.gradle.kts +++ b/BlueMapCore/build.gradle.kts @@ -46,7 +46,7 @@ version = lastVersion + System.setProperty("bluemap.version", version.toString()) println("Version: $version") -val javaTarget = 11 +val javaTarget = 16 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/implementations/cli/build.gradle.kts b/implementations/cli/build.gradle.kts index eb875154..d9a0eb33 100644 --- a/implementations/cli/build.gradle.kts +++ b/implementations/cli/build.gradle.kts @@ -9,7 +9,7 @@ plugins { group = "de.bluecolored.bluemap.cli" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore -val javaTarget = 11 +val javaTarget = 16 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) diff --git a/implementations/spigot/build.gradle.kts b/implementations/spigot/build.gradle.kts index 31aa6f9e..6d4644bc 100644 --- a/implementations/spigot/build.gradle.kts +++ b/implementations/spigot/build.gradle.kts @@ -10,7 +10,7 @@ plugins { group = "de.bluecolored.bluemap.bukkit" version = System.getProperty("bluemap.version") ?: "?" // set by BlueMapCore -val javaTarget = 11 +val javaTarget = 16 java { sourceCompatibility = JavaVersion.toVersion(javaTarget) targetCompatibility = JavaVersion.toVersion(javaTarget) @@ -42,7 +42,7 @@ dependencies { exclude( group = "com.google.code.gson", module = "gson" ) } - shadow ("org.spigotmc:spigot-api:1.13-R0.1-SNAPSHOT") + shadow ("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT") implementation ("org.bstats:bstats-bukkit:2.2.1") testImplementation ("org.junit.jupiter:junit-jupiter:5.8.2") @@ -128,10 +128,7 @@ modrinth { uploadFile.set(tasks.findByName("shadowJar")) loaders.addAll("spigot", "paper", "purpur") gameVersions.addAll( - "1.13.2", - "1.14", "1.14.1", "1.14.2", "1.14.3", "1.14.4", - "1.15", "1.15.1", "1.15.2", - "1.16", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5", + "1.16.5", "1.17", "1.17.1", "1.18", "1.18.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", diff --git a/implementations/spigot/src/main/resources/plugin.yml b/implementations/spigot/src/main/resources/plugin.yml index 24d6b74e..0111dc31 100644 --- a/implementations/spigot/src/main/resources/plugin.yml +++ b/implementations/spigot/src/main/resources/plugin.yml @@ -2,7 +2,7 @@ name: BlueMap description: "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)" main: de.bluecolored.bluemap.bukkit.BukkitPlugin version: "${version}" -api-version: 1.13 +api-version: 1.16 author: "Blue (TBlueF / Lukas Rieger)" website: "https://github.com/BlueMap-Minecraft" commands: