diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml index 99f3820c..95485d07 100644 --- a/.github/workflows/publish_to_nexus.yml +++ b/.github/workflows/publish_to_nexus.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3 - name: Set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index ca2fe690..f946d2a7 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v3 - name: Set up JDK 17 uses: actions/setup-java@v3 with: diff --git a/BloodNight-core/build.gradle.kts b/BloodNight-core/build.gradle.kts index 35767e13..e7599933 100644 --- a/BloodNight-core/build.gradle.kts +++ b/BloodNight-core/build.gradle.kts @@ -1,17 +1,17 @@ plugins { id("de.eldoria.library-conventions") - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.github.johnrengelman.shadow") version "8.1.1" } dependencies { implementation(project(":BloodNight-api")) implementation("de.eldoria", "eldo-util", "1.10.2-SNAPSHOT") - implementation("net.kyori", "adventure-platform-bukkit", "4.2.0") - testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.9.2") + implementation("net.kyori", "adventure-platform-bukkit", "4.3.0") + testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.9.3") testImplementation("junit", "junit", "4.13.2") - testImplementation("org.mockito", "mockito-core", "4.9.0") - compileOnly("io.lumine", "Mythic-Dist", "5.2.1") - compileOnly("me.clip", "placeholderapi", "2.11.2") + testImplementation("org.mockito", "mockito-core", "5.3.1") + compileOnly("io.lumine", "Mythic-Dist", "5.3.0") + compileOnly("me.clip", "placeholderapi", "2.11.3") compileOnly("com.onarandombox.multiversecore", "Multiverse-Core", "4.3.1") compileOnly("se.hyperver.hyperverse", "Core", "0.10.0") } @@ -32,6 +32,7 @@ java { } publishData { + addBuildData() useEldoNexusRepos() publishComponent("java") } diff --git a/build.gradle.kts b/build.gradle.kts index 0f11ab69..cba9e2e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,11 +2,11 @@ import de.chojo.PublishData plugins { java - id("de.chojo.publishdata") version "1.0.9" + id("de.chojo.publishdata") version "1.2.4" } group = "de.eldoria" -version = "0.11.2" +version = "0.11.3" subprojects { apply { diff --git a/buildSrc/src/main/kotlin/de.eldoria.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/de.eldoria.java-conventions.gradle.kts index 23c2f585..69ac1714 100644 --- a/buildSrc/src/main/kotlin/de.eldoria.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/de.eldoria.java-conventions.gradle.kts @@ -18,9 +18,9 @@ repositories { dependencies { compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT") - compileOnly("org.projectlombok:lombok:1.18.26") - compileOnly("org.jetbrains:annotations:24.0.0") - annotationProcessor("org.projectlombok:lombok:1.18.26") + compileOnly("org.projectlombok:lombok:1.18.28") + compileOnly("org.jetbrains:annotations:24.0.1") + annotationProcessor("org.projectlombok:lombok:1.18.28") } version = rootProject.version diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..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 f398c33c..37aef8d3 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-7.6-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 65dcd68d..aeb74cbb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +141,7 @@ 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 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,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