Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
CreatureChat
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
Public
CreatureChat
Commits
6f470136
Unverified
Commit
6f470136
authored
Nov 09, 2021
by
modmuss50
Committed by
GitHub
Nov 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to Gradle 7.3 and also build on Java 17
parent
8727262e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
158 additions
and
108 deletions
+158
-108
build.yml
.github/workflows/build.yml
+4
-3
gradle-wrapper.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
gradlew
gradlew
+153
-104
No files found.
.github/workflows/build.yml
View file @
6f470136
...
@@ -12,10 +12,11 @@ jobs:
...
@@ -12,10 +12,11 @@ jobs:
matrix
:
matrix
:
# Use these Java versions
# Use these Java versions
java
:
[
java
:
[
16
# Minimum supported by Minecraft
16
,
# Minimum supported by Minecraft
17
,
# Current Java LTS
]
]
# and run on both Linux and Windows
# and run on both Linux and Windows
os
:
[
ubuntu-20.04
,
windows-
latest
]
os
:
[
ubuntu-20.04
,
windows-
2022
]
runs-on
:
${{ matrix.os }}
runs-on
:
${{ matrix.os }}
steps
:
steps
:
-
name
:
checkout repository
-
name
:
checkout repository
...
@@ -32,7 +33,7 @@ jobs:
...
@@ -32,7 +33,7 @@ jobs:
-
name
:
build
-
name
:
build
run
:
./gradlew build
run
:
./gradlew build
-
name
:
capture build artifacts
-
name
:
capture build artifacts
if
:
${{ runner.os == 'Linux' && matrix.java == '1
6
' }}
# Only upload artifacts built from latest java on one OS
if
:
${{ runner.os == 'Linux' && matrix.java == '1
7
' }}
# Only upload artifacts built from latest java on one OS
uses
:
actions/upload-artifact@v2
uses
:
actions/upload-artifact@v2
with
:
with
:
name
:
Artifacts
name
:
Artifacts
...
...
gradle/wrapper/gradle-wrapper.properties
View file @
6f470136
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-7.
2
-bin.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-7.
3
-bin.zip
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
gradlew
View file @
6f470136
#!/
usr/bin/env
sh
#!/
bin/
sh
#
#
# Copyright
2015 the original author or
authors.
# Copyright
© 2015-2021 the original
authors.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# you may not use this file except in compliance with the License.
...
@@ -17,67 +17,101 @@
...
@@ -17,67 +17,101 @@
#
#
##############################################################################
##############################################################################
##
#
## Gradle start up script for UN*X
# Gradle start up script for POSIX generated by Gradle.
##
#
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# 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».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# 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
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
##############################################################################
##############################################################################
# Attempt to set APP_HOME
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
# Resolve links: $0 may be a link
PRG
=
"
$0
"
app_path
=
$0
# Need this for relative symlinks.
while
[
-h
"
$PRG
"
]
;
do
# Need this for daisy-chained symlinks.
ls
=
`
ls
-ld
"
$PRG
"
`
while
link
=
`
expr
"
$ls
"
:
'.*-> \(.*\)$'
`
APP_HOME
=
${
app_path
%
"
${
app_path
##*/
}
"
}
# leaves a trailing /; empty if no leading path
if
expr
"
$link
"
:
'/.*'
>
/dev/null
;
then
[
-h
"
$app_path
"
]
PRG
=
"
$link
"
do
else
ls
=
$(
ls
-ld
"
$app_path
"
)
PRG
=
`
dirname
"
$PRG
"
`
"/
$link
"
link
=
${
ls
#*
' -> '
}
fi
case
$link
in
#(
/
*
)
app_path
=
$link
;;
#(
*
)
app_path
=
$APP_HOME$link
;;
esac
done
done
SAVED
=
"
`
pwd
`
"
cd
"
`
dirname
\"
$PRG
\"
`
/"
>
/dev/null
APP_HOME
=
$(
cd
"
${
APP_HOME
:-
./
}
"
&&
pwd
-P
)
||
exit
APP_HOME
=
"
`
pwd
-P
`
"
cd
"
$SAVED
"
>
/dev/null
APP_NAME
=
"Gradle"
APP_NAME
=
"Gradle"
APP_BASE_NAME
=
`
basename
"
$0
"
`
APP_BASE_NAME
=
${
0
##*/
}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
# 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
=
'"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD
=
"maximum"
MAX_FD
=
maximum
warn
()
{
warn
()
{
echo
"
$*
"
echo
"
$*
"
}
}
>
&2
die
()
{
die
()
{
echo
echo
echo
"
$*
"
echo
"
$*
"
echo
echo
exit
1
exit
1
}
}
>
&2
# OS specific support (must be 'true' or 'false').
# OS specific support (must be 'true' or 'false').
cygwin
=
false
cygwin
=
false
msys
=
false
msys
=
false
darwin
=
false
darwin
=
false
nonstop
=
false
nonstop
=
false
case
"
`
uname
`
"
in
case
"
$(
uname
)
"
in
#(
CYGWIN
*
)
CYGWIN
*
)
cygwin
=
true
;;
#(
cygwin
=
true
Darwin
*
)
darwin
=
true
;;
#(
;;
MSYS
*
|
MINGW
*
)
msys
=
true
;;
#(
Darwin
*
)
NONSTOP
*
)
nonstop
=
true
;;
darwin
=
true
;;
MSYS
*
|
MINGW
*
)
msys
=
true
;;
NONSTOP
*
)
nonstop
=
true
;;
esac
esac
CLASSPATH
=
$APP_HOME
/gradle/wrapper/gradle-wrapper.jar
CLASSPATH
=
$APP_HOME
/gradle/wrapper/gradle-wrapper.jar
...
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
...
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if
[
-n
"
$JAVA_HOME
"
]
;
then
if
[
-n
"
$JAVA_HOME
"
]
;
then
if
[
-x
"
$JAVA_HOME
/jre/sh/java"
]
;
then
if
[
-x
"
$JAVA_HOME
/jre/sh/java"
]
;
then
# IBM's JDK on AIX uses strange locations for the executables
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD
=
"
$JAVA_HOME
/jre/sh/java"
JAVACMD
=
$JAVA_HOME
/jre/sh/java
else
else
JAVACMD
=
"
$JAVA_HOME
/bin/java"
JAVACMD
=
$JAVA_HOME
/bin/java
fi
fi
if
[
!
-x
"
$JAVACMD
"
]
;
then
if
[
!
-x
"
$JAVACMD
"
]
;
then
die
"ERROR: JAVA_HOME is set to an invalid directory:
$JAVA_HOME
die
"ERROR: JAVA_HOME is set to an invalid directory:
$JAVA_HOME
...
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
...
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
location of your Java installation."
fi
fi
else
else
JAVACMD
=
"java"
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.
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
Please set the JAVA_HOME variable in your environment to match the
...
@@ -106,80 +140,95 @@ location of your Java installation."
...
@@ -106,80 +140,95 @@ location of your Java installation."
fi
fi
# Increase the maximum file descriptors if we can.
# Increase the maximum file descriptors if we can.
if
[
"
$cygwin
"
=
"false"
-a
"
$darwin
"
=
"false"
-a
"
$nonstop
"
=
"false"
]
;
then
if
!
"
$cygwin
"
&&
!
"
$darwin
"
&&
!
"
$nonstop
"
;
then
MAX_FD_LIMIT
=
`
ulimit
-H
-n
`
case
$MAX_FD
in
#(
if
[
$?
-eq
0
]
;
then
max
*
)
if
[
"
$MAX_FD
"
=
"maximum"
-o
"
$MAX_FD
"
=
"max"
]
;
then
MAX_FD
=
$(
ulimit
-H
-n
)
||
MAX_FD
=
"
$MAX_FD_LIMIT
"
warn
"Could not query maximum file descriptor limit"
fi
esac
ulimit
-n
$MAX_FD
case
$MAX_FD
in
#(
if
[
$?
-ne
0
]
;
then
''
|
soft
)
:
;;
#(
warn
"Could not set maximum file descriptor limit:
$MAX_FD
"
*
)
fi
ulimit
-n
"
$MAX_FD
"
||
else
warn
"Could not set maximum file descriptor limit to
$MAX_FD
"
warn
"Could not query maximum file descriptor limit:
$MAX_FD_LIMIT
"
esac
fi
fi
fi
# For Darwin, add options to specify how the application appears in the dock
# Collect all arguments for the java command, stacking in reverse order:
if
$darwin
;
then
# * args from the command line
GRADLE_OPTS
=
"
$GRADLE_OPTS
\"
-Xdock:name=
$APP_NAME
\"
\"
-Xdock:icon=
$APP_HOME
/media/gradle.icns
\"
"
# * the main class name
fi
# * -classpath
# * -D...appname settings
# * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
# For Cygwin or MSYS, switch paths to Windows format before running java
if
[
"
$cygwin
"
=
"true"
-o
"
$msys
"
=
"true"
]
;
then
if
"
$cygwin
"
||
"
$msys
"
;
then
APP_HOME
=
`
cygpath
--path
--mixed
"
$APP_HOME
"
`
APP_HOME
=
$(
cygpath
--path
--mixed
"
$APP_HOME
"
)
CLASSPATH
=
`
cygpath
--path
--mixed
"
$CLASSPATH
"
`
CLASSPATH
=
$(
cygpath
--path
--mixed
"
$CLASSPATH
"
)
JAVACMD
=
`
cygpath
--unix
"
$JAVACMD
"
`
JAVACMD
=
$(
cygpath
--unix
"
$JAVACMD
"
)
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW
=
`
find
-L
/
-maxdepth
1
-mindepth
1
-type
d 2>/dev/null
`
SEP
=
""
for
dir
in
$ROOTDIRSRAW
;
do
ROOTDIRS
=
"
$ROOTDIRS$SEP$dir
"
SEP
=
"|"
done
OURCYGPATTERN
=
"(^(
$ROOTDIRS
))"
# Add a user-defined pattern to the cygpath arguments
if
[
"
$GRADLE_CYGPATTERN
"
!=
""
]
;
then
OURCYGPATTERN
=
"
$OURCYGPATTERN
|(
$GRADLE_CYGPATTERN
)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i
=
0
for
arg
do
for
arg
in
"
$@
"
;
do
if
CHECK
=
`
echo
"
$arg
"
|egrep
-c
"
$OURCYGPATTERN
"
-
`
case
$arg
in
#(
CHECK2
=
`
echo
"
$arg
"
|egrep
-c
"^-"
`
### Determine if an option
-
*
)
false
;;
# don't mess with options #(
/?
*
)
t
=
${
arg
#/
}
t
=
/
${
t
%%/*
}
# looks like a POSIX filepath
if
[
$CHECK
-ne
0
]
&&
[
$CHECK2
-eq
0
]
;
then
### Added a condition
[
-e
"
$t
"
]
;;
#(
eval
`
echo
args
$i
`
=
`
cygpath
--path
--ignore
--mixed
"
$arg
"
`
*
)
false
;;
else
esac
eval
`
echo
args
$i
`
=
"
\"
$arg
\"
"
then
arg
=
$(
cygpath
--path
--ignore
--mixed
"
$arg
"
)
fi
fi
i
=
`
expr
$i
+ 1
`
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift
# remove old arg
set
--
"
$@
"
"
$arg
"
# push replacement arg
done
done
case
$i
in
0
)
set
--
;;
1
)
set
--
"
$args0
"
;;
2
)
set
--
"
$args0
"
"
$args1
"
;;
3
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
;;
4
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
"
$args3
"
;;
5
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
"
$args3
"
"
$args4
"
;;
6
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
"
$args3
"
"
$args4
"
"
$args5
"
;;
7
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
"
$args3
"
"
$args4
"
"
$args5
"
"
$args6
"
;;
8
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
"
$args3
"
"
$args4
"
"
$args5
"
"
$args6
"
"
$args7
"
;;
9
)
set
--
"
$args0
"
"
$args1
"
"
$args2
"
"
$args3
"
"
$args4
"
"
$args5
"
"
$args6
"
"
$args7
"
"
$args8
"
;;
esac
fi
fi
# Escape application args
# Collect all arguments for the java command;
save
()
{
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
for
i
do
printf
%s
\\
n
"
$i
"
| sed
"s/'/'
\\\\
''/g;1s/^/'/;
\$
s/
\$
/'
\\\\
/"
;
done
# shell script including quotes and variable substitutions, so put them in
echo
" "
# double quotes to make sure that they get re-expanded; and
}
# * put everything else in single quotes, so that it's not re-expanded.
APP_ARGS
=
`
save
"
$@
"
`
set
--
\
"-Dorg.gradle.appname=
$APP_BASE_NAME
"
\
-classpath
"
$CLASSPATH
"
\
org.gradle.wrapper.GradleWrapperMain
\
"
$@
"
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval
"set --
$(
eval set
--
$DEFAULT_JVM_OPTS
$JAVA_OPTS
$GRADLE_OPTS
"
\"
-Dorg.gradle.appname=
$APP_BASE_NAME
\"
"
-classpath
"
\"
$CLASSPATH
\"
"
org.gradle.wrapper.GradleWrapperMain
"
$APP_ARGS
"
printf
'%s\n'
"
$DEFAULT_JVM_OPTS
$JAVA_OPTS
$GRADLE_OPTS
"
|
xargs
-n1
|
sed
' s~[^-[:alnum:]+,./:=@_]~\\&~g; '
|
tr
'\n'
' '
)
"
'"$@"'
exec
"
$JAVACMD
"
"
$@
"
exec
"
$JAVACMD
"
"
$@
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment