diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b15d434..55ddbb5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,7 @@ jobs: build: uses: MinecraftForge/SharedActions/.github/workflows/gradle.yml@main with: - java: 8 + java: 17 gradle_tasks: "publish" artifact_name: "installertools" secrets: diff --git a/build.gradle b/build.gradle index 357bdb4..e849a8d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,12 @@ -import net.minecraftforge.gradleutils.PomUtils - plugins { id 'java-library' id 'maven-publish' id 'eclipse' - id 'org.cadixdev.licenser' version '0.6.1' id 'com.github.johnrengelman.shadow' version '8.1.1' - id 'com.github.ben-manes.versions' version '0.49.0' - id 'net.minecraftforge.gradleutils' version '[2.1.2,)' - id 'net.minecraftforge.gradlejarsigner' version '1.0.4' + id 'com.github.ben-manes.versions' version '0.51.0' + id 'net.minecraftforge.licenser' version '1.0.1' + id 'net.minecraftforge.gradleutils' version '[2.3,2.4)' + id 'net.minecraftforge.gradlejarsigner' version '1.0.5' } group = 'net.minecraftforge' @@ -59,8 +57,8 @@ dependencies { implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' implementation 'com.google.code.gson:gson:2.10.1' implementation 'de.siegmar:fastcsv:2.2.2' - implementation 'net.minecraftforge:srgutils:0.5.6' - implementation 'org.ow2.asm:asm-commons:9.6' + implementation 'net.minecraftforge:srgutils:0.5.10' + implementation 'org.ow2.asm:asm-commons:9.7' } publishing { @@ -72,12 +70,12 @@ publishing { description = 'A collection of command line tools that are useful for the Forge installer, that are not worth being their own standalone projects.' url = 'https://github.com/MinecraftForge/InstallerTools' - PomUtils.setGitHubDetails(pom, 'InstallerTools') + gradleutils.pom.setGitHubDetails(pom, 'InstallerTools') - license PomUtils.Licenses.LGPLv2_1 + license gradleutils.pom.Licenses.LGPLv2_1 developers { - developer PomUtils.Developers.LexManos + developer gradleutils.pom.Developers.LexManos } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..e644113 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 3fa8f86..b82aa23 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-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -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 @@ -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