Skip to content

Commit

Permalink
Update Gradle to 8.7 and fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
octylFractal authored and me4502 committed Apr 2, 2024
1 parent e6a4d15 commit f3f0b98
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Expand Up @@ -52,7 +52,7 @@ dependencies {
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.1.14")
implementation("org.spongepowered:spongegradle-plugin-development:2.2.0")
implementation("org.spongepowered:vanillagradle:0.2.1-20231105.223944-69")
implementation("net.minecraftforge.gradle:ForgeGradle:6.0.20")
implementation("net.minecraftforge.gradle:ForgeGradle:6.0.21")
implementation("net.fabricmc:fabric-loom:$loomVersion")
implementation("net.fabricmc:sponge-mixin:$mixinVersion")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
Expand Down
12 changes: 6 additions & 6 deletions buildSrc/src/main/kotlin/Versions.kt
Expand Up @@ -4,12 +4,12 @@ object Versions {
const val TEXT = "3.0.4"
const val TEXT_EXTRAS = "3.0.6"
const val PISTON = "0.5.8"
const val AUTO_VALUE = "1.9"
const val JUNIT = "5.8.1"
const val MOCKITO = "4.3.1"
const val FAST_UTIL = "8.5.9"
const val GUAVA = "31.1-jre"
const val GSON = "2.10"
const val AUTO_VALUE = "1.10.4"
const val JUNIT = "5.10.2"
const val MOCKITO = "5.11.0"
const val FAST_UTIL = "8.5.12"
const val GUAVA = "32.1.3-jre"
const val GSON = "2.10.1"
const val LOG4J = "2.19.0"
const val LIN_BUS = "0.1.0-SNAPSHOT"
}
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
@@ -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.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Expand Up @@ -43,11 +43,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

Expand All @@ -57,11 +57,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

Expand Down
3 changes: 2 additions & 1 deletion verification/build.gradle.kts
Expand Up @@ -44,7 +44,8 @@ tasks.check {
// Pull the version before our current version.
val baseVersion = "(,${rootProject.version.toString().substringBefore("-SNAPSHOT")}["
for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "forge", "sponge")) {
val capitalizedFragment = projectFragment.capitalize(Locale.ROOT)
val capitalizedFragment =
projectFragment.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
val proj = project(":worldedit-$projectFragment")
evaluationDependsOn(proj.path)

Expand Down
2 changes: 1 addition & 1 deletion worldedit-mod/build.gradle.kts
Expand Up @@ -22,7 +22,7 @@ open class MergeManifests : DefaultTask() {
}

private fun throwException(old: Any?, new: Any?, key: Attributes.Name) {
throw IllegalStateException("Duplicate $key: $new")
throw IllegalStateException("Duplicate $key: was $old, trying to add $new")
}

private val MERGE_LOGIC = mapOf(
Expand Down

0 comments on commit f3f0b98

Please sign in to comment.