Skip to content

Commit ccd36b6

Browse files
committed
Move to Gradle
1 parent 6107220 commit ccd36b6

File tree

8 files changed

+429
-178
lines changed

8 files changed

+429
-178
lines changed

.github/workflows/main.yml

+6-9
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,18 @@ jobs:
1717
- name: Setup Python
1818
uses: actions/setup-python@v4
1919

20+
- name: Check for snapshot
21+
run: pip install -r requirements.txt && python download_server.py
22+
2023
- name: Setup Java JDK
2124
uses: actions/setup-java@v3
2225
with:
2326
distribution: 'temurin'
2427
java-version: 17
2528
check-latest: true
2629

27-
- name: Setup Maven
28-
29-
with:
30-
java-distribution: 'temurin'
31-
java-version: 17
32-
33-
- name: Check for snapshot
34-
run: pip install -r requirements.txt && python download_server.py
30+
- name: Validate Gradle Wrapper
31+
uses: gradle/wrapper-validation-action@v1
3532

3633
# Wooyeah
3734
- name: Read last snapshot
@@ -51,7 +48,7 @@ jobs:
5148
path: ./next_release.txt
5249

5350
- name: Compile MappingsGenerator jar
54-
run: mvn package && mvn package && mv target/MappingsGenerator-*.jar ./MappingsGenerator.jar
51+
run: ./gradlew build && mv target/MappingsGenerator-*.jar ./MappingsGenerator.jar
5552
- name: Run MappingsGenerator
5653
run: java -jar MappingsGenerator.jar server.jar ${{ steps.next_release.outputs.content }}
5754
- name: Pack mappings

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Generates and compiles mapping files for Via*. Current mapping files can be foun
44

55
## Generating json mapping files for a Minecraft version
66

7-
Compile the project using `mvn clean build` and put the jar in some directory, ideally the project root.
7+
Compile the project using `./gradlew build` and put the jar in some directory, ideally the project root.
88

99
Then run the jar with:
1010

build.gradle.kts

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
plugins {
2+
`java-library`
3+
id("com.github.johnrengelman.shadow") version "8.1.1"
4+
}
5+
6+
repositories {
7+
mavenCentral()
8+
maven("https://repo.viaversion.com")
9+
}
10+
11+
dependencies {
12+
api("com.google.code.gson:gson:2.10.1")
13+
api("com.viaversion:opennbt:2.1.2")
14+
api("it.unimi.dsi:fastutil:8.5.12")
15+
api("ch.qos.logback:logback-classic:1.4.6")
16+
compileOnly("org.jetbrains:annotations:24.0.1")
17+
// Uncomment to manually run mappings gen in ide
18+
// compileOnly(files("server.jar"))
19+
}
20+
21+
group = "com.viaversion"
22+
version = "3.3.0"
23+
description = "MappingsGenerator"
24+
java.sourceCompatibility = JavaVersion.VERSION_17
25+
26+
tasks {
27+
withType<JavaCompile> {
28+
options.encoding = "UTF-8"
29+
}
30+
withType<Javadoc> {
31+
options.encoding = "UTF-8"
32+
}
33+
34+
jar {
35+
manifest {
36+
attributes["Main-Class"] = "com.viaversion.mappingsgenerator.MappingsGenerator"
37+
}
38+
}
39+
40+
41+
shadowJar {
42+
archiveClassifier.set("")
43+
archiveFileName.set("MappingsGenerator-${project.version}.jar")
44+
45+
relocate("com.google.gson", "com.viaversion.viaversion.libs.gson")
46+
relocate("com.github.steveice10.opennbt", "com.viaversion.viaversion.libs.opennbt")
47+
relocate("it.unimi.dsi.fastutil", "com.viaversion.viaversion.libs.fastutil")
48+
49+
// FastUtil - we only want object and int maps
50+
// Object types
51+
exclude("it/unimi/dsi/fastutil/*/*Reference*")
52+
exclude("it/unimi/dsi/fastutil/*/*Boolean*")
53+
exclude("it/unimi/dsi/fastutil/*/*Byte*")
54+
exclude("it/unimi/dsi/fastutil/*/*Short*")
55+
exclude("it/unimi/dsi/fastutil/*/*Float*")
56+
exclude("it/unimi/dsi/fastutil/*/*Double*")
57+
exclude("it/unimi/dsi/fastutil/*/*Long*")
58+
exclude("it/unimi/dsi/fastutil/*/*Char*")
59+
// Map types
60+
exclude("it/unimi/dsi/fastutil/*/*Custom*")
61+
exclude("it/unimi/dsi/fastutil/*/*Tree*")
62+
exclude("it/unimi/dsi/fastutil/*/*Heap*")
63+
exclude("it/unimi/dsi/fastutil/*/*Queue*")
64+
// Crossing fingers
65+
exclude("it/unimi/dsi/fastutil/*/*Big*")
66+
exclude("it/unimi/dsi/fastutil/*/*Synchronized*")
67+
exclude("it/unimi/dsi/fastutil/*/*Unmodifiable*")
68+
exclude("it/unimi/dsi/fastutil/io/*")
69+
}
70+
build {
71+
dependsOn(shadowJar)
72+
}
73+
}
+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

gradlew

+249
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,249 @@
1+
#!/bin/sh
2+
3+
#
4+
# Copyright © 2015-2021 the original authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
#
21+
# Gradle start up script for POSIX generated by Gradle.
22+
#
23+
# Important for running:
24+
#
25+
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
26+
# noncompliant, but you have some other compliant shell such as ksh or
27+
# bash, then to run this script, type that shell name before the whole
28+
# command line, like:
29+
#
30+
# ksh Gradle
31+
#
32+
# Busybox and similar reduced shells will NOT work, because this script
33+
# requires all of these POSIX shell features:
34+
# * functions;
35+
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
36+
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
37+
# * compound commands having a testable exit status, especially «case»;
38+
# * various built-in commands including «command», «set», and «ulimit».
39+
#
40+
# Important for patching:
41+
#
42+
# (2) This script targets any POSIX shell, so it avoids extensions provided
43+
# by Bash, Ksh, etc; in particular arrays are avoided.
44+
#
45+
# The "traditional" practice of packing multiple parameters into a
46+
# space-separated string is a well documented source of bugs and security
47+
# problems, so this is (mostly) avoided, by progressively accumulating
48+
# options in "$@", and eventually passing that to Java.
49+
#
50+
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
51+
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
52+
# see the in-line comments for details.
53+
#
54+
# There are tweaks for specific operating systems such as AIX, CygWin,
55+
# Darwin, MinGW, and NonStop.
56+
#
57+
# (3) This script is generated from the Groovy template
58+
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
59+
# within the Gradle project.
60+
#
61+
# You can find Gradle at https://github.com/gradle/gradle/.
62+
#
63+
##############################################################################
64+
65+
# Attempt to set APP_HOME
66+
67+
# Resolve links: $0 may be a link
68+
app_path=$0
69+
70+
# Need this for daisy-chained symlinks.
71+
while
72+
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
73+
[ -h "$app_path" ]
74+
do
75+
ls=$( ls -ld "$app_path" )
76+
link=${ls#*' -> '}
77+
case $link in #(
78+
/*) app_path=$link ;; #(
79+
*) app_path=$APP_HOME$link ;;
80+
esac
81+
done
82+
83+
# This is normally unused
84+
# shellcheck disable=SC2034
85+
APP_BASE_NAME=${0##*/}
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
88+
89+
# Use the maximum available, or set MAX_FD != -1 to use that value.
90+
MAX_FD=maximum
91+
92+
warn () {
93+
echo "$*"
94+
} >&2
95+
96+
die () {
97+
echo
98+
echo "$*"
99+
echo
100+
exit 1
101+
} >&2
102+
103+
# OS specific support (must be 'true' or 'false').
104+
cygwin=false
105+
msys=false
106+
darwin=false
107+
nonstop=false
108+
case "$( uname )" in #(
109+
CYGWIN* ) cygwin=true ;; #(
110+
Darwin* ) darwin=true ;; #(
111+
MSYS* | MINGW* ) msys=true ;; #(
112+
NONSTOP* ) nonstop=true ;;
113+
esac
114+
115+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
116+
117+
118+
# Determine the Java command to use to start the JVM.
119+
if [ -n "$JAVA_HOME" ] ; then
120+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
121+
# IBM's JDK on AIX uses strange locations for the executables
122+
JAVACMD=$JAVA_HOME/jre/sh/java
123+
else
124+
JAVACMD=$JAVA_HOME/bin/java
125+
fi
126+
if [ ! -x "$JAVACMD" ] ; then
127+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
128+
129+
Please set the JAVA_HOME variable in your environment to match the
130+
location of your Java installation."
131+
fi
132+
else
133+
JAVACMD=java
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
138+
Please set the JAVA_HOME variable in your environment to match the
139+
location of your Java installation."
140+
fi
141+
fi
142+
143+
# Increase the maximum file descriptors if we can.
144+
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145+
case $MAX_FD in #(
146+
max*)
147+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148+
# shellcheck disable=SC3045
149+
MAX_FD=$( ulimit -H -n ) ||
150+
warn "Could not query maximum file descriptor limit"
151+
esac
152+
case $MAX_FD in #(
153+
'' | soft) :;; #(
154+
*)
155+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156+
# shellcheck disable=SC3045
157+
ulimit -n "$MAX_FD" ||
158+
warn "Could not set maximum file descriptor limit to $MAX_FD"
159+
esac
160+
fi
161+
162+
# Collect all arguments for the java command, stacking in reverse order:
163+
# * args from the command line
164+
# * the main class name
165+
# * -classpath
166+
# * -D...appname settings
167+
# * --module-path (only if needed)
168+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
169+
170+
# For Cygwin or MSYS, switch paths to Windows format before running java
171+
if "$cygwin" || "$msys" ; then
172+
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
173+
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
174+
175+
JAVACMD=$( cygpath --unix "$JAVACMD" )
176+
177+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
178+
for arg do
179+
if
180+
case $arg in #(
181+
-*) false ;; # don't mess with options #(
182+
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
183+
[ -e "$t" ] ;; #(
184+
*) false ;;
185+
esac
186+
then
187+
arg=$( cygpath --path --ignore --mixed "$arg" )
188+
fi
189+
# Roll the args list around exactly as many times as the number of
190+
# args, so each arg winds up back in the position where it started, but
191+
# possibly modified.
192+
#
193+
# NB: a `for` loop captures its iteration list before it begins, so
194+
# changing the positional parameters here affects neither the number of
195+
# iterations, nor the values presented in `arg`.
196+
shift # remove old arg
197+
set -- "$@" "$arg" # push replacement arg
198+
done
199+
fi
200+
201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
205+
# Collect all arguments for the java command;
206+
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207+
# shell script including quotes and variable substitutions, so put them in
208+
# double quotes to make sure that they get re-expanded; and
209+
# * put everything else in single quotes, so that it's not re-expanded.
210+
211+
set -- \
212+
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213+
-classpath "$CLASSPATH" \
214+
org.gradle.wrapper.GradleWrapperMain \
215+
"$@"
216+
217+
# Stop when "xargs" is not available.
218+
if ! command -v xargs >/dev/null 2>&1
219+
then
220+
die "xargs is not available"
221+
fi
222+
223+
# Use "xargs" to parse quoted args.
224+
#
225+
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
226+
#
227+
# In Bash we could simply go:
228+
#
229+
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
230+
# set -- "${ARGS[@]}" "$@"
231+
#
232+
# but POSIX shell has neither arrays nor command substitution, so instead we
233+
# post-process each arg (as a line of input to sed) to backslash-escape any
234+
# character that might be a shell metacharacter, then use eval to reverse
235+
# that process (while maintaining the separation between arguments), and wrap
236+
# the whole thing up as a single "set" statement.
237+
#
238+
# This will of course break if any of these variables contains a newline or
239+
# an unmatched quote.
240+
#
241+
242+
eval "set -- $(
243+
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
244+
xargs -n1 |
245+
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
246+
tr '\n' ' '
247+
)" '"$@"'
248+
249+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)