From 7421418ffd8a4a79e4ce1cec5840809c5f0ac0a6 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 15 Dec 2021 20:03:19 -0800
Subject: [PATCH] build changes

Update sponge repo

Update shadow

Reorder repos

Bump various dependencies

further repo adjustments

temporarily comment out sponge7 module so we can build

Revert "temporarily comment out sponge7 module so we can build"

This reverts commit 396921ae71ace17f7e545f0fbfe2687ba3337007.

Use temporary repo for sponge

restore sponge repo

update adventure platform
---
 build-logic/src/main/kotlin/Versions.kt                | 10 +++++-----
 .../src/main/kotlin/cloud.base-conventions.gradle.kts  | 10 ++++++++--
 examples/example-bukkit/build.gradle.kts               |  6 +++---
 gradle/libs.versions.yml                               |  2 +-
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/build-logic/src/main/kotlin/Versions.kt b/build-logic/src/main/kotlin/Versions.kt
index 320e2fe8..6170e0fb 100644
--- a/build-logic/src/main/kotlin/Versions.kt
+++ b/build-logic/src/main/kotlin/Versions.kt
@@ -1,5 +1,5 @@
 object Versions {
-    const val checkerQual = "3.19.0"
+    const val checkerQual = "3.21.0"
     const val geantyref = "1.3.13"
     const val errorprone = "2.9.0"
 
@@ -13,17 +13,17 @@ object Versions {
     // MINECRAFT DEPENDENCIES
     const val brigadier = "1.0.17"
     const val bukkit = "1.13.2-R0.1-SNAPSHOT"
-    const val commodore = "1.10"
+    const val commodore = "1.11"
     const val bungeecord = "1.8-SNAPSHOT"
     const val cloudburst = "1.0.0-SNAPSHOT"
     const val adventureApi = "4.9.3"
-    const val adventurePlatform = "4.0.0"
+    const val adventurePlatform = "4.0.1"
     const val paperApi = "1.16.5-R0.1-SNAPSHOT"
     const val velocityApi = "1.1.0"
     const val spongeApi7 = "7.3.0"
-    const val jetbrainsAnnotations = "20.1.0"
+    const val jetbrainsAnnotations = "23.0.0"
     const val guava = "21.0-jre"
-    const val fabricLoader = "0.12.5"
+    const val fabricLoader = "0.12.11"
     const val fabricMc = "1.16.5"
     const val fabricApi = "0.31.0+1.16"
 
diff --git a/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts b/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts
index 315d433d..63704c33 100644
--- a/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/cloud.base-conventions.gradle.kts
@@ -66,8 +66,6 @@ repositories {
     maven("https://libraries.minecraft.net/") {
         mavenContent { releasesOnly() }
     }
-    /* The current Sponge repository */
-    maven("https://repo-new.spongepowered.org/repository/maven-public/")
     /* The Spigot repository, used for cloud-bukkit */
     maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") {
         mavenContent { snapshotsOnly() }
@@ -78,6 +76,14 @@ repositories {
     maven("https://repo.nukkitx.com/maven-snapshots") {
         mavenContent { snapshotsOnly() }
     }
+    /* The current Fabric repository */
+    maven("https://maven.fabricmc.net/") {
+        mavenContent { includeGroup("net.fabricmc") }
+    }
+    /* The current Sponge repository */
+    maven("https://repo.spongepowered.org/repository/maven-public/") {
+        mavenContent { includeGroup("org.spongepowered") }
+    }
     /* JitPack, used for random dependencies */
     maven("https://jitpack.io") {
         content { includeGroupByRegex("com\\.github\\..*") }
diff --git a/examples/example-bukkit/build.gradle.kts b/examples/example-bukkit/build.gradle.kts
index 649a86e0..b90a6f36 100644
--- a/examples/example-bukkit/build.gradle.kts
+++ b/examples/example-bukkit/build.gradle.kts
@@ -3,7 +3,7 @@ import xyz.jpenilla.runpaper.task.RunServerTask
 plugins {
     id("cloud.example-conventions")
     id("com.github.johnrengelman.shadow")
-    id("xyz.jpenilla.run-paper") version "1.0.4"
+    id("xyz.jpenilla.run-paper") version "1.0.6"
 }
 
 dependencies {
@@ -30,7 +30,7 @@ tasks {
         dependsOn(shadowJar)
     }
     runServer {
-        minecraftVersion("1.17.1")
+        minecraftVersion("1.18.1")
         runDirectory(file("run/latest"))
         javaLauncher.set(project.javaToolchains.launcherFor {
             languageVersion.set(JavaLanguageVersion.of(17))
@@ -40,7 +40,7 @@ tasks {
     // Setup a run task for each supported version
     mapOf(
             setOf("1.8.8", "1.9.4", "1.10.2", "1.11.2") to 11,
-            setOf("1.12.2", "1.13.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1") to 17,
+            setOf("1.12.2", "1.13.2", "1.14.4", "1.15.2", "1.16.5", "1.17.1", "1.18.1") to 17,
     ).forEach { (minecraftVersions, javaVersion) ->
         for (version in minecraftVersions) {
             createVersionedRun(version, javaVersion)
diff --git a/gradle/libs.versions.yml b/gradle/libs.versions.yml
index d5050554..5ab1be3d 100644
--- a/gradle/libs.versions.yml
+++ b/gradle/libs.versions.yml
@@ -4,7 +4,7 @@ metadata:
     - plugins
 
 plugins:
-  com.github.johnrengelman.shadow: 7.1.0
+  com.github.johnrengelman.shadow: 7.1.1
   com.github.ben-manes.versions: 0.36.0
   org.jlleitschuh.gradle.ktlint: &ktlint 10.2.0