Skip to content

Commit

Permalink
Resolve build failures and update gradle wrapper to 8.13
Browse files Browse the repository at this point in the history
  • Loading branch information
nightm4re94 committed Mar 4, 2025
1 parent cee64e2 commit 68d6d97
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 16 deletions.
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ nexusPublishing {
}
}
}

11 changes: 4 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,16 @@ xml_runtime_impl = { module = "com.sun.xml.bind:jaxb-impl", version.ref = "jaxb"

# Test dependencies
mockito_core = { module = "org.mockito:mockito-core", version = "5.16.0" }
mockito_inline = { module = "org.mockito:mockito-inline", version = "5.2.0" }
junit_api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junit_params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
junit_engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
junit_jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
junit_jupiter_api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
junit_jupiter_params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit" }
junit_jupiter_engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }


[bundles]
soundlibs = ["soundlibs-jorbis", "soundlibs-tritonus", "soundlibs-vorbisspi", "soundlibs-mp3spi"]
xml_runtime = ["xml-runtime-core", "xml-runtime-impl"]

# Test dependencies
mockito = ["mockito-core", "mockito-inline"]
junit = ["junit-api", "junit-params", "junit-engine"]

[plugins]
beryxRuntime = { id = "org.beryx.runtime", version = "1.13.1" }
Expand Down
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.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 2 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -206,7 +205,7 @@ fi
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
Expand Down
2 changes: 2 additions & 0 deletions litiengine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,6 @@ dependencies {
api libs.xml.api
runtimeOnly libs.bundles.xml.runtime
testImplementation project(":shared")
testImplementation libs.junit.jupiter
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}
8 changes: 4 additions & 4 deletions shared/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins {
}

dependencies {
api libs.bundles.mockito
api libs.junit.api
api libs.junit.params
runtimeOnly libs.junit.engine
api libs.mockito.core
api libs.junit.jupiter.api
api libs.junit.jupiter.params
runtimeOnly libs.junit.jupiter.engine
}
2 changes: 2 additions & 0 deletions utiliti/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ dependencies {
implementation project(":litiengine")
implementation libs.darklaf.core
testImplementation project(":shared")
testImplementation libs.junit.jupiter
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
}

runtime {
Expand Down

0 comments on commit 68d6d97

Please sign in to comment.