Produce pom.xml instead of shading deps of deps
This commit is contained in:
Jonas Herzig
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -27,11 +27,10 @@ index 2e5f949..b6c63bb 100644
|
||||
apply plugin: 'maven'
|
||||
|
||||
group = 'de.oceanlabs.mcp'
|
||||
@@ -22,93 +12,13 @@ repositories {
|
||||
@@ -22,93 +12,12 @@ repositories {
|
||||
}
|
||||
|
||||
jar {
|
||||
+ from ({files(configurations.compile).collect {it.isDirectory() ? filesTree(it) : zipTree(it)}})
|
||||
manifest.attributes('Main-Class': 'de.oceanlabs.mcp.mcinjector.MCInjector')
|
||||
}
|
||||
-fatJar {
|
||||
|
||||
@@ -17,8 +17,8 @@ index f8598a3..e9a965b 100644
|
||||
fernflowerCompile 'com.google.guava:guava:17.0'
|
||||
- fernflowerCompile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT'
|
||||
- compile 'org.jetbrains.java.decompiler:fernflower:sponge-SNAPSHOT'
|
||||
+ fernflowerCompile files('../fernflower.jar')
|
||||
+ compile files('../fernflower.jar')
|
||||
+ fernflowerCompile 'reprod:fernflower:0'
|
||||
+ compile 'reprod:fernflower:0'
|
||||
|
||||
compile('net.minecraft:launchwrapper:1.11') {
|
||||
exclude module: 'lwjgl'
|
||||
|
||||
@@ -11,12 +11,12 @@ diff --git a/build.gradle b/build.gradle
|
||||
index ee24828..42d0607 100755
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -1,24 +1,9 @@
|
||||
@@ -1,24 +1,17 @@
|
||||
import groovy.json.JsonOutput
|
||||
|
||||
buildscript {
|
||||
- repositories {
|
||||
- mavenCentral()
|
||||
repositories {
|
||||
mavenCentral()
|
||||
- maven {
|
||||
- name = "forge"
|
||||
- url = "http://files.minecraftforge.net/maven"
|
||||
@@ -25,16 +25,17 @@ index ee24828..42d0607 100755
|
||||
- name = "sponge"
|
||||
- url = "https://repo.spongepowered.org/maven"
|
||||
- }
|
||||
- maven {
|
||||
- name = "sonatype"
|
||||
- url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||
- }
|
||||
- }
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||
}
|
||||
+ maven { url 'gradle/reprod/deps/repo' }
|
||||
}
|
||||
dependencies {
|
||||
- classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
|
||||
- classpath 'org.spongepowered:mixingradle:0.3-SNAPSHOT'
|
||||
+ classpath files('gradle/reprod/deps/forgegradle.jar')
|
||||
+ classpath files('gradle/reprod/deps/mixingradle.jar')
|
||||
+ classpath 'reprod:forgegradle:0'
|
||||
+ classpath 'reprod:mixingradle:0'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ index 42d0607..bfa3914 100755
|
||||
compile 'org.projectlombok:lombok:1.16.4'
|
||||
|
||||
- compile 'org.spongepowered:mixin:0.6.8-SNAPSHOT'
|
||||
+ shade files('gradle/reprod/deps/mixin.jar')
|
||||
+ compile 'reprod:mixin:0'
|
||||
shade 'com.googlecode.mp4parser:isoparser:1.1.7'
|
||||
shade 'org.apache.commons:commons-exec:1.3'
|
||||
shade 'com.google.apis:google-api-services-youtube:v3-rev178-1.22.0'
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From 7266eb65165cfe18ea21a3c183da4efc37ff54cf Mon Sep 17 00:00:00 2001
|
||||
From: Jonas Herzig <me@johni0702.de>
|
||||
Date: Sat, 26 Aug 2017 17:46:46 +0200
|
||||
Subject: [PATCH] Manually shade deps
|
||||
|
||||
---
|
||||
build.gradle | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/build.gradle b/build.gradle
|
||||
index eefeafe..368f6be 100644
|
||||
--- a/build.gradle
|
||||
+++ b/build.gradle
|
||||
@@ -61,6 +61,8 @@ jar {
|
||||
}
|
||||
|
||||
jar {
|
||||
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
+ from (files(configurations.compile).collect {it.isDirectory() ? filesTree(it) : zipTree(it)})
|
||||
exclude 'data/**'
|
||||
}
|
||||
|
||||
--
|
||||
2.5.5
|
||||
|
||||
Reference in New Issue
Block a user