DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Produce pom.xml instead of shading deps of deps

Browse Source
This commit is contained in:
Jonas Herzig
2017-10-03 18:00:24 +02:00
parent c07e08386d
commit ba4aaa3654
9 changed files with 74 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
gradle/reprod/patches/forgegradle/0004-Shade-all-the-things-because-we-don-t-include-deps-a.patch
View File

@@ -1,57 +0,0 @@
From 130d406cbe105303f9b14c342f02fc9a20782e32 Mon Sep 17 00:00:00 2001
From: Jonas Herzig <me@johni0702.de>
Date: Mon, 7 Aug 2017 19:54:54 +0200
Subject: [PATCH 4/5] Shade all the things (because we don't include deps as
maven deps)
---
build.gradle | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8959f8f..0bf7941 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,26 +62,26 @@ dependencies {
compile gradleApi()
// moved to the beginning to be the overrider
- compile 'org.ow2.asm:asm-debug-all:5.0.3'
- compile 'com.google.guava:guava:18.0'
+ shade 'org.ow2.asm:asm-debug-all:5.0.3'
+ shade 'com.google.guava:guava:18.0'
- compile 'net.sf.opencsv:opencsv:2.3' // reading CSVs.. also used by SpecialSource
- compile 'com.cloudbees:diff4j:1.1' // for difing and patching
- compile 'com.github.abrarsyed.jastyle:jAstyle:1.3' // formatting
- compile 'net.sf.trove4j:trove4j:2.1.0' // because its awesome.
+ shade 'net.sf.opencsv:opencsv:2.3' // reading CSVs.. also used by SpecialSource
+ shade 'com.cloudbees:diff4j:1.1' // for difing and patching
+ shade 'com.github.abrarsyed.jastyle:jAstyle:1.3' // formatting
+ shade 'net.sf.trove4j:trove4j:2.1.0' // because its awesome.
- compile 'com.github.jponge:lzma-java:1.3' // replaces the LZMA binary
- compile 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
- compile 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
- compile 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
- compile 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
+ shade 'com.github.jponge:lzma-java:1.3' // replaces the LZMA binary
+ shade 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
+ shade 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
+ shade 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
+ shade 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
shade 'net.md-5:SpecialSource:1.7.4' // deobf and reobs
// compile 'net.md-5:SpecialSource:1.7.4' // when md5 publishes
// because curse
- compile 'org.apache.httpcomponents:httpclient:4.3.3'
- compile 'org.apache.httpcomponents:httpmime:4.3.3'
+ shade 'org.apache.httpcomponents:httpclient:4.3.3'
+ shade 'org.apache.httpcomponents:httpmime:4.3.3'
// mcp stuff
shade 'de.oceanlabs.mcp:RetroGuard:3.6.6'
--
2.5.5

14
gradle/reprod/patches/forgegradle/0006-Replace-SNAPSHOT-deps-with-manually-built-ones.patch
View File

@@ -12,11 +12,11 @@ index bfadecd..774a015 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,7 +67,7 @@ dependencies {
shade 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
shade 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
shade 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
- shade 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
+ shade files('../forgeflower.jar') // Fernflower Forge edition
compile 'com.nothome:javaxdelta:2.0.1' // GDIFF implementation for BinPatches
compile 'com.google.code.gson:gson:2.2.4' // Used instead of Argo for buuilding changelog.
compile 'com.github.tony19:named-regexp:0.2.3' // 1.7 Named regexp features
- compile 'net.minecraftforge:fernflower:2.0-SNAPSHOT' // Fernflower Forge edition
+ compile 'reprod:forgeflower:0' // Fernflower Forge edition
shade 'net.md-5:SpecialSource:1.7.4' // deobf and reobs
// compile 'net.md-5:SpecialSource:1.7.4' // when md5 publishes
@@ -26,8 +26,8 @@ index bfadecd..774a015 100644
shade 'de.oceanlabs.mcp:RetroGuard:3.6.6'
- shade 'de.oceanlabs.mcp:mcinjector:3.4-SNAPSHOT'
- shade 'net.minecraftforge.srg2source:Srg2Source:3.3-SNAPSHOT'
+ shade files('../mcinjector.jar')
+ shade files('../srg2source.jar')
+ shade 'reprod:mcinjector:0'
+ shade 'reprod:srg2source:0'
//Stuff used in the GradleStart classes
compileOnly 'com.mojang:authlib:1.5.16'