diff --git a/api/paper/build.gradle.kts b/api/paper/build.gradle.kts index 089372a..761a4b6 100644 --- a/api/paper/build.gradle.kts +++ b/api/paper/build.gradle.kts @@ -1,14 +1,8 @@ plugins { - `java-library` id("authmevelocity.publishing") id("authmevelocity.spotless") } -java { - withSourcesJar() - withJavadocJar() -} - dependencies { compileOnly(libs.paper) } @@ -18,8 +12,8 @@ tasks { (options as StandardJavadocDocletOptions).run { encoding = Charsets.UTF_8.name() links( - "https://jd.adventure.kyori.net/api/4.11.0/", - "https://jd.adventure.kyori.net/text-minimessage/4.11.0/", + "https://jd.advntr.dev/api/4.12.0/", + "https://jd.advntr.dev/text-minimessage/4.12.0/", "https://jd.papermc.io/paper/1.19/" ) } diff --git a/api/velocity/build.gradle.kts b/api/velocity/build.gradle.kts index aa02e5f..4fbd237 100644 --- a/api/velocity/build.gradle.kts +++ b/api/velocity/build.gradle.kts @@ -1,5 +1,4 @@ plugins { - `java-library` id("authmevelocity.publishing") id("authmevelocity.spotless") } @@ -8,18 +7,13 @@ dependencies { compileOnly(libs.velocity) } -java { - withSourcesJar() - withJavadocJar() -} - tasks { javadoc { - (options as? StandardJavadocDocletOptions)?.run{ + (options as StandardJavadocDocletOptions).run{ encoding = Charsets.UTF_8.name() links( - "https://jd.adventure.kyori.net/api/4.12.0/", - "https://jd.adventure.kyori.net/text-minimessage/4.12.0/", + "https://jd.advntr.dev/api/4.12.0/", + "https://jd.advntr.dev/text-minimessage/4.12.0/", "https://jd.papermc.io/velocity/3.0.0/" ) } diff --git a/build-logic/src/main/kotlin/authmevelocity.publishing.gradle.kts b/build-logic/src/main/kotlin/authmevelocity.publishing.gradle.kts index 15854b9..b21fa73 100644 --- a/build-logic/src/main/kotlin/authmevelocity.publishing.gradle.kts +++ b/build-logic/src/main/kotlin/authmevelocity.publishing.gradle.kts @@ -1,34 +1,73 @@ plugins { - id("net.kyori.indra.publishing") + `java-library` + `maven-publish` + signing } -indra { - javaVersions { - testWith().add(17) - } +java { + withSourcesJar() + withJavadocJar() +} - github("4drian3d", "AuthMeVelocity") { - ci(true) - } +publishing { + publications { + create("mavenJava") { + repositories { + maven { + credentials(PasswordCredentials::class.java) - gpl3OrLaterLicense() + val central = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" + val snapshots = "https://s01.oss.sonatype.org/content/repositories/snapshots/" - publishReleasesTo("maven central", "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") - publishSnapshotsTo("sonatype snapshots", "https://s01.oss.sonatype.org/content/repositories/snapshots/") - - configurePublications { - artifactId = project.name - - from(components["java"]) - - pom { - developers { - developer { - id.set("4drian3d") - name.set("Adrian Gonzales") - email.set("adriangonzalesval@gmail.com") + if (project.version.toString().endsWith("SNAPSHOT")) { + name = "SonatypeSnapshots" + setUrl(snapshots) + } else { + name = "OSSRH" + setUrl(central) + } } } + from(components["java"]) + pom { + url.set("https://github.com/4drian3d/AuthMeVelocity") + licenses { + license { + name.set("GNU General Public License version 3 or later") + url.set("https://opensource.org/licenses/GPL-3.0") + } + } + scm { + connection.set("scm:git:https://github.com/4drian3d/AuthMeVelocity.git") + developerConnection.set("scm:git:ssh://git@github.com/4drian3d/AuthMeVelocity.git") + url.set("https://github.com/4drian3d/AuthMeVelocity") + } + developers { + developer { + id.set("4drian3d") + name.set("Adrian Gonzales") + email.set("adriangonzalesval@gmail.com") + } + } + issueManagement { + name.set("GitHub") + url.set("https://github.com/4drian3d/AuthMeVelocity/issues") + } + ciManagement { + name.set("GitHub Actions") + url.set("https://github.com/4drian3d/AuthMeVelocity/actions") + } + name.set(project.name) + description.set(project.description) + url.set("https://github.com/4drian3d/AuthMeVelocity") + } } } } + +signing { + useGpgCmd() + sign(configurations.archives.get()) + sign(publishing.publications["mavenJava"]) +} + diff --git a/build.gradle.kts b/build.gradle.kts index 377bf23..91f84ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,3 @@ -plugins { - id("net.kyori.indra.publishing.sonatype") version "3.0.1" -} - allprojects { apply() @@ -9,7 +5,3 @@ allprojects { maven("https://repo.papermc.io/repository/maven-public/") } } - -indraSonatype { - useAlternateSonatypeOSSHost("s01") -} diff --git a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java index 862a866..1be0c0b 100644 --- a/common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java +++ b/common/src/main/java/io/github/_4drian3d/authmevelocity/common/LibsManager.java @@ -24,7 +24,7 @@ import net.byteflux.libby.relocation.Relocation; public final class LibsManager { private final LibraryManager manager; - public LibsManager(LibraryManager manager) { + public LibsManager(final LibraryManager manager) { this.manager = manager; manager.addMavenCentral(); }