From ef13eb3eb21fc6d4125cc8190be7c6f2bec23688 Mon Sep 17 00:00:00 2001 From: Alexander Brandes Date: Wed, 5 Jul 2023 13:49:04 +0200 Subject: [PATCH] Retire 'bom-1.18.x' module (#128) --- bom-1.16.x/build.gradle.kts | 1 - bom-1.18.x/build.gradle.kts | 45 ------------------------------------- bom-newest/build.gradle.kts | 1 - renovate.json | 2 +- settings.gradle.kts | 2 +- 5 files changed, 2 insertions(+), 49 deletions(-) delete mode 100644 bom-1.18.x/build.gradle.kts diff --git a/bom-1.16.x/build.gradle.kts b/bom-1.16.x/build.gradle.kts index ae12747..9f96618 100644 --- a/bom-1.16.x/build.gradle.kts +++ b/bom-1.16.x/build.gradle.kts @@ -5,7 +5,6 @@ plugins { bomGenerator { // FastAsyncWorldEdit, PlotSquared, etc. serve a bom on its on, which we don't want here excludeProject("bom-1.16.x") - excludeProject("bom-1.18.x") excludeProject("bom-newest") // Native Minecraft dependencies diff --git a/bom-1.18.x/build.gradle.kts b/bom-1.18.x/build.gradle.kts deleted file mode 100644 index 6ef0efb..0000000 --- a/bom-1.18.x/build.gradle.kts +++ /dev/null @@ -1,45 +0,0 @@ -plugins { - id("io.github.gradlebom.generator-plugin") version "1.0.0.Final" -} - -bomGenerator { - // FastAsyncWorldEdit, PlotSquared, etc. serve a bom on its on, which we don't want here - excludeProject("bom-1.16.x") - excludeProject("bom-1.18.x") - excludeProject("bom-newest") - - // Native Minecraft dependencies - includeDependency("org.yaml", "snakeyaml", "1.30") - includeDependency("com.google.code.gson", "gson", "2.8.8") - includeDependency("com.google.guava", "guava", "31.0.1-jre") - includeDependency("org.apache.logging.log4j", "log4j-api", "2.17.1") - - // Paper - includeDependency("io.papermc.paper", "paper-api", "1.18.1-R0.1-SNAPSHOT") - - // Third party dependencies - includeDependency("org.checkerframework", "checker-qual", "3.36.0") - // Adventure & Minimessage - includeDependency("net.kyori", "adventure-api", "4.9.3") - includeDependency("net.kyori", "adventure-text-minimessage", "4.1.0-SNAPSHOT") - includeDependency("net.kyori", "adventure-platform-bukkit", "4.0.1") - - // IntellectualSites plugins - includeDependency("com.plotsquared", "PlotSquared-Core", "6.11.1") - includeDependency("com.plotsquared", "PlotSquared-Bukkit", "6.11.1") - includeDependency("com.fastasyncworldedit", "FastAsyncWorldEdit-Core", "2.6.4") - includeDependency("com.fastasyncworldedit", "FastAsyncWorldEdit-Bukkit", "2.6.4") - - // IntellectualSites libraries - includeDependency("com.intellectualsites.paster", "Paster", "1.1.5") - includeDependency("com.intellectualsites.informative-annotations", "informative-annotations", "1.3") - - // Plugin dependencies - includeDependency("com.github.MilkBowl", "VaultAPI", "1.7.1") - includeDependency("org.bstats", "bstats-bukkit", "3.0.2") - includeDependency("org.bstats", "bstats-base", "3.0.2") - - // Platform dependencies - includeDependency("io.papermc", "paperlib", "1.0.8") - includeDependency("dev.notmyfault.serverlib", "ServerLib", "2.3.1") -} diff --git a/bom-newest/build.gradle.kts b/bom-newest/build.gradle.kts index 547ac35..af93fa0 100644 --- a/bom-newest/build.gradle.kts +++ b/bom-newest/build.gradle.kts @@ -5,7 +5,6 @@ plugins { bomGenerator { // FastAsyncWorldEdit, PlotSquared, etc. serve a bom on its on, which we don't want here excludeProject("bom-1.16.x") - excludeProject("bom-1.18.x") excludeProject("bom-newest") // Native Minecraft dependencies - locked at the version the game uses diff --git a/renovate.json b/renovate.json index 90cc0ec..40edbbd 100644 --- a/renovate.json +++ b/renovate.json @@ -7,7 +7,7 @@ "automerge": true, "packageRules": [ { - "matchPaths": ["bom-1.16.x/**", "bom-1.18.x/**"], + "matchPaths": ["bom-1.16.x/**"], "ignoreDeps": [ "net.kyori:adventure-api", "net.kyori:adventure-text-minimessage", diff --git a/settings.gradle.kts b/settings.gradle.kts index 4edf01e..d49db5a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,3 @@ rootProject.name = "bom" -include("bom-1.16.x", "bom-1.18.x", "bom-newest") +include("bom-1.16.x", "bom-newest")