From 0dc0752ccf000c9226893116d5e95337b5a0b509 Mon Sep 17 00:00:00 2001 From: Danielle Voznyy Date: Thu, 14 Mar 2024 00:04:58 -0400 Subject: [PATCH] Bump idofront and deps --- .github/workflows/publish-packages.yml | 1 + build.gradle.kts | 16 +++++++--------- gradle.properties | 2 +- protocolburrito-api/build.gradle.kts | 10 +++++----- protocolburrito-generator/build.gradle.kts | 6 +++--- protocolburrito-plugin/build.gradle.kts | 13 +++++-------- settings.gradle.kts | 4 +++- 7 files changed, 25 insertions(+), 27 deletions(-) diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index 6c62de2..b1845f3 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -18,6 +18,7 @@ jobs: - uses: MineInAbyss/publish-action@master with: maven-metadata-url: https://repo.mineinabyss.com/releases/com/mineinabyss/protocolburrito/maven-metadata.xml + maven-snapshot-metadata-url: https://repo.mineinabyss.com/snapshots/com/mineinabyss/protocolburrito/maven-metadata.xml maven-username: ${{ secrets.MAVEN_PUBLISH_USERNAME }} maven-password: ${{ secrets.MAVEN_PUBLISH_PASSWORD }} release-files: | diff --git a/build.gradle.kts b/build.gradle.kts index 363b306..a616497 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,10 +2,10 @@ import io.papermc.paperweight.util.registering @Suppress("DSL_SCOPE_VIOLATION") plugins { - alias(libs.plugins.mia.kotlin.jvm) - alias(libs.plugins.mia.nms) - alias(libs.plugins.mia.publication) - alias(libs.plugins.mia.autoversion) + alias(idofrontLibs.plugins.mia.kotlin.jvm) + alias(idofrontLibs.plugins.mia.nms) + alias(idofrontLibs.plugins.mia.publication) + alias(idofrontLibs.plugins.mia.autoversion) } repositories { @@ -25,19 +25,17 @@ allprojects { maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") } - val libs = rootProject.libs + val libs = rootProject.idofrontLibs dependencies { compileOnly(kotlin("stdlib-jdk8")) - compileOnly(libs.minecraft.plugin.protocollib) { - // this dep wasn't being resolved. - exclude(group = "com.comphenix.executors") - } + compileOnly(libs.minecraft.plugin.protocollib) } } dependencies { api(project(":protocolburrito-api")) + api(idofrontLibs.minecraft.plugin.protocollib) } sourceSets["main"].java.srcDir(file("$buildDir/generated/burrito/main")) diff --git a/gradle.properties b/gradle.properties index 43a99c4..ecc762c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ version=0.9 group=com.mineinabyss -idofrontVersion=0.21.2 +idofrontVersion=0.22.3 publishComponentName=java diff --git a/protocolburrito-api/build.gradle.kts b/protocolburrito-api/build.gradle.kts index 496962e..8f01d8f 100644 --- a/protocolburrito-api/build.gradle.kts +++ b/protocolburrito-api/build.gradle.kts @@ -1,11 +1,11 @@ @Suppress("DSL_SCOPE_VIOLATION") plugins { - alias(libs.plugins.mia.kotlin.jvm) - id(libs.plugins.mia.papermc.get().pluginId) - alias(libs.plugins.mia.publication) - alias(libs.plugins.mia.autoversion) + alias(idofrontLibs.plugins.mia.kotlin.jvm) + id(idofrontLibs.plugins.mia.papermc.get().pluginId) + alias(idofrontLibs.plugins.mia.publication) + alias(idofrontLibs.plugins.mia.autoversion) } dependencies { - compileOnly(libs.kotlin.reflect) + compileOnly(idofrontLibs.kotlin.reflect) } diff --git a/protocolburrito-generator/build.gradle.kts b/protocolburrito-generator/build.gradle.kts index 65f78c7..00f0fd3 100644 --- a/protocolburrito-generator/build.gradle.kts +++ b/protocolburrito-generator/build.gradle.kts @@ -1,7 +1,7 @@ @Suppress("DSL_SCOPE_VIOLATION") plugins { - alias(libs.plugins.mia.kotlin.jvm) - alias(libs.plugins.mia.nms) + alias(idofrontLibs.plugins.mia.kotlin.jvm) + alias(idofrontLibs.plugins.mia.nms) } repositories { @@ -12,7 +12,7 @@ repositories { dependencies { implementation(kotlin("reflect")) - implementation("io.papermc.paper:paper-server:userdev-${libs.versions.minecraft.get()}") + implementation("io.papermc.paper:paper-server:userdev-${idofrontLibs.versions.minecraft.get()}") implementation(burritoLibs.minecraft.plugin.protocollib) implementation(burritoLibs.kotlinpoet) implementation(burritoLibs.reflections) diff --git a/protocolburrito-plugin/build.gradle.kts b/protocolburrito-plugin/build.gradle.kts index 1946d1c..71e117d 100644 --- a/protocolburrito-plugin/build.gradle.kts +++ b/protocolburrito-plugin/build.gradle.kts @@ -1,14 +1,11 @@ -val idofrontVersion: String by project - -@Suppress("DSL_SCOPE_VIOLATION") plugins { - alias(libs.plugins.mia.kotlin.jvm) - id(libs.plugins.mia.papermc.get().pluginId) - alias(libs.plugins.mia.nms) - id(libs.plugins.mia.copyjar.get().pluginId) + alias(idofrontLibs.plugins.mia.kotlin.jvm) + id(idofrontLibs.plugins.mia.papermc.get().pluginId) + alias(idofrontLibs.plugins.mia.nms) + id(idofrontLibs.plugins.mia.copyjar.get().pluginId) } dependencies { - compileOnly(libs.bundles.idofront.core) + compileOnly(idofrontLibs.bundles.idofront.core) implementation(project(":")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index e334e21..345acc6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,7 @@ pluginManagement { google() maven("https://repo.mineinabyss.com/releases") maven("https://repo.papermc.io/repository/maven-public/") + mavenLocal() } resolutionStrategy.eachPlugin { @@ -22,10 +23,11 @@ dependencyResolutionManagement { repositories { maven("https://repo.mineinabyss.com/releases") + mavenLocal() } versionCatalogs { - create("libs"){ + create("idofrontLibs"){ from("com.mineinabyss:catalog:$idofrontVersion") } create("burritoLibs").from(files("gradle/burritoLibs.versions.toml"))