diff --git a/.gitignore b/.gitignore index 8f45d3ed..7a92a9b4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ build/ jars/ *.class -*.jar \ No newline at end of file +*.jar +.java-version diff --git a/Insights-NMS/v1_19_4_R3/build.gradle.kts b/Insights-NMS/v1_19_4_R3/build.gradle.kts index a2262b71..6cfb0609 100644 --- a/Insights-NMS/v1_19_4_R3/build.gradle.kts +++ b/Insights-NMS/v1_19_4_R3/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - paperDevBundle("1.19.4-R0.1-SNAPSHOT") + paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT") } diff --git a/build.gradle.kts b/build.gradle.kts index e8de8436..1336d393 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -35,7 +35,7 @@ subprojects { if (it.startsWith("v")) { it } else { - it.toLowerCase() + it.lowercase() } } } @@ -149,15 +149,15 @@ tasks.register("cleanJars") { } tasks.register("copyJars") { - from(tasks.findByPath("shadowJar"), { + from(tasks.findByPath("shadowJar")!!) { duplicatesStrategy = DuplicatesStrategy.INCLUDE - }) + } into(file("jars")) rename("(.+)Parent(.+)-all(.+)", "$1$2$3") } -val artifactFile = tasks.shadowJar.get().archiveFile.get().asFile -val artifact = artifacts.add("archives", artifactFile) { +val artifactFile: File = tasks.shadowJar.get().archiveFile.get().asFile +val artifact: PublishArtifact = artifacts.add("archives", artifactFile) { type = "jar" name = "Insights" group = rootProject.group diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 63898048..44158d92 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -17,7 +17,8 @@ tasks { } compileKotlin { - sourceCompatibility = JavaVersion.VERSION_17.majorVersion - targetCompatibility = JavaVersion.VERSION_17.majorVersion + kotlinOptions { + jvmTarget = JavaVersion.VERSION_17.majorVersion + } } } diff --git a/buildSrc/src/main/kotlin/VersionConstants.kt b/buildSrc/src/main/kotlin/VersionConstants.kt index 62070181..f496533f 100644 --- a/buildSrc/src/main/kotlin/VersionConstants.kt +++ b/buildSrc/src/main/kotlin/VersionConstants.kt @@ -1,11 +1,11 @@ object VersionConstants { - const val userdevVersion = "1.5.3" - const val pluginYmlVersion = "0.5.2" - const val shadowVersion = "7.1.2" - const val minecraftVersion = "1.19.3-R0.1-SNAPSHOT" - const val cloudVersion = "1.8.0" - const val adventureVersion = "4.12.0" - const val adventurePlatformVersion = "4.2.0" + const val userdevVersion = "1.5.5" + const val pluginYmlVersion = "0.5.3" + const val shadowVersion = "8.1.1" + const val minecraftVersion = "1.19.4-R0.1-SNAPSHOT" + const val cloudVersion = "1.8.3" + const val adventureVersion = "4.13.1" + const val adventurePlatformVersion = "4.3.0" const val paperLibVersion = "1.0.8-SNAPSHOT" const val bStatsVersion = "3.0.0" const val minecraftReflectionVersion = "123e2f546c" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..c1962a79 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 ae04661e..37aef8d3 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-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..aeb74cbb 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,13 +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##*/} - -# 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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,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 @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/gradlew.bat b/gradlew.bat index f127cfd4..93e3f59f 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/jitpack.yml b/jitpack.yml deleted file mode 100644 index 376245fb..00000000 --- a/jitpack.yml +++ /dev/null @@ -1,5 +0,0 @@ -before_install: - - source "$HOME/.sdkman/bin/sdkman-init.sh" - - sdk update - - sdk install java 16.0.1.hs-adpt - - sdk use java 16.0.1.hs-adpt