Skip to content

Commit

Permalink
Dep updates
Browse files Browse the repository at this point in the history
  • Loading branch information
LexManos committed Apr 29, 2024
1 parent 5a2a2cf commit 4dfe94c
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 9 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down Expand Up @@ -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 {
Expand All @@ -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
}
}
}
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.4-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
Original file line number Diff line number Diff line change
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

0 comments on commit 4dfe94c

Please sign in to comment.