From 8b8625310337e68c435a9e9cae57dcadd975ef94 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 29 Aug 2017 12:56:36 +0200 Subject: [PATCH] Replace manually built shadow and gitpatcher plugins with upstream --- gradle/reprod/checksums.txt | 2 + ...lace-plugin-DSL-with-old-buildscript.patch | 35 ++++++ ...ace-plugins-with-manually-built-ones.patch | 28 ----- ...-non-essential-parts-of-build.gradle.patch | 79 ------------ ...-Replace-groovy-dep-with-localGroovy.patch | 25 ---- ...replace-all-buildscript-dependencies.patch | 11 +- ...-non-essential-parts-of-build.gradle.patch | 113 ------------------ .../shadow/0004-Manually-shade-deps.patch | 52 -------- gradle/reprod/setup.sh | 4 - 9 files changed, 40 insertions(+), 309 deletions(-) create mode 100644 gradle/reprod/patches/forgeflower/0001-Replace-plugin-DSL-with-old-buildscript.patch delete mode 100644 gradle/reprod/patches/forgeflower/0002-Replace-plugins-with-manually-built-ones.patch delete mode 100644 gradle/reprod/patches/gitpatcher/0002-Remove-non-essential-parts-of-build.gradle.patch delete mode 100644 gradle/reprod/patches/gitpatcher/0003-Replace-groovy-dep-with-localGroovy.patch delete mode 100644 gradle/reprod/patches/shadow/0002-Remove-non-essential-parts-of-build.gradle.patch delete mode 100644 gradle/reprod/patches/shadow/0004-Manually-shade-deps.patch diff --git a/gradle/reprod/checksums.txt b/gradle/reprod/checksums.txt index 4eaf3c01..d850483f 100644 --- a/gradle/reprod/checksums.txt +++ b/gradle/reprod/checksums.txt @@ -154,6 +154,8 @@ dc67378cf428c06408e7959e83bdc1518dd22ccd313e7c28a986612d65c276c7 /log4j/log4j/1. cb54dedc5d8c4510148dfa792701cbac1a84c383a84f48f5a32e6d7e460bbb72 /log4j/log4j/1.2.12/log4j-1.2.12.pom 0c3085cb93c3ef95d731c274b6f2dd195aa0405fe9328d69cab7f5e899d5e124 /lzma/lzma/0.0.1/lzma-0.0.1.jar a096bc9f7579cec07483874151578720eeb3189c546c19cff56a6203df17b50e /lzma/lzma/0.0.1/lzma-0.0.1.pom +142667dfce3afeb5cc6e18e893d895604060ecef9dfc0d261f0eb9b9e8c81cb0 /m2/gradle/plugin/net/minecrell/gitpatcher/0.9.0/gitpatcher-0.9.0.jar +37a6757b16b927873baefe8498fa92c5385eba0ded3852982965491da2dd8e3a /m2/gradle/plugin/net/minecrell/gitpatcher/0.9.0/gitpatcher-0.9.0.pom 19331fb29bf8b8d5ed764677c94cca9d66481e10104f660eb555894a4300cf22 /mc/game/1.12.1/client/83385d346cf7f97d1e447b888750fb88e9928b93/client.jar 848912640bccfa7ea34a2cc1c76cb2b35f8467c4216d9603917c991660f91a8b /mc/game/1.12.1/server/561c7b2d54bae80cc06b05d950633a9ac95da816/server.jar 5dcff0a65ed3b43d82328340505118e53dab5273c352e2d56733a0e498ed5655 /mc/game/2ce9731e5bafdf69014e4e6db1cc56149958c5a8/1.12.1.json diff --git a/gradle/reprod/patches/forgeflower/0001-Replace-plugin-DSL-with-old-buildscript.patch b/gradle/reprod/patches/forgeflower/0001-Replace-plugin-DSL-with-old-buildscript.patch new file mode 100644 index 00000000..f980569a --- /dev/null +++ b/gradle/reprod/patches/forgeflower/0001-Replace-plugin-DSL-with-old-buildscript.patch @@ -0,0 +1,35 @@ +From 798d79d8c6b5c4accda35bd4517621b19bf954a2 Mon Sep 17 00:00:00 2001 +From: Jonas Herzig +Date: Tue, 29 Aug 2017 13:47:11 +0200 +Subject: [PATCH] Replace plugin DSL with old buildscript + +--- + build.gradle | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/build.gradle b/build.gradle +index da78c2f..4384886 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -1,7 +1,16 @@ +-plugins { +- id 'net.minecrell.gitpatcher' version '0.9.0' ++buildscript { ++ repositories { ++ maven { ++ url "https://plugins.gradle.org/m2/" ++ } ++ } ++ dependencies { ++ classpath "gradle.plugin.net.minecrell:gitpatcher:0.9.0" ++ } + } + ++apply plugin: "net.minecrell.gitpatcher" ++ + patches { + submodule = 'FernFlower' + target = file('ForgeFlower') +-- +2.5.5 + diff --git a/gradle/reprod/patches/forgeflower/0002-Replace-plugins-with-manually-built-ones.patch b/gradle/reprod/patches/forgeflower/0002-Replace-plugins-with-manually-built-ones.patch deleted file mode 100644 index 0672baf4..00000000 --- a/gradle/reprod/patches/forgeflower/0002-Replace-plugins-with-manually-built-ones.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3c7c6fa56f1b70129c0eb4c178aff3805bc8f03a Mon Sep 17 00:00:00 2001 -From: Jonas Herzig -Date: Sat, 26 Aug 2017 17:12:58 +0200 -Subject: [PATCH] Replace plugins with manually built ones - ---- - build.gradle | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/build.gradle b/build.gradle -index da78c2f..6dd1fb4 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -1,6 +1,9 @@ --plugins { -- id 'net.minecrell.gitpatcher' version '0.9.0' -+buildscript { -+ dependencies { -+ classpath files('../gitpatcher.jar') -+ } - } -+apply plugin: 'net.minecrell.gitpatcher' - - patches { - submodule = 'FernFlower' --- -2.5.5 - diff --git a/gradle/reprod/patches/gitpatcher/0002-Remove-non-essential-parts-of-build.gradle.patch b/gradle/reprod/patches/gitpatcher/0002-Remove-non-essential-parts-of-build.gradle.patch deleted file mode 100644 index 42417bb2..00000000 --- a/gradle/reprod/patches/gitpatcher/0002-Remove-non-essential-parts-of-build.gradle.patch +++ /dev/null @@ -1,79 +0,0 @@ -From ff9f001be5beca28f04ec0669a300b9c6d06836c Mon Sep 17 00:00:00 2001 -From: Jonas Herzig -Date: Sat, 26 Aug 2017 17:01:51 +0200 -Subject: [PATCH 2/3] Remove non-essential parts of build.gradle - ---- - build.gradle | 52 ---------------------------------------------------- - 1 file changed, 52 deletions(-) - -diff --git a/build.gradle b/build.gradle -index bc6d5bb..07d5ce5 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -1,14 +1,6 @@ - plugins { - id 'java-gradle-plugin' - id 'groovy' -- -- id 'eclipse' -- id 'idea' -- -- id 'maven-publish' -- id 'com.gradle.plugin-publish' version '0.9.5' -- -- id 'net.minecrell.licenser' version '0.3' - } - - group = 'net.minecrell' -@@ -37,47 +29,3 @@ tasks.withType(GroovyCompile) { - groovyOptions.optimizationOptions.indy = true - } - --license { -- header = file('LICENSE') -- include '**/*.java' -- include '**/*.groovy' --} -- --task sourceJar(type: Jar) { -- classifier = 'sources' -- from sourceSets.main.allSource --} -- --publishing { -- publications { -- mavenJava(MavenPublication) { -- from components.java -- -- artifact sourceJar -- -- repositories { -- maven { -- url = System.getenv('REPO_' + (version.endsWith('-SNAPSHOT') ? 'SNAPSHOTS' : 'RELEASES')) ?: "$buildDir/repo" -- } -- } -- } -- } --} -- --pluginBundle { -- website = 'https://github.com/Minecrell/gitpatcher' -- vcsUrl = website -- description = project.description -- tags = ['git'] -- -- plugins { -- gitpatcherPlugin { -- id = 'net.minecrell.gitpatcher' -- displayName = 'gitpatcher' -- } -- } --} -- --task wrapper(type: Wrapper) { -- gradleVersion = '3.3' --} --- -2.5.5 - diff --git a/gradle/reprod/patches/gitpatcher/0003-Replace-groovy-dep-with-localGroovy.patch b/gradle/reprod/patches/gitpatcher/0003-Replace-groovy-dep-with-localGroovy.patch deleted file mode 100644 index 9e196b25..00000000 --- a/gradle/reprod/patches/gitpatcher/0003-Replace-groovy-dep-with-localGroovy.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b0ca1d31124a2c27f8e29d44cf3f59b1bb1f070e Mon Sep 17 00:00:00 2001 -From: Jonas Herzig -Date: Sat, 26 Aug 2017 17:07:06 +0200 -Subject: [PATCH 3/3] Replace groovy dep with localGroovy() - ---- - build.gradle | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index 07d5ce5..1515570 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -22,7 +22,7 @@ repositories { - } - - dependencies { -- compileOnly'org.codehaus.groovy:groovy-all:2.4.7:indy' -+ compile localGroovy() - } - - tasks.withType(GroovyCompile) { --- -2.5.5 - diff --git a/gradle/reprod/patches/mixin/0002-Remove-replace-all-buildscript-dependencies.patch b/gradle/reprod/patches/mixin/0002-Remove-replace-all-buildscript-dependencies.patch index 85acfd93..03889914 100644 --- a/gradle/reprod/patches/mixin/0002-Remove-replace-all-buildscript-dependencies.patch +++ b/gradle/reprod/patches/mixin/0002-Remove-replace-all-buildscript-dependencies.patch @@ -11,16 +11,11 @@ diff --git a/build.gradle b/build.gradle index e0c46ea..165dbe4 100644 --- a/build.gradle +++ b/build.gradle -@@ -1,17 +1,12 @@ - // Gradle repositories and dependencies - buildscript { -- repositories { -- jcenter() -- } +@@ -5,13 +5,11 @@ + } dependencies { - classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0' -- classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' -+ classpath files('../shadow.jar') + classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' } } diff --git a/gradle/reprod/patches/shadow/0002-Remove-non-essential-parts-of-build.gradle.patch b/gradle/reprod/patches/shadow/0002-Remove-non-essential-parts-of-build.gradle.patch deleted file mode 100644 index 412af9ea..00000000 --- a/gradle/reprod/patches/shadow/0002-Remove-non-essential-parts-of-build.gradle.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 8105c498cb064c102197cf13d7efe4ebb1da65a7 Mon Sep 17 00:00:00 2001 -From: Jonas Herzig -Date: Tue, 8 Aug 2017 18:51:27 +0200 -Subject: [PATCH 2/4] Remove non-essential parts of build.gradle - ---- - build.gradle | 78 ------------------------------------------------------------ - 1 file changed, 78 deletions(-) - -diff --git a/build.gradle b/build.gradle -index 2292a4d..1b06411 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -1,48 +1,4 @@ --import org.gradle.wrapper.Download --import org.gradle.wrapper.GradleUserHomeLookup --import org.gradle.wrapper.Install --import org.gradle.wrapper.PathAssembler --import org.gradle.wrapper.WrapperConfiguration --import org.gradle.wrapper.WrapperExecutor --import org.gradle.wrapper.Logger -- --buildscript { -- repositories { -- jcenter() -- maven { -- url "https://plugins.gradle.org/m2/" -- } -- } -- dependencies { -- classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5' -- classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.0" -- classpath "com.gradle.publish:plugin-publish-plugin:0.9.1" -- classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3' -- classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11' -- classpath 'org.asciidoctor:asciidoctorj-groovy-dsl:1.0.0.preview2' -- classpath "com.bluepapa32:gradle-watch-plugin:0.1.5" -- classpath "org.kordamp.gradle:livereload-gradle-plugin:0.2.1" -- classpath 'org.ajoberstar:gradle-git:1.5.0' -- } --} -- --plugins { -- id 'com.gradle.build-scan' version '1.0' --} -- --buildScan { -- licenseAgreementUrl = 'https://gradle.com/terms-of-service' -- licenseAgree = 'yes' --} -- - apply plugin: 'groovy' --apply plugin: 'idea' --apply plugin: 'project-report' -- --apply from: file('gradle/docs.gradle') --apply from: file('gradle/publish.gradle') --apply from: file('gradle/asciidoc.gradle') --apply from: file('gradle/ghPages.gradle') - - repositories { - mavenLocal() -@@ -60,24 +16,6 @@ dependencies { - compile 'org.apache.ant:ant:1.9.4' - compile 'org.codehaus.plexus:plexus-utils:2.0.6' - compile 'org.codehaus.groovy:groovy-backports-compat23:2.4.4' -- -- -- testCompile gradleTestKit() -- testCompile("org.spockframework:spock-core:1.0-groovy-2.4") { -- exclude module: 'groovy-all' -- } -- testCompile 'xmlunit:xmlunit:1.3' -- testCompile 'commons-lang:commons-lang:2.6' -- testCompile 'com.google.guava:guava:17.0' --} -- --test { -- dependsOn publishToMavenLocal -- if (System.env.CI == 'true') { -- testLogging.showStandardStreams = true -- minHeapSize "1g" -- maxHeapSize "1g" -- } - } - - jar { -@@ -85,22 +23,6 @@ jar { - from rootProject.file('NOTICE') - } - --idea { -- project { -- languageLevel = '1.6' -- } --} -- - sourceCompatibility = '1.6' - targetCompatibility = '1.6' - --task installWrappers << { -- WrapperExecutor wrapperExecutor = WrapperExecutor.forWrapperPropertiesFile(file('gradle/wrapper/gradle-wrapper.properties'), System.out) -- ['1.12', '2.0', '2.5', '2.11', '2.12', '2.13', '2.14', '3.0'].each { -- WrapperConfiguration config = wrapperExecutor.config -- config.setDistribution(new URI("https://services.gradle.org/distributions/gradle-$it-bin.zip")) -- Install install = new Install(new Logger(true), new Download(new Logger(true), "gradlew", it), -- new PathAssembler(GradleUserHomeLookup.gradleUserHome())) -- install.createDist(config) -- } --} --- -2.5.5 - diff --git a/gradle/reprod/patches/shadow/0004-Manually-shade-deps.patch b/gradle/reprod/patches/shadow/0004-Manually-shade-deps.patch deleted file mode 100644 index 70cb8535..00000000 --- a/gradle/reprod/patches/shadow/0004-Manually-shade-deps.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cfca21accce1fb3fbd32b81fb79f0363dd7b61f4 Mon Sep 17 00:00:00 2001 -From: Jonas Herzig -Date: Tue, 8 Aug 2017 19:59:34 +0200 -Subject: [PATCH 4/4] Manually shade deps - ---- - build.gradle | 20 +++++++++++++------- - 1 file changed, 13 insertions(+), 7 deletions(-) - -diff --git a/build.gradle b/build.gradle -index a0d350b..b12a46d 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -12,22 +12,28 @@ repositories { - jcenter() - } - -+configurations { -+ shade -+ compile.extendsFrom shade -+} -+ - dependencies { - - compile localGroovy() - compile gradleApi() -- compile 'org.jdom:jdom2:2.0.5' -- compile 'org.ow2.asm:asm:5.0.3' -- compile 'org.ow2.asm:asm-commons:5.0.3' -- compile 'commons-io:commons-io:2.4' -- compile 'org.apache.ant:ant:1.9.4' -- compile 'org.codehaus.plexus:plexus-utils:2.0.6' -- compile 'org.codehaus.groovy:groovy-backports-compat23:2.4.4' -+ shade 'org.jdom:jdom2:2.0.5' -+ shade 'org.ow2.asm:asm:5.0.3' -+ shade 'org.ow2.asm:asm-commons:5.0.3' -+ shade 'commons-io:commons-io:2.4' -+ shade 'org.apache.ant:ant:1.9.4' -+ shade 'org.codehaus.plexus:plexus-utils:2.0.6' -+ shade 'org.codehaus.groovy:groovy-backports-compat23:2.4.4' - } - - jar { - from rootProject.file('LICENSE') - from rootProject.file('NOTICE') -+ from (files(configurations.shade).collect {it.isDirectory() ? filesTree(it) : zipTree(it)}) - } - - sourceCompatibility = '1.6' --- -2.5.5 - diff --git a/gradle/reprod/setup.sh b/gradle/reprod/setup.sh index d5e14ec9..844d78c2 100755 --- a/gradle/reprod/setup.sh +++ b/gradle/reprod/setup.sh @@ -69,12 +69,8 @@ proxy_pid=$! trap "kill $proxy_pid" EXIT # Required for mixin -setup_dep "shadow" "https://github.com/johnrengelman/shadow.git" "60d0f28103be076dc991a624bf79ca7a13835973" "build/libs/shadow.jar" "eec0417a8cd44457551c80335cd384a187647b6429ed7b5ae3ce1b26f78a2c1f" setup_dep "fernflower" "https://github.com/fesh0r/fernflower.git" "85f61bee8194ab69afa746b965973a18eda67608" "build/libs/fernflower.jar" "577c2c4e04f0026675cacb25ec525f2ccba5de2eecac525b28bed18f9ccfd790" -# Required for forgeflower -setup_dep "gitpatcher" "https://github.com/Minecrell/gitpatcher.git" "e815821d516bac0da01d579575f895b2a8abefe7" "build/libs/gitpatcher-0.9.0.jar" "95cc738b92b5f37466593880177e236519c9b2f10e3d38f97e36fd3ad3bd4448" - # Required for forgegradle setup_dep "forgeflower" "https://github.com/MinecraftForge/ForgeFlower.git" "32a04b9840fb6b10a8e2c178af86e20bdb85e366" "ForgeFlower/build/libs/forgeflower-1.0.342-SNAPSHOT.jar" "4b32e3140decbe39eaf77399f0390fbece6b3a1f3ff3424e4754adefe1c7c932" setup_dep "mcinjector" "https://github.com/ModCoderPack/MCInjector.git" "7258466461baf7dc4f313b06b0d589407e4e1fba" "build/libs/mcinjector-3.4-SNAPSHOT.jar" "98cd0c13030aa8103585621fdab5db6b74ea0db7b8b30bc74061e7b5d314aa01"