diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index b9520ba61..04bf401fe 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -29,8 +29,10 @@ object Versions { } object Bukkit { - const val paper = "1.18-R0.1-SNAPSHOT" + const val paper = "1.18.2-R0.1-SNAPSHOT" const val paperLib = "1.0.5" + const val minecraft = "1.19" + const val reflectionRemapper = "0.1.0-SNAPSHOT" } object Sponge { diff --git a/platforms/bukkit/build.gradle.kts b/platforms/bukkit/build.gradle.kts index 146321dff..e0a1bc48a 100644 --- a/platforms/bukkit/build.gradle.kts +++ b/platforms/bukkit/build.gradle.kts @@ -8,7 +8,6 @@ plugins { id("xyz.jpenilla.run-paper") version "1.0.6" } -val mcVersion = "1.18.2" val testDir = "target/server" val testMem = "3G" @@ -24,7 +23,7 @@ dependencies { shaded(project(":platforms:bukkit:common")) shaded(project(":platforms:bukkit:nms:v1_18_R2", configuration = "reobf")) shaded(project(":platforms:bukkit:nms:v1_19_R1", configuration = "reobf")) - shaded("xyz.jpenilla", "reflection-remapper", "0.1.0-SNAPSHOT") + shaded("xyz.jpenilla", "reflection-remapper", Versions.Bukkit.reflectionRemapper) } val throttleCoreCount = 0 @@ -45,7 +44,7 @@ if(throttleCoreCount > 0) { fun downloadPaperclip(url: String, dir: String) { - val clip = URL(url.replace("%version%", mcVersion)) + val clip = URL(url.replace("%version%", Versions.Bukkit.minecraft)) val clipReadableByteChannel = Channels.newChannel(clip.openStream()) val clipFile = file("$testDir/$dir/paperclip.jar") val clipOutputStream = clipFile.outputStream() diff --git a/platforms/bukkit/common/build.gradle.kts b/platforms/bukkit/common/build.gradle.kts index b29891d4d..a806ce672 100644 --- a/platforms/bukkit/common/build.gradle.kts +++ b/platforms/bukkit/common/build.gradle.kts @@ -9,7 +9,7 @@ dependencies { because("Minecraft 1.17+ includes slf4j 1.8.0-beta4, so we need to shade it for other versions.") } - compileOnly("io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT") + compileOnly("io.papermc.paper:paper-api:${Versions.Bukkit.paper}") shadedApi("io.papermc", "paperlib", Versions.Bukkit.paperLib) shadedApi("com.google.guava:guava:30.0-jre")