forked from RepoMirrors/kami-blue
Updated bunch of stuff and deps in gradle (#519)
* Bumped Gradle to 4.10.3 * Bumped Forge & MCP & Removed useless comment * Bumped MixinGradle plugin, Mixins, Alpine, Yaml, Reflections, gradle.plugins
This commit is contained in:
parent
ed91783d0e
commit
30cfefb43d
12
build.gradle
12
build.gradle
|
@ -41,8 +41,8 @@ buildscript {
|
|||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
|
||||
classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
|
||||
classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -89,16 +89,16 @@ repositories {
|
|||
|
||||
dependencies {
|
||||
//mixin needs to be distributed with the mod, very important
|
||||
compile("org.spongepowered:mixin:0.7.4-SNAPSHOT") {
|
||||
compile("org.spongepowered:mixin:0.8.1-SNAPSHOT") {
|
||||
exclude module: 'launchwrapper'
|
||||
exclude module: 'guava'
|
||||
exclude module: 'gson'
|
||||
exclude module: 'commons-io'
|
||||
}
|
||||
compile "com.github.ZeroMemes:Alpine:1.5"
|
||||
compile "com.github.ZeroMemes:Alpine:1.7"
|
||||
compile group: 'net.jodah', name: 'typetools', version: '0.5.0'
|
||||
compile group: 'org.yaml', name: 'snakeyaml', version: '1.19'
|
||||
compile(group: 'org.reflections', name: 'reflections', version: '0.9.11') {
|
||||
compile group: 'org.yaml', name: 'snakeyaml', version: '1.25'
|
||||
compile(group: 'org.reflections', name: 'reflections', version: '0.9.12') {
|
||||
exclude group: 'com.google.guava', module: 'guava'
|
||||
}
|
||||
compile 'club.minnced:java-discord-rpc:v2.0.1'
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
|
||||
# This is required to provide enough memory for the Minecraft decompilation process.
|
||||
org.gradle.jvmargs=-Xmx3G
|
||||
modGroup=me.zeroeightsix
|
||||
modVersion=v1.1.2-03-03-01
|
||||
modBaseName=kamiblue
|
||||
forgeVersion=1.12.2-14.23.5.2768
|
||||
#mcpVersion=snapshot_20170605
|
||||
mcpVersion=snapshot_20180814
|
||||
forgeVersion=1.12.2-14.23.5.2847
|
||||
mcpVersion=stable_39
|
Binary file not shown.
|
@ -1,6 +1,5 @@
|
|||
#Sun Dec 15 10:34:12 EST 2019
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-all.zip
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env bash
|
||||
#!/usr/bin/env sh
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
|
@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
|
|||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
|
||||
warn ( ) {
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
|
||||
die ( ) {
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
|
@ -154,11 +154,19 @@ if $cygwin ; then
|
|||
esac
|
||||
fi
|
||||
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
# Escape application args
|
||||
save () {
|
||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||
echo " "
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
APP_ARGS=$(save "$@")
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||
|
||||
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
|
||||
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
|
||||
cd "$(dirname "$0")"
|
||||
fi
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
|
|
@ -49,7 +49,6 @@ goto fail
|
|||
@rem Get command-line arguments, handling Windows variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
|
@ -60,11 +59,6 @@ set _SKIP=2
|
|||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
goto execute
|
||||
|
||||
:4NT_args
|
||||
@rem Get arguments from the 4NT Shell from JP Software
|
||||
set CMD_LINE_ARGS=%$
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
|
Loading…
Reference in New Issue