From faf55d636c8c1cd717987acbd07ac03ef2af5f24 Mon Sep 17 00:00:00 2001 From: ItsKev Date: Sat, 3 Jan 2026 14:39:17 +0100 Subject: [PATCH] chore: use grounds gradle plugin --- .github/workflows/release.yml | 8 ++++ build.gradle.kts | 76 +---------------------------------- paper/build.gradle.kts | 25 +----------- settings.gradle.kts | 13 ++++++ velocity/build.gradle.kts | 30 +------------- 5 files changed, 26 insertions(+), 126 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 94d0b55..f5aae60 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,14 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v5 + - name: Configure GitHub Packages credentials + run: | + mkdir -p ~/.gradle + { + echo "github.user=${{ github.actor }}" + echo "github.token=${{ secrets.GITHUB_TOKEN }}" + } > ~/.gradle/gradle.properties + - name: Publish package env: GITHUB_ACTOR: ${{ github.actor }} diff --git a/build.gradle.kts b/build.gradle.kts index f706585..d4da669 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,75 +1 @@ -plugins { - base - kotlin("jvm") version "2.3.0" - kotlin("kapt") version "2.3.0" - id("com.diffplug.spotless") version "8.1.0" - id("maven-publish") -} - -allprojects { - apply(plugin = "com.diffplug.spotless") - - repositories { - maven { url = uri("https://repo.papermc.io/repository/maven-public/") } - mavenCentral() - } - - spotless { - kotlin { - ktfmt().googleStyle().configure { - it.setBlockIndent(4) - it.setContinuationIndent(4) - } - targetExclude("**/build/**") - } - kotlinGradle { - ktfmt().googleStyle().configure { - it.setBlockIndent(4) - it.setContinuationIndent(4) - } - targetExclude("**/build/**") - } - } -} - -subprojects { - group = "gg.grounds" - - val versionOverride = project.findProperty("versionOverride") as? String - version = versionOverride ?: "local-SNAPSHOT" - - apply(plugin = "org.jetbrains.kotlin.jvm") - apply(plugin = "org.jetbrains.kotlin.kapt") - apply(plugin = "maven-publish") - - kotlin { jvmToolchain(25) } - - tasks.test { - useJUnitPlatform() - - testLogging { - // Show assertion diffs in test output - exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL - } - } - - publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/groundsgg/${rootProject.name}") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - - publications { - create("java") { - from(components["java"]) - artifactId = rootProject.name + "-" + project.name - } - } - } -} +plugins { id("gg.grounds.root") version "0.1.0" } diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts index 40fa29b..dffe439 100644 --- a/paper/build.gradle.kts +++ b/paper/build.gradle.kts @@ -1,24 +1,3 @@ -plugins { id("com.gradleup.shadow") version "9.3.0" } +plugins { id("gg.grounds.paper") version "0.1.0" } -dependencies { - implementation(project(":common")) - compileOnly("io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT") -} - -tasks.build { dependsOn(tasks.shadowJar) } - -tasks.jar { enabled = false } - -tasks.shadowJar { - archiveBaseName.set(rootProject.name) - archiveClassifier.set("") // Removes the 'all' classifier - archiveVersion.set("") // Removes the version from the jar name -} - -val pluginVersion = project.version.toString() - -tasks.processResources { - inputs.property("version", project.version) - - filesMatching(listOf("**/plugin.yml")) { expand("VERSION" to pluginVersion) } -} +dependencies { implementation(project(":common")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 7c1aba9..0042f5b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,3 +1,16 @@ rootProject.name = "plugin-server-discovery" include("common", "velocity", "paper") + +pluginManagement { + repositories { + maven { + url = uri("https://maven.pkg.github.com/groundsgg/*") + credentials { + username = providers.gradleProperty("github.user").get() + password = providers.gradleProperty("github.token").get() + } + } + gradlePluginPortal() + } +} diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 8906713..746a049 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -1,29 +1,3 @@ -plugins { - id("com.gradleup.shadow") version "9.3.0" - id("com.github.gmazzo.buildconfig") version "6.0.7" -} +plugins { id("gg.grounds.velocity") version "0.1.0" } -dependencies { - implementation(project(":common")) - compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") - kapt("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") -} - -tasks.build { dependsOn(tasks.shadowJar) } - -tasks.jar { enabled = false } - -tasks.shadowJar { - archiveBaseName.set(rootProject.name) - archiveClassifier.set("") // Removes the 'all' classifier - archiveVersion.set("") // Removes the version from the jar name -} - -buildConfig { - className("BuildInfo") - packageName("gg.grounds") - - useKotlinOutput() - - buildConfigField("String", "VERSION", "\"${project.version}\"") -} +dependencies { implementation(project(":common")) }