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

Make our non-shading of Mixin's deps explicit

Browse Source
This commit is contained in:
Jonas Herzig
2019-03-15 10:51:15 +01:00
parent 2e29632fab
commit fc0f070721
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
versions/common.gradle
View File

@@ -144,8 +144,12 @@ repositories {
} }
configurations { configurations {
// Include dep in fat jar without relocation and, when forge supports it, without exploding (TODO)
shade shade
compile.extendsFrom shade compile.extendsFrom shade
// Include dep in fat jar with relocation and minimization
shadow
compile.extendsFrom shadow
} }
def shadeExclusions = { def shadeExclusions = {
@@ -169,31 +173,33 @@ dependencies {
annotationProcessor 'org.spongepowered:mixin:0.7.8-SNAPSHOT' annotationProcessor 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
compileOnly 'org.spongepowered:mixin:0.7.8-SNAPSHOT' compileOnly 'org.spongepowered:mixin:0.7.8-SNAPSHOT'
} }
compile 'org.spongepowered:mixin:0.7.8-SNAPSHOT' shade('org.spongepowered:mixin:0.7.8-SNAPSHOT'){
shade 'com.googlecode.mp4parser:isoparser:1.1.7' transitive = false // deps should all be bundled with MC
shade 'org.apache.commons:commons-exec:1.3' }
shade 'com.google.apis:google-api-services-youtube:v3-rev178-1.22.0', shadeExclusions shadow 'com.googlecode.mp4parser:isoparser:1.1.7'
shade 'com.google.api-client:google-api-client-gson:1.20.0', shadeExclusions shadow 'org.apache.commons:commons-exec:1.3'
shade 'com.google.api-client:google-api-client-java6:1.20.0', shadeExclusions shadow 'com.google.apis:google-api-services-youtube:v3-rev178-1.22.0', shadeExclusions
shade 'com.google.oauth-client:google-oauth-client-jetty:1.20.0' shadow 'com.google.api-client:google-api-client-gson:1.20.0', shadeExclusions
shadow 'com.google.api-client:google-api-client-java6:1.20.0', shadeExclusions
shadow 'com.google.oauth-client:google-oauth-client-jetty:1.20.0'
shade 'org.aspectj:aspectjrt:1.8.2' shadow 'org.aspectj:aspectjrt:1.8.2'
shade 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8' shadow 'com.github.ReplayMod.JavaBlend:2.79.0:a0696f8'
def studioVersion = mcVersionStr def studioVersion = mcVersionStr
if (studioVersion == '1.8.9') studioVersion = '1.8' if (studioVersion == '1.8.9') studioVersion = '1.8'
shade "com.github.ReplayMod.ReplayStudio:$studioVersion:c41d016", shadeExclusions shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:c41d016", shadeExclusions
def jGuiVersion = project.name def jGuiVersion = project.name
if (['1.10.2', '1.11', '1.11.2'].contains(jGuiVersion)) jGuiVersion = '1.9.4' if (['1.10.2', '1.11', '1.11.2'].contains(jGuiVersion)) jGuiVersion = '1.9.4'
if (['1.12.1', '1.12.2'].contains(jGuiVersion)) jGuiVersion = '1.12' if (['1.12.1', '1.12.2'].contains(jGuiVersion)) jGuiVersion = '1.12'
shade(project(":jGui:$jGuiVersion")){ shadow(project(":jGui:$jGuiVersion")){
transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those
exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used exclude group: 'org.projectlombok', module: 'lombok' // runtime only for @SneakyThrows which isn't used
} }
project(":jGui:$jGuiVersion").afterEvaluate { project(":jGui:$jGuiVersion").afterEvaluate {
shade files(project(":jGui:$jGuiVersion").tasks.preshadowJar.archivePath) // include pre-shadowed lwjgl_util shadow files(project(":jGui:$jGuiVersion").tasks.preshadowJar.archivePath) // include pre-shadowed lwjgl_util
} }
if (!gradle.gradleVersion.startsWith('3.')) { if (!gradle.gradleVersion.startsWith('3.')) {
@@ -289,10 +295,10 @@ if (!FG3) { // FIXME
def reobfTask = mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf def reobfTask = mcVersion >= 10800 ? tasks.reobfJar : tasks.reobf
task configureRelocation() { task configureRelocation() {
dependsOn tasks.jar dependsOn tasks.jar
dependsOn configurations.shade dependsOn configurations.shadow
doLast { doLast {
def extraSrg = mcVersion >= 10800 ? reobfTask.extraSrgLines : reobfTask.extraSrg def extraSrg = mcVersion >= 10800 ? reobfTask.extraSrgLines : reobfTask.extraSrg
files(configurations.shade).filter { it.exists() }.collect { files(configurations.shadow).filter { it.exists() }.collect {
def tree = it.isDirectory() ? fileTree(it) : zipTree(it) def tree = it.isDirectory() ? fileTree(it) : zipTree(it)
def pkgs = [].toSet() def pkgs = [].toSet()
tree.visit { file -> tree.visit { file ->
@@ -324,15 +330,13 @@ jar {
dependsOn configurations.compile dependsOn configurations.compile
dependsOn configurations.shade dependsOn configurations.shade
dependsOn configurations.shadow
if (mcVersion <= 10710) { if (mcVersion <= 10710) {
from project.mixinRefMap from project.mixinRefMap
} }
def shade = {files( def shade = { files(configurations.shadow + configurations.shade) }
configurations.compile.findAll {it.name.startsWith 'mixin-'}
+ configurations.shade
)}
def noticeDir = file("$buildDir/NOTICE") def noticeDir = file("$buildDir/NOTICE")
doFirst { doFirst {