From c322cbd3de7d0d9ca08f16a9ce384ef4e7933c7e Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Thu, 22 Sep 2016 20:33:47 +0100
Subject: [PATCH] Use weave Update to gradle 3.1 Add new maven handling

---
 .gitignore                                    |   3 +-
 Jenkinsfile                                   |  15 ++++
 build.gradle                                  |  83 +++---------------
 gradle/wrapper/gradle-wrapper.jar             | Bin 53324 -> 52818 bytes
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 gradlew                                       |   5 ++
 gradlew.bat                                   |   6 --
 .../net/fabricmc/loom/task/DownloadTask.java  |   2 +-
 .../loom/task/GenVSCodeProjectTask.java       |   2 +-
 .../net/fabricmc/loom/task/MergeJarsTask.java |   2 +-
 10 files changed, 40 insertions(+), 82 deletions(-)
 create mode 100644 Jenkinsfile

diff --git a/.gitignore b/.gitignore
index 57e68c0..9023533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@
 !/HEADER
 !/LICENSE
 !/README.md
-!/settings.gradle
\ No newline at end of file
+!/settings.gradle
+!/Jenkinsfile
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..963bbb2
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,15 @@
+node {
+   stage 'Checkout'
+
+   checkout scm
+
+   stage 'Build'
+
+   sh "rm -rf build/libs/"
+   sh "chmod +x gradlew"
+   sh "./gradlew build"
+
+   stage "Archive artifacts"
+
+   sh "./gradlew upload"
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 7a021b6..fc362ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,16 +5,17 @@ plugins {
 
     id 'idea'
     id 'eclipse'
-
-    id 'net.minecrell.licenser' version '0.2.1'
 }
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/maven.gradle'
+apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/license.gradle'
+
 group = 'net.fabricmc'
 archivesBaseName = project.name.toLowerCase()
-version = '0.0.2-SNAPSHOT'
+version = '0.0.3-SNAPSHOT'
 
 repositories {
     mavenCentral()
@@ -40,22 +41,15 @@ configurations {
 
 dependencies {
     compile gradleApi()
-    shade 'org.zeroturnaround:zt-zip:1.9'
-    shade 'org.slf4j:slf4j-api:1.7.21'
-    shade 'org.slf4j:slf4j-simple:1.7.21'
-    shade 'com.google.code.gson:gson:2.6.2'
-    shade 'commons-io:commons-io:1.4'
-    shade 'com.google.guava:guava:19.0'
-    shade 'net.fabricmc:blending-jar:0.1.1.6'
-    shade 'net.fabricmc:enigma:+'
-    shade 'org.javassist:javassist:3.+'
-    shade 'org.bitbucket.mstrobel:procyon-compilertools:0.5.33.6-enigma'
-    shade 'de.sciss:syntaxpane:1.1.+'
-}
 
-license {
-    header file('HEADER')
-    include '**/*.java'
+	shade 'org.zeroturnaround:zt-zip:1.9'
+	shade 'org.slf4j:slf4j-api:1.7.21'
+	shade 'org.slf4j:slf4j-simple:1.7.21'
+	shade 'com.google.code.gson:gson:2.6.2'
+	shade 'commons-io:commons-io:1.4'
+	shade 'com.google.guava:guava:19.0'
+	shade 'net.fabricmc:weave:0.1.0.6'
+	shade 'cuchaz:enigma:0.11.0.5:lib'
 }
 
 sourceSets {
@@ -73,58 +67,7 @@ jar {
     }
 }
 
-uploadArchives {
-    repositories {
-        mavenDeployer {
-            if (project.hasProperty('mavenPass')) {
-                repository(url: 'http://mavenupload.modmuss50.me/') {
-                    authentication(userName: 'buildslave', password: project.getProperty('mavenPass'))
-                }
-            } else {
-                repository(url: 'file:///var/www/maven/')
-            }
-
-            pom {
-                artifactId = project.archivesBaseName
-
-                project {
-                    name = project.name
-                    description = project.description
-                    packaging = 'jar'
-                    url = project.url
-
-                    scm {
-                        url = 'https://github.com/FabricMC/fabric-loom'
-                        connection = 'scm:git:git@github.com:FabricMC/fabric-loom.git'
-                        developerConnection = 'scm:git:git@github.com:FabricMC/fabric-loom.git'
-                    }
-
-                    issueManagement {
-                        system = 'GitHub'
-                        url = 'https://github.com/FabricMC/fabric-loom/issues'
-                    }
-
-                    licenses {
-                        license {
-                            name = 'MIT License'
-                            url = 'https://github.com/FabricMC/fabric-loom/blob/master/LICENSE'
-                            distribution = 'repo'
-                        }
-                    }
-
-                    developers {
-                        developer {
-                            id = 'modmuss50'
-                            name = 'modmuss50'
-                            roles { role 'developer' }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.0'
+    gradleVersion = '3.1'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3baa851b28c65f87dd36a6748e1a85cf360c1301..deedc7fa5e6310eac3148a7dd0b1f069b07364cb 100644
GIT binary patch
delta 8629
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

delta 9298
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%0DE$mOA+LfNLg7!s~8dJ`SeTY;H5T!j;AOX
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
az|hu#zsdYP2m(&FK*@%<kmy_gApZy7xt-+z

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7e88482..63d119f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Sep 10 13:02:22 BST 2016
+#Thu Sep 22 09:58:14 BST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
diff --git a/gradlew b/gradlew
index 27309d9..9aa616c 100755
--- a/gradlew
+++ b/gradlew
@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# 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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 832fdb6..f955316 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -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
diff --git a/src/main/java/net/fabricmc/loom/task/DownloadTask.java b/src/main/java/net/fabricmc/loom/task/DownloadTask.java
index 79631c8..c2043a4 100644
--- a/src/main/java/net/fabricmc/loom/task/DownloadTask.java
+++ b/src/main/java/net/fabricmc/loom/task/DownloadTask.java
@@ -147,7 +147,7 @@ public class DownloadTask extends DefaultTask {
 		if (!Constants.MINECRAFT_JSON.get(extension).exists()) {
 			logger.lifecycle(":downloading minecraft json");
 			FileUtils.copyURLToFile(new URL("https://launchermeta.mojang.com/mc/game/version_manifest.json"), Constants.VERSION_MANIFEST.get(extension));
-			ManifestVersion mcManifest = new GsonBuilder().create().fromJson(FileUtils.readFileToString(Constants.VERSION_MANIFEST.get(extension), Charset.defaultCharset()), ManifestVersion.class);
+			ManifestVersion mcManifest = new GsonBuilder().create().fromJson(FileUtils.readFileToString(Constants.VERSION_MANIFEST.get(extension), "UTF-8"), ManifestVersion.class);
 
 			Optional<ManifestVersion.Versions> optionalVersion = mcManifest.versions.stream().filter(versions -> versions.id.equalsIgnoreCase(extension.version)).findFirst();
 			if (optionalVersion.isPresent()) {
diff --git a/src/main/java/net/fabricmc/loom/task/GenVSCodeProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenVSCodeProjectTask.java
index e05199b..37df9e2 100644
--- a/src/main/java/net/fabricmc/loom/task/GenVSCodeProjectTask.java
+++ b/src/main/java/net/fabricmc/loom/task/GenVSCodeProjectTask.java
@@ -77,7 +77,7 @@ public class GenVSCodeProjectTask extends DefaultTask {
 		element = new JsonPrimitive("vscode");
 		jsonObject.add("outputDirectory", element);
 
-		FileUtils.write(configFile, gson.toJson(jsonObject), Charset.defaultCharset());
+		FileUtils.writeStringToFile(configFile, gson.toJson(jsonObject), "UF-8");
 	}
 
 }
diff --git a/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java b/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
index a71d3b0..6d6b5b5 100644
--- a/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
+++ b/src/main/java/net/fabricmc/loom/task/MergeJarsTask.java
@@ -24,9 +24,9 @@
 
 package net.fabricmc.loom.task;
 
-import net.fabricmc.blendingjar.JarMerger;
 import net.fabricmc.loom.LoomGradleExtension;
 import net.fabricmc.loom.util.Constants;
+import net.fabricmc.weave.merge.JarMerger;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.tasks.TaskAction;