From 4ad7d612803505a6c5624e83d8a4324982ae8a28 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 27 Oct 2017 17:30:39 +0200 Subject: [PATCH] Update reprod mixin dep --- gradle/reprod/checksums.txt | 5 ++++- gradle/reprod/init.gradle | 3 +++ .../patches/mixin/0003-Fix-for-Gradle-3.patch | 8 ++++---- ...eplace-fernflower-SNAPSHOT-depencency.patch | 18 ++++++++---------- ...n-ReferenceMapper-for-reproducibility.patch | 2 +- ...ace-mixin-dep-with-manually-built-one.patch | 2 +- gradle/reprod/setup.sh | 4 ++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/gradle/reprod/checksums.txt b/gradle/reprod/checksums.txt index 784eb35a..dfe945dc 100644 --- a/gradle/reprod/checksums.txt +++ b/gradle/reprod/checksums.txt @@ -384,14 +384,17 @@ a3d6e7608155600a73c763ccac74e6b321f8c23dc4747f90635fc2f7cfc1548a /org/mortbay/je e87ea4823ecf2dd856901da359270be904236be59c27e2781eb8d78c97e45b2a /org/ow2/asm/asm-commons/5.0.3/asm-commons-5.0.3.pom 2969356ac1e40fe4141948c563690238f5d79d76aec7fd873536867a331ede81 /org/ow2/asm/asm-debug-all/5.0.3/asm-debug-all-5.0.3.jar 9c99d7a555725bc2f8379977935cdba16d687d9c93b6e0725e196180d490c995 /org/ow2/asm/asm-debug-all/5.0.3/asm-debug-all-5.0.3.pom -1e9ee309d909b3dbf33291fcfd36c76adba4ed1215b8156c3ac61a774cc86bf1 /org/ow2/asm/asm-debug-all/5.0.3/asm-debug-all-5.0.3-sources.jar 2341a72bba5e38c1028a332c11607e1706c13fa600fee6fb546b9a1708418097 /org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar 62efbf37e5068a8708541ae0a4da3d1140f4d711d30e4366445cb96ce13cc79e /org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.pom f7ac3f642c36c406543bb56ae3db3a53f263f71bd857b04709986e2d5798c8c4 /org/ow2/asm/asm-debug-all/5.1/asm-debug-all-5.1.jar 0a46e33f6b80bd21ac41eec33fca2e43d79253fb46a32d64ba3867ee22451fff /org/ow2/asm/asm-debug-all/5.1/asm-debug-all-5.1.pom +254b82bec9da4f8efbc8b1f93ab2b87f7465227a82b36cf3d05d9e77a0e8dd2e /org/ow2/asm/asm-debug-all/5.2/asm-debug-all-5.2.jar +491f13bd60757a7cfe76e767766b061d557010394f52cec2fb067707de702caa /org/ow2/asm/asm-debug-all/5.2/asm-debug-all-5.2.pom +b4845405fee9fe4f5f665dfe19badcf32581e3eea51b99a45e9f76a0a830c09d /org/ow2/asm/asm-debug-all/5.2/asm-debug-all-5.2-sources.jar c2edabf4128a534df4b8b4b0b9b562e94f242ba95ac24dc61485432b8a188e32 /org/ow2/asm/asm-parent/5.0.3/asm-parent-5.0.3.pom fdf05b9df226573b331a7e5df01135e527dcc07c71626445732bd04379aa4a72 /org/ow2/asm/asm-parent/5.0.4/asm-parent-5.0.4.pom 85ec8258fafc283f61647e6a11b404890821c11db6fcf550779ecf7a14151007 /org/ow2/asm/asm-parent/5.1/asm-parent-5.1.pom +cbfacd5dd812db16dc910994007fe58d9402a25507f81a1c2218e15c2c1bedfa /org/ow2/asm/asm-parent/5.2/asm-parent-5.2.pom 347a7a9400f9964e87c91d3980e48eebdc8d024bc3b36f7f22189c662853a51c /org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar 65819ca7c5a218ff49f8ebe72f3b39219c81f137d017acc1aec15b1054cf5236 /org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.pom 51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb /org/ow2/ow2/1.3/ow2-1.3.pom diff --git a/gradle/reprod/init.gradle b/gradle/reprod/init.gradle index 2bd3aef1..1fc57309 100644 --- a/gradle/reprod/init.gradle +++ b/gradle/reprod/init.gradle @@ -46,6 +46,9 @@ allprojects { artifactId project.file('.').name version '0' } + whenConfigured { + dependencies.removeAll { it.artifactId == 'mixin-asm-debug-all' } + } }.writeTo("pom.xml") } } diff --git a/gradle/reprod/patches/mixin/0003-Fix-for-Gradle-3.patch b/gradle/reprod/patches/mixin/0003-Fix-for-Gradle-3.patch index 0c79a7ed..2b198da3 100644 --- a/gradle/reprod/patches/mixin/0003-Fix-for-Gradle-3.patch +++ b/gradle/reprod/patches/mixin/0003-Fix-for-Gradle-3.patch @@ -15,11 +15,11 @@ index 165dbe4..0f189ec 100644 // Task to read ASM library and rename packages task renamedASM { -- outputs.file files(configurations.asm.files.findAll{!it.name.contains("sources")}.collect { file -> -+ outputs.files files(configurations.asm.files.findAll{!it.name.contains("sources")}.collect { file -> - new File(project.repositories['renamed-packages'].dirs[0], "mixin-" + file.name).path +- outputs.file files(configurations.asm.files.withIndex().collect { file, i -> def dep = configurations.asm.dependencies[i] ++ outputs.files files(configurations.asm.files.withIndex().collect { file, i -> def dep = configurations.asm.dependencies[i] + new File(new File(renamedPackageRoot, "org/spongepowered/mixin-" + dep.name + "/" + dep.version), "mixin-" + file.name).path }) - doLast { + ant { -- 2.5.5 diff --git a/gradle/reprod/patches/mixin/0005-Replace-fernflower-SNAPSHOT-depencency.patch b/gradle/reprod/patches/mixin/0005-Replace-fernflower-SNAPSHOT-depencency.patch index 5393e88a..4c92d2cd 100644 --- a/gradle/reprod/patches/mixin/0005-Replace-fernflower-SNAPSHOT-depencency.patch +++ b/gradle/reprod/patches/mixin/0005-Replace-fernflower-SNAPSHOT-depencency.patch @@ -11,17 +11,15 @@ diff --git a/build.gradle b/build.gradle index f8598a3..e9a965b 100644 --- a/build.gradle +++ b/build.gradle -@@ -143,8 +143,8 @@ dependencies { - fernflowerCompile 'commons-io:commons-io:2.4' - fernflowerCompile 'org.apache.logging.log4j:log4j-core:2.0-beta9' - fernflowerCompile 'com.google.guava:guava:17.0' -- fernflowerCompile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT' -- compile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT' -+ fernflowerCompile 'reprod:fernflower:0' -+ compile 'reprod:fernflower:0' +@@ -143,7 +143,7 @@ dependencies { - compile('net.minecraft:launchwrapper:1.11') { - exclude module: 'lwjgl' + // Fernflower decompiler + fernflowerCompile configurations.compile +- fernflowerCompile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT' ++ fernflowerCompile 'reprod:fernflower:0' + + // LegacyLauncher service + launchwrapperCompile configurations.compile -- 2.5.5 diff --git a/gradle/reprod/patches/mixin/0006-Use-TreeMap-in-ReferenceMapper-for-reproducibility.patch b/gradle/reprod/patches/mixin/0006-Use-TreeMap-in-ReferenceMapper-for-reproducibility.patch index 07bbca64..102d778d 100644 --- a/gradle/reprod/patches/mixin/0006-Use-TreeMap-in-ReferenceMapper-for-reproducibility.patch +++ b/gradle/reprod/patches/mixin/0006-Use-TreeMap-in-ReferenceMapper-for-reproducibility.patch @@ -18,7 +18,7 @@ index 2a368e7..082b5dd 100644 -import java.util.HashMap; import java.util.Map; - import org.apache.logging.log4j.LogManager; + import org.apache.commons.io.IOUtils; @@ -71,13 +70,13 @@ public final class ReferenceMapper implements Serializable { * by the AP. Each entry is keyed by the owning mixin, with the value map * containing the actual remappings for each owner diff --git a/gradle/reprod/patches/replaymod/0002-Replace-mixin-dep-with-manually-built-one.patch b/gradle/reprod/patches/replaymod/0002-Replace-mixin-dep-with-manually-built-one.patch index 7cb7fcd8..f05ab1dc 100644 --- a/gradle/reprod/patches/replaymod/0002-Replace-mixin-dep-with-manually-built-one.patch +++ b/gradle/reprod/patches/replaymod/0002-Replace-mixin-dep-with-manually-built-one.patch @@ -15,7 +15,7 @@ index 42d0607..bfa3914 100755 dependencies { compile 'org.projectlombok:lombok:1.16.4' -- compile 'org.spongepowered:mixin:0.6.8-SNAPSHOT' +- compile 'org.spongepowered:mixin:0.7.5-SNAPSHOT' + compile 'reprod:mixin:0' shade 'com.googlecode.mp4parser:isoparser:1.1.7' shade 'org.apache.commons:commons-exec:1.3' diff --git a/gradle/reprod/setup.sh b/gradle/reprod/setup.sh index ba93b79e..b51cedc4 100755 --- a/gradle/reprod/setup.sh +++ b/gradle/reprod/setup.sh @@ -103,7 +103,7 @@ proxy_pid=$! trap "kill $proxy_pid" EXIT # Required for mixin -setup_dep "fernflower" "https://github.com/fesh0r/fernflower.git" "85f61bee8194ab69afa746b965973a18eda67608" "build/libs/fernflower.jar" "b69597c93e248073330da4532a857aad73b767d46f87a0aa66446fbea289ff93" "901b8a76ceb15db97d4dd19c5e8fcb0fc226ae602ef38ea906eb5258be9b929a" +setup_dep "fernflower" "https://github.com/fesh0r/fernflower.git" "adbf29f8ce902cd164fc0c41491030268ecc8265" "build/libs/fernflower.jar" "d2042d3121118a7175fc902d0e49f4ad37d00467e7ea535574974142eff64184" "901b8a76ceb15db97d4dd19c5e8fcb0fc226ae602ef38ea906eb5258be9b929a" # Required for forgegradle setup_dep "forgeflower" "https://github.com/MinecraftForge/FernFlowerLegacy.git" "114aebe82cf40075c5c4f916c409b8aebf8096d5" "build/libs/fernflower-2.0-SNAPSHOT.jar" "c8b4a4a13a1158008aed46da2c805184078324718697f14a67f1778168579956" "fbda3f30d54624fe4c59a69e145b644d8642afc0dd4eb0d732ccdaa0ebd5d8a3" @@ -113,7 +113,7 @@ setup_dep "srg2source" "https://github.com/MinecraftForge/Srg2Source.git" "5f11e # Required for RM setup_dep "mixingradle" "https://github.com/SpongePowered/MixinGradle.git" "52217aa8ca221dcd0b9fb657b037e663db808f38" "build/libs/mixingradle-0.4-SNAPSHOT.jar" "8b3508867128a5d564631635dff898a36f9aca8db54b7bb3af6f4924e3f4bead" "42cbf81136d4e26c06d3234427665b50d18768cc1f210512204ca1d5e3a42b5c" setup_dep "forgegradle" "https://github.com/MinecraftForge/ForgeGradle.git" "17806f45d20d0b55bff70a616eaeb939bd6a543c" "build/libs/ForgeGradle-2.1-SNAPSHOT.jar" "dc3da35074bbb1c55e68f7863a8fc8660803da3192aa8d0a7e33280424d3c8d0" "4c670a05fbd9aeaa581ae8ba7597df1d1def7b04160e1c6b076ed6778dd45e58" -setup_dep "mixin" "https://github.com/SpongePowered/Mixin.git" "b558323da3bd6ce94aeb442bfd7357f6c40d2fd4" "build/libs/mixin-0.6.11-SNAPSHOT.jar" "cb446b614ce34372fc2084de9bb16adc3182a6e96120fdb4bcae561e41303694" "a2f59b03529fed676b64ed4f57fff16bfe27f7131c216f69308ca4d2b6e8e754" +setup_dep "mixin" "https://github.com/SpongePowered/Mixin.git" "404f5da0b6b18980b4e44c7f1cfeddcd47fe4aa6" "build/libs/mixin-0.7.5-SNAPSHOT.jar" "7d181a5e7c317c00c07da14e7770e4356b0f201414cd2a836e987be9fa133d43" "11000383a5051f25a70c2bff3a3167b6859ae4f9838a0ab45560e9f9c9d9def7" rm -rf tmp mkdir tmp