Exclude guava from ReplayStudio deps

This commit is contained in:
Jonas Herzig
2018-03-01 17:53:06 +01:00
parent 598827f074
commit 94c33df308
12 changed files with 22 additions and 46 deletions

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:7d8c2f7'
shade project(':jGui:versions:1.9.4')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:9605121'
shade project(':jGui:versions:1.9.4')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.ReplayMod:ReplayStudio:2b063ec'
shade project(':jGui:versions:1.9.4')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:9ee698e'
shade project(':jGui:versions:1.12')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:b040763'
shade project(':jGui:versions:1.12')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:9ee698e'
shade project(':jGui:versions:1.12')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:a2168ca'
shade project(':jGui:versions:1.8.9')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:a2168ca'
shade project(':jGui:versions:1.8')
}

View File

@@ -12,6 +12,5 @@ minecraft {
}
dependencies {
shade 'com.github.replaymod:ReplayStudio:14daa88'
shade project(':jGui:versions:1.9.4')
}

View File

@@ -79,6 +79,12 @@ dependencies {
shade 'org.aspectj:aspectjrt:1.8.2'
def studioVersion = project.name
if (studioVersion == '1.8.9') studioVersion = '1.8'
shade("com.github.ReplayMod.ReplayStudio:$studioVersion:9fd96a7"){
exclude group: 'com.google.guava', module: 'guava' // provided by MC
}
testCompile 'junit:junit:4.11'
}

View File

@@ -70,39 +70,16 @@ minecraft {
dependencies {
//#if MC>=11200
//#if MC>=11202
shade 'com.github.replaymod:ReplayStudio:b040763'
//#else
//#if MC>=11201
//$$ shade 'com.github.replaymod:ReplayStudio:d4b2037'
//#else
//$$ shade 'com.github.replaymod:ReplayStudio:9ee698e'
//#endif
//#endif
shade project(':jGui:versions:1.12')
//#else
//#if MC>=10904
//$$ shade project(':jGui:versions:1.9.4')
//#if MC>=11002
//#if MC>=11100
//#if MC>=11102
//$$ shade 'com.github.replaymod:ReplayStudio:9605121'
//#else
//$$ shade 'com.github.ReplayMod:ReplayStudio:2b063ec'
//#endif
//#else
//$$ shade 'com.github.replaymod:ReplayStudio:7d8c2f7'
//#endif
//#else
//$$ shade 'com.github.replaymod:ReplayStudio:14daa88'
//#endif
//#else
//#if MC>=10809
//$$ shade project(':jGui:versions:1.8.9')
//#else
//$$ shade project(':jGui:versions:1.8')
//#endif
//$$ shade 'com.github.replaymod:ReplayStudio:a2168ca'
//#endif
//#endif
}