Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eldoriarpg/eldo-util
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c8888e99adaca8e8b454a741af3116deeb7c65e2
Choose a base ref
..
head repository: eldoriarpg/eldo-util
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d1cb2a28867a449de93b8d64fbcd5fcd28bc1a5
Choose a head ref
Showing with 24 additions and 19 deletions.
  1. +1 −1 .github/workflows/javadocs.yml
  2. +2 −2 build.gradle.kts
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +1 −1 gradle/wrapper/gradle-wrapper.properties
  5. +5 −2 gradlew
  6. +12 −10 gradlew.bat
  7. +2 −2 messaging/build.gradle.kts
  8. +1 −1 settings.gradle.kts
2 changes: 1 addition & 1 deletion .github/workflows/javadocs.yml
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ jobs:
echo "Creating .nojekyll to have Github pages deploy html as is:"
touch .nojekyll
- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4.6.3
uses: JamesIves/github-pages-deploy-action@v4.6.4
with:
branch: gh-pages # The branch the action should deploy to.
folder: build/docs/javadoc # The folder the action should deploy.
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -53,8 +53,8 @@ allprojects {

testImplementation("org.jetbrains", "annotations", "24.1.0")
testImplementation("org.spigotmc", "spigot-api", "1.16.5-R0.1-SNAPSHOT")
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.10.1")
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.10.1")
testImplementation("org.junit.jupiter", "junit-jupiter-api", "5.11.0")
testRuntimeOnly("org.junit.jupiter", "junit-jupiter-engine", "5.11.0")
testImplementation("org.mockito", "mockito-core", "5.12.0")
testImplementation("com.github.seeseemelk", "MockBukkit-v1.19", "2.145.0")
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
7 changes: 5 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -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
22 changes: 12 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
@@ -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 ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

4 changes: 2 additions & 2 deletions messaging/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
description = "Utilities for message dispatching"

dependencies {
api("net.kyori", "adventure-platform-bukkit", "4.3.2")
api("net.kyori", "adventure-text-minimessage", "4.15.0")
api("net.kyori", "adventure-platform-bukkit", "4.3.4")
api("net.kyori", "adventure-text-minimessage", "4.17.0")
api("net.kyori", "adventure-text-serializer-plain", "4.17.0")
compileOnly("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT")
api(project(":core")){
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ dependencyResolutionManagement {
versionCatalogs {
create("libs") {
// plugins
plugin("spotless", "com.diffplug.spotless").version("6.23.3")
plugin("spotless", "com.diffplug.spotless").version("6.25.0")
plugin("publishdata", "de.chojo.publishdata").version("1.2.5")

library("paper", "io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT")