summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKichura2023-01-03 00:19:59 +0100
committerGitHub2023-01-03 00:19:59 +0100
commit80103d66ce55cef305e4d0eb07309d734a471b6b (patch)
tree9fb366db580926988a6f0e76510b743083ffd6ba
parentb8da8598318f131b4f8006eeb4943d4c2b9e6be6 (diff)
Gradle 7.6, Update Actions and fabric-loader. (#340)
* Gradle 7.6, Update Actions and fabric-loader. * Some naming adjustments Co-authored-by: Aizistral <admin@aizistral.com>
-rw-r--r--.github/workflows/build.yml28
-rw-r--r--.github/workflows/gitlabsync.yml4
-rw-r--r--gradle.properties2
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin59536 -> 61574 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties4
-rw-r--r--gradlew34
-rw-r--r--gradlew.bat19
7 files changed, 49 insertions, 42 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c0ef2bf..fda0146 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,38 +3,34 @@
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.
-name: build
+name: Build
on: [pull_request, push]
jobs:
build:
strategy:
matrix:
- # Use these Java versions
- java: [
- 17, # Current Java LTS & minimum supported by Minecraft
- ]
- # and run on both Linux and Windows
- os: [ubuntu-20.04, windows-2022]
+ java: 17
+ os: [ubuntu-22.04, windows-2022]
runs-on: ${{ matrix.os }}
steps:
- - name: checkout repository
+ - name: Checkout repository
uses: actions/checkout@v3
- - name: validate gradle wrapper
+ - name: Validate gradle wrapper
uses: gradle/wrapper-validation-action@v1
- - name: setup jdk ${{ matrix.java }}
+ - name: Setup JDK ${{ matrix.java }}
uses: actions/setup-java@v3
with:
- distribution: temurin
+ distribution: 'temurin'
java-version: ${{ matrix.java }}
- - name: make gradle wrapper executable
+ - name: Make gradle wrapper executable
if: ${{ runner.os != 'Windows' }}
run: chmod +x ./gradlew
- - name: build
+ - name: Build the mod
run: ./gradlew build
- - name: capture build artifacts
- if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
- uses: actions/upload-artifact@v2
+ - name: Upload build artifacts
+ if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts from one OS and required JDK.
+ uses: actions/upload-artifact@v3
with:
name: Artifacts
path: build/libs/
diff --git a/.github/workflows/gitlabsync.yml b/.github/workflows/gitlabsync.yml
index 9a05280..b503684 100644
--- a/.github/workflows/gitlabsync.yml
+++ b/.github/workflows/gitlabsync.yml
@@ -1,4 +1,4 @@
-name: GitlabSync
+name: Gitlab Sync
on:
- push
@@ -6,7 +6,7 @@ on:
jobs:
sync:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
name: Git Repo Sync
steps:
- uses: actions/checkout@v3
diff --git a/gradle.properties b/gradle.properties
index 014926d..4e694ca 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
# Toolchain Properties
minecraft_version=1.19.3
yarn_mappings=1.19.3+build.1
-fabric_loader_version=0.14.11
+fabric_loader_version=0.14.12
forge_version=1.19.3-44.0.48
# Mod Properties
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180..943f0cb 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb87..afef0da 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists \ No newline at end of file
diff --git a/gradlew b/gradlew
index c53aefa..2772ff8 100644
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
-# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-# * compound commands having a testable exit status, especially «case»;
-# * various built-in commands including «command», «set», and «ulimit».
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,13 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@@ -127,14 +127,12 @@ if [ -n "$JAVA_HOME" ] ; then
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
@@ -143,12 +141,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -205,6 +207,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
@@ -231,4 +239,4 @@ eval "set -- $(
tr '\n' ' '
)" '"$@"'
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@" \ No newline at end of file
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..d449684 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
@rem limitations under the License.
@rem
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@@ -33,14 +34,14 @@ set APP_HOME=%DIRNAME%
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,15 +76,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end
@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
-:omega
+:omega \ No newline at end of file