diff --git a/build.gradle.kts b/build.gradle.kts index 2979d15..e21850e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,20 +1,20 @@ -import groovy.json.JsonGenerator.Options - plugins { - `java-library` + java `maven-publish` - id("com.gradleup.shadow") version "8.3.3" - id("io.papermc.paperweight.userdev") version "1.7.3" + id("com.gradleup.shadow") version "9.0.0-beta4" + id("io.papermc.paperweight.userdev") version "2.0.0-beta.10" id("org.sonarqube") version "5.1.0.4882" } group = "me.unurled" -version = "0.1.2" +version = "0.2.0" -val mcVersion = "1.21.1-R0.1-SNAPSHOT" +val mcVersion = "1.21.4-R0.1-SNAPSHOT" val lampVersion = "4.0.0-beta.17" -val javaVersion = 21 +val javaVersion = 23 + +paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION repositories { mavenCentral() @@ -29,28 +29,14 @@ dependencies { } java { - val targetVersion = JavaVersion.toVersion(javaVersion) - sourceCompatibility = targetVersion - targetCompatibility = targetVersion - if (JavaVersion.current() < targetVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) - } - withJavadocJar() - withSourcesJar() + toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) } tasks { - assemble { - dependsOn("reobfJar") - } compileJava { - options.encoding = Charsets.UTF_8.name() - - options.compilerArgs.add("-parameters") - - if (javaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - options.release.set(javaVersion) - } + options.release.set(javaVersion) + sourceCompatibility = javaVersion.toString() + targetCompatibility = javaVersion.toString() } sonar { properties { @@ -59,10 +45,22 @@ tasks { } } javadoc { - if (JavaVersion.current().isJava9Compatible) { - (options as StandardJavadocDocletOptions).addBooleanOption("html5", true) - } + options.encoding = Charsets.UTF_8.name() + (options as StandardJavadocDocletOptions).addBooleanOption("html5", true) } + shadowJar { + archiveClassifier.set("") + } +} + +tasks.register("sourcesJar") { + archiveClassifier.set("sources") + from(sourceSets["main"].allSource) +} + +tasks.register("javadocJar") { + archiveClassifier.set("javadoc") + from(tasks.named("javadoc")) } publishing { @@ -77,14 +75,29 @@ publishing { } } publications { - create("maven") { - groupId = project.group.toString() - artifactId = project.name - version = project.version.toString() - from(components["java"]) - artifact(tasks.reobfJar) { + create("mavenJava") { + artifact(tasks.shadowJar.get()) { classifier = "" } + + artifact(tasks.named("sourcesJar").get()) + artifact(tasks.named("javadocJar").get()) + + pom { + name.set(project.name) + description.set(project.description) + developers { + developer { + name.set("unurled") + email.set("dev@unurled.me") + } + } + scm { + connection.set("scm:git:git://git.unurled.me/SacredRealms/SR-Core.git") + developerConnection.set("scm:git:ssh://git.unurled.me:SacredRealms/SR-Core.git") + url.set("https://git.unurled.me/SacredRealms/SR-Core") + } + } } } } diff --git a/gradle.properties b/gradle.properties index e69de29..20c6ff6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e644113..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9355b41..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################