diff --git a/build.gradle.kts b/build.gradle.kts index 2f19186..16057fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,3 @@ -import io.papermc.paperweight.util.constants.* - plugins { java `maven-publish` @@ -7,10 +5,12 @@ plugins { id("io.papermc.paperweight.patcher") version "1.4.0" } +val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/" + repositories { mavenCentral() - maven("https://repo.papermc.io/repository/maven-public/") { - content { onlyForConfigurations("paperclip") } + maven(paperMavenPublicUrl) { + content { onlyForConfigurations(configurations.paperclip.name) } } } @@ -20,7 +20,7 @@ dependencies { paperclip("io.papermc:paperclip:3.0.2") } -subprojects { +allprojects { apply(plugin = "java") apply(plugin = "maven-publish") @@ -29,7 +29,9 @@ subprojects { languageVersion.set(JavaLanguageVersion.of(17)) } } +} +subprojects { tasks.withType { options.encoding = Charsets.UTF_8.name() options.release.set(17) @@ -42,32 +44,24 @@ subprojects { } repositories { - mavenLocal() mavenCentral() - maven("https://oss.sonatype.org/content/groups/public/") - maven("https://repo.papermc.io/repository/maven-public/") - maven("https://ci.emc.gs/nexus/content/groups/aikar/") - maven("https://repo.aikar.co/content/groups/aikar") - maven("https://repo.md-5.net/content/repositories/releases/") - maven("https://hub.spigotmc.org/nexus/content/groups/public/") - maven("https://jitpack.io") - maven("https://repo.codemc.io/repository/maven-public/") + maven(paperMavenPublicUrl) } } paperweight { - serverProject.set(project(":gale-server")) + serverProject.set(project(":gale-server")) // Gale - build changes - remapRepo.set("https://maven.fabricmc.net/") - decompileRepo.set("https://maven.quiltmc.org/") + remapRepo.set(paperMavenPublicUrl) + decompileRepo.set(paperMavenPublicUrl) - usePaperUpstream(providers.gradleProperty("paperRef")) { + usePaperUpstream(providers.gradleProperty("paperRef")) { withPaperPatcher { apiPatchDir.set(layout.projectDirectory.dir("patches/api")) - apiOutputDir.set(layout.projectDirectory.dir("gale-api")) + apiOutputDir.set(layout.projectDirectory.dir("gale-api")) // Gale - build changes serverPatchDir.set(layout.projectDirectory.dir("patches/server")) - serverOutputDir.set(layout.projectDirectory.dir("gale-server")) + serverOutputDir.set(layout.projectDirectory.dir("gale-server")) // Gale - build changes } } } diff --git a/gradle.properties b/gradle.properties index 99635ab..f91b927 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,9 @@ -org.gradle.caching=true -org.gradle.parallel=true -org.gradle.vfs.watch=false - group=org.galemc.gale version=1.19.3-R0.1-SNAPSHOT + mcVersion=1.19.3 -paperRef=048ee5872d791df0a9aad856723958c8dc602e48 \ No newline at end of file +paperRef=048ee5872d791df0a9aad856723958c8dc602e48 + +org.gradle.caching=true +org.gradle.parallel=true +org.gradle.vfs.watch=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..943f0cb 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 ae04661..f398c33 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/settings.gradle.kts b/settings.gradle.kts index a5551dd..732a75e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,10 +1,10 @@ pluginManagement { repositories { gradlePluginPortal() - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.papermc.io/repository/maven-public/") } } -rootProject.name = "gale" +rootProject.name = "gale" // Gale - build changes -include("gale-api", "gale-server") +include("gale-api", "gale-server") // Gale - build changes