diff --git a/build.gradle b/build.gradle index ae34eac..b317c3c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ -import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact -import org.gradle.api.internal.file.copy.CopyAction -import org.gradle.api.internal.java.JavaLibrary +//import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact +//import org.gradle.api.internal.file.copy.CopyAction +//import org.gradle.api.internal.java.JavaLibrary import org.ultramine.gradle.task.ReobfTask import org.ultramine.gradle.task.SideSplitTask import org.ultramine.gradle.task.SpeicialClassTransformTask @@ -65,10 +65,10 @@ compileCommon 'org.scala-lang.plugins:scala-continuations-library_2.11:1.0.2' compileCommon 'org.scala-lang.plugins:scala-continuations-plugin_2.11.1:1.0.2' compileCommon 'org.scala-lang:scala-library:2.11.1' - compileCommon 'org.scala-lang:scala-parser-combinators_2.11:1.0.1' + compileCommon 'org.scala-lang:scala-parser-combinators:2.11.0-M4' compileCommon 'org.scala-lang:scala-reflect:2.11.1' - compileCommon 'org.scala-lang:scala-swing_2.11:1.0.1' - compileCommon 'org.scala-lang:scala-xml_2.11:1.0.2' + compileCommon 'org.scala-lang:scala-swing:2.11.0-M4' + compileCommon 'org.scala-lang:scala-xml:2.11.0-M4' compileCommon 'net.sf.jopt-simple:jopt-simple:4.5' compileCommon 'lzma:lzma:0.0.1' compileClient 'com.mojang:realms:1.3.5' @@ -207,41 +207,41 @@ } tasks.publish.dependsOn changelog -publishing { - publications { - if(publish_jars.contains('dev')) - mavenDevJar(MavenPublication) { - from new JavaLibrary(new ArchivePublishArtifact(tasks.jar), configurations.packageAll.getAllDependencies()) - artifacts.matching({it.classifier == "dev"}).all({it.classifier = null}) - artifact tasks.jar_source - artifact tasks.changelog.getProperty('changelogFile'), {classifier = 'changelog'} - } - if(publish_jars.contains('universal')) - mavenUnivarsalJar(MavenPublication) { - from new JavaLibrary(new ArchivePublishArtifact(tasks.jar_universal), configurations.packageAll.getAllDependencies()) - artifacts.matching({it.classifier == "universal"}).all({it.classifier = null}) - artifactId = project.name + '-universal' - } - if(publish_jars.contains('server')) - mavenServerJar(MavenPublication) { - from new JavaLibrary(new ArchivePublishArtifact(tasks.jar_server), configurations.packageServer.getAllDependencies()) - artifacts.matching({it.classifier == "server"}).all({it.classifier = null}) - artifactId = project.name + '-server' - } - if(publish_jars.contains('client')) - mavenClientJar(MavenPublication) { - from new JavaLibrary(new ArchivePublishArtifact(tasks.jar_client), configurations.packageClient.getAllDependencies()) - artifacts.matching({it.classifier == "client"}).all({it.classifier = null}) - artifactId = project.name + '-client' - } - } - repositories { - if(project.hasProperty('publish_url') && !publish_url.isEmpty()) - maven { - url publish_url - } - } -} +//publishing { +// publications { +// if(publish_jars.contains('dev')) +// mavenDevJar(MavenPublication) { +// from new JavaLibrary(new ArchivePublishArtifact(tasks.jar), configurations.packageAll.getAllDependencies()) +// artifacts.matching({it.classifier == "dev"}).all({it.classifier = null}) +// artifact tasks.jar_source +// artifact tasks.changelog.getProperty('changelogFile'), {classifier = 'changelog'} +// } +// if(publish_jars.contains('universal')) +// mavenUnivarsalJar(MavenPublication) { +// from new JavaLibrary(new ArchivePublishArtifact(tasks.jar_universal), configurations.packageAll.getAllDependencies()) +// artifacts.matching({it.classifier == "universal"}).all({it.classifier = null}) +// artifactId = project.name + '-universal' +// } +// if(publish_jars.contains('server')) +// mavenServerJar(MavenPublication) { +// from new JavaLibrary(new ArchivePublishArtifact(tasks.jar_server), configurations.packageServer.getAllDependencies()) +// artifacts.matching({it.classifier == "server"}).all({it.classifier = null}) +// artifactId = project.name + '-server' +// } +// if(publish_jars.contains('client')) +// mavenClientJar(MavenPublication) { +// from new JavaLibrary(new ArchivePublishArtifact(tasks.jar_client), configurations.packageClient.getAllDependencies()) +// artifacts.matching({it.classifier == "client"}).all({it.classifier = null}) +// artifactId = project.name + '-client' +// } +// } +// repositories { +// if(project.hasProperty('publish_url') && !publish_url.isEmpty()) +// maven { +// url publish_url +// } +// } +//} task dumpLibs(type: Copy) { into "$buildDir/libs/libraries" diff --git a/buildSrc/src/main/java/org/ultramine/gradle/task/ReobfTask.java b/buildSrc/src/main/java/org/ultramine/gradle/task/ReobfTask.java index 87ae3be..708a8f7 100644 --- a/buildSrc/src/main/java/org/ultramine/gradle/task/ReobfTask.java +++ b/buildSrc/src/main/java/org/ultramine/gradle/task/ReobfTask.java @@ -12,7 +12,6 @@ import org.gradle.api.tasks.InputDirectory; import org.gradle.api.tasks.InputFile; import org.gradle.api.tasks.OutputDirectory; -import org.gradle.api.tasks.ParallelizableTask; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.incremental.IncrementalTaskInputs; import org.gradle.api.tasks.incremental.InputFileDetails; @@ -29,7 +28,6 @@ import java.util.HashSet; import java.util.Set; -@ParallelizableTask public class ReobfTask extends DefaultTask { @InputDirectory diff --git a/buildSrc/src/main/java/org/ultramine/gradle/task/SideSplitTask.java b/buildSrc/src/main/java/org/ultramine/gradle/task/SideSplitTask.java index 135dfb3..b962c87 100644 --- a/buildSrc/src/main/java/org/ultramine/gradle/task/SideSplitTask.java +++ b/buildSrc/src/main/java/org/ultramine/gradle/task/SideSplitTask.java @@ -7,7 +7,6 @@ import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputDirectory; import org.gradle.api.tasks.OutputDirectory; -import org.gradle.api.tasks.ParallelizableTask; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.incremental.IncrementalTaskInputs; import org.gradle.api.tasks.incremental.InputFileDetails; @@ -26,7 +25,6 @@ import java.util.List; import java.util.Set; -@ParallelizableTask public class SideSplitTask extends DefaultTask { private static final String SIDEONLY_DESK = "Lcpw/mods/fml/relauncher/SideOnly;"; diff --git a/buildSrc/src/main/java/org/ultramine/gradle/task/SpeicialClassTransformTask.java b/buildSrc/src/main/java/org/ultramine/gradle/task/SpeicialClassTransformTask.java index 4ce68df..2ecddf4 100644 --- a/buildSrc/src/main/java/org/ultramine/gradle/task/SpeicialClassTransformTask.java +++ b/buildSrc/src/main/java/org/ultramine/gradle/task/SpeicialClassTransformTask.java @@ -6,7 +6,6 @@ import org.gradle.api.tasks.Input; import org.gradle.api.tasks.InputDirectory; import org.gradle.api.tasks.OutputDirectory; -import org.gradle.api.tasks.ParallelizableTask; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.incremental.IncrementalTaskInputs; import org.gradle.api.tasks.incremental.InputFileDetails; @@ -31,7 +30,6 @@ import java.util.Map; import java.util.Set; -@ParallelizableTask public class SpeicialClassTransformTask extends DefaultTask { @InputDirectory diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 51288f9..cc4fdc2 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 c181797..0da5ebb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip diff --git a/gradlew b/gradlew index 4453cce..2fe81a7 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,16 +44,16 @@ APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -109,8 +125,8 @@ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` JAVACMD=`cygpath --unix "$JAVACMD"` @@ -138,35 +154,30 @@ else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` 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" ;; + 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 # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # 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" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..9618d8d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -14,7 +30,7 @@ set APP_HOME=%DIRNAME% @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= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome