Exclude guava from ReplayStudio deps

gradle/reprod/checksums.txt

@@ -26,20 +26,22 @@ f539e2ca00d43e3d2261b7334eb05137f0eb1d3d5e3cc2c2716b0071e27783ed /com/github/Min
 fe525f413965d4f5f65b70f08b90b3d3f944714f665e2c5636a6e8fec08d3c74 /com/github/MinecraftForge/Srg2Source/ea4ea62/Srg2Source-ea4ea62.pom
 ecf57aab63509ec0ce3937c2215bc3a2e3cb6357cd11095978db18bd3251731a /com/github/ModCoderPack/MCInjector/7258466/MCInjector-7258466.jar
 dc7ed1f4f0ddd8f5ce3b449db944907a5eb2855dbbbc59b08dad1247ebafba33 /com/github/ModCoderPack/MCInjector/7258466/MCInjector-7258466.pom
-9de10955f2f5e43c982fab9c88b9fb5a7984e4be08f8665294920fa866dc38e2 /com/github/replaymod/ReplayStudio/14daa88/ReplayStudio-14daa88.jar
+eec4d746869133803b0b3c8a8036a6fb1ec95c52951a0c83cd712f8414eb2155 /com/github/ReplayMod/ReplayStudio/1.10.2/9fd96a7/1.10.2-9fd96a7.jar
-2a48580e2a41a35303b5d661a8870f4adaefbd5216af1cbfcf3dd3ca1b906c61 /com/github/replaymod/ReplayStudio/14daa88/ReplayStudio-14daa88.pom
+4ab7d385c3bb8ff5f644d7581ba01e8f53bf901391bc3db4a42671d691fe10a3 /com/github/ReplayMod/ReplayStudio/1.10.2/9fd96a7/1.10.2-9fd96a7.pom
-0dbc963a2906295a032f6b46459ad7e9fbd276243da4b347787b536c4ead3d2c /com/github/ReplayMod/ReplayStudio/2b063ec/ReplayStudio-2b063ec.jar
+2b1cc3bb7e47f0e211d9a4f6460094cac923d6225570c3f7050d7ca400797ca3 /com/github/ReplayMod/ReplayStudio/1.11.2/9fd96a7/1.11.2-9fd96a7.jar
-29a7d1756a4a080891bc7521811d848d6e4f1f61520d2327ebaaf3c5ab220c84 /com/github/ReplayMod/ReplayStudio/2b063ec/ReplayStudio-2b063ec.pom
+5c7a1016aec5d110283b7da5d2275624c9620f4b7e280243d36a3d91fdc9a634 /com/github/ReplayMod/ReplayStudio/1.11.2/9fd96a7/1.11.2-9fd96a7.pom
-259c0b9e7679cefc5fbf9e7fdada3dec5aaeefb28f6f41b09ea22b22809d9765 /com/github/replaymod/ReplayStudio/7d8c2f7/ReplayStudio-7d8c2f7.jar
+0b5b847e3632c9af689d6962784055199b32480776d6677c3af7a5222a5d7aa8 /com/github/ReplayMod/ReplayStudio/1.11/9fd96a7/1.11-9fd96a7.jar
-c1f4e76c40b3cd3b7653b52a5aacbd2ef9561633879c127a5cb86bbe5ac49e7b /com/github/replaymod/ReplayStudio/7d8c2f7/ReplayStudio-7d8c2f7.pom
+264e3bc6f5e46a779e69693a8923b7ec0ab293c0b44aebdef8ae1384e60ca9cd /com/github/ReplayMod/ReplayStudio/1.11/9fd96a7/1.11-9fd96a7.pom
-c9f435c3c429ee1f13e664614a27baf1d2ae308f4830fbc37fd66c639a877a6f /com/github/replaymod/ReplayStudio/9605121/ReplayStudio-9605121.jar
+a57a2413914bcd3d28303fd8f15311ea75c71190a709301016e8d4a2a5b8594d /com/github/ReplayMod/ReplayStudio/1.12.1/9fd96a7/1.12.1-9fd96a7.jar
-f55d2e3a29dfbdf76e19e76073b2750bcd33326d3c3a76d03ec4b65fc8c8ce32 /com/github/replaymod/ReplayStudio/9605121/ReplayStudio-9605121.pom
+d5de52fb3678b934f9ff79010cf5f9b5808d4dbecea12176a68ba48770058292 /com/github/ReplayMod/ReplayStudio/1.12.1/9fd96a7/1.12.1-9fd96a7.pom
-bdf1952a9d02fc8f0909436a097eeda55c31b8db555f2d83b6b975e8f5a9c247 /com/github/replaymod/ReplayStudio/9ee698e/ReplayStudio-9ee698e.jar
+8e394540ae4f7e482418bac8fc62b960e7d6684d0c775de4cbe31a5b6e8265ba /com/github/ReplayMod/ReplayStudio/1.12.2/9fd96a7/1.12.2-9fd96a7.jar
-63ffed395d243e5b490042d9c1df9e1c35be0d2e511e2f4e298c3ea41686d0ef /com/github/replaymod/ReplayStudio/9ee698e/ReplayStudio-9ee698e.pom
+52fffb013931c1665fec82a4b8fa689746ced42ba3aa9bf9ec0e31cb5795dd45 /com/github/ReplayMod/ReplayStudio/1.12.2/9fd96a7/1.12.2-9fd96a7.pom
-04d7ceaf1e83006d2d93518884353a7856399669332d1174f2572e3d6ec03cd3 /com/github/replaymod/ReplayStudio/a2168ca/ReplayStudio-a2168ca.jar
+4a63fcc6f9028eb3861ffa2bfa530946a3bfb08740a63b079438cd63483e25d6 /com/github/ReplayMod/ReplayStudio/1.12/9fd96a7/1.12-9fd96a7.jar
-0703ef825f3e3cd0943f6955fd12da923eb255ed94fe421cbb207b2dcfd61ba4 /com/github/replaymod/ReplayStudio/a2168ca/ReplayStudio-a2168ca.pom
+84dc441594bfc55066bc47e220bec2c29b13078f43bf4825ea2efb627ac77e48 /com/github/ReplayMod/ReplayStudio/1.12/9fd96a7/1.12-9fd96a7.pom
-6210f02aef75870d95f3edd13489ec4156f19e0c5816987fa98d24b965714c4a /com/github/replaymod/ReplayStudio/b040763/ReplayStudio-b040763.jar
+05815d75c608c7a595e0b05e253dd061f0399192d5ff801bd4638f91e2977ea9 /com/github/ReplayMod/ReplayStudio/1.8/9fd96a7/1.8-9fd96a7.jar
-b61aa2c442a62059f632526b82016f9c8ca05f91dd145b049a19a1adcf516407 /com/github/replaymod/ReplayStudio/b040763/ReplayStudio-b040763.pom
+c8f68dd69574d0a60fd4da65dd719015f15dc39689c11ec82d996d73abafb1df /com/github/ReplayMod/ReplayStudio/1.8/9fd96a7/1.8-9fd96a7.pom
+a0860a4846512e77944e4fd3e22e27e239606748aba10b4e3c0f8965439b6208 /com/github/ReplayMod/ReplayStudio/1.9.4/9fd96a7/1.9.4-9fd96a7.jar
+8b4d5ad45fc62539a5add40e944e6fb22ad2b4d3954ed5b16f3f2a3b688da010 /com/github/ReplayMod/ReplayStudio/1.9.4/9fd96a7/1.9.4-9fd96a7.pom
 bfdcda4cbf23f28392384818a1417c2d6df687e15ce77530ef96381393102f8a /com/github/SpongePowered/MixinGradle/dcfaf61/MixinGradle-dcfaf61.jar
 3552e0c04817d91d1b6671a051d0e1d952c8b6a8eec57b54e829de9fa3ddf002 /com/github/SpongePowered/MixinGradle/dcfaf61/MixinGradle-dcfaf61.pom
 c6ebd74cd6108b8c372c95b842725ee5bd6d3303ba26cb00f18bc92f80b47956 /com/github/tony19/named-regexp/0.2.3/named-regexp-0.2.3.jar

versions/1.10.2/build.gradle

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

versions/1.11.2/build.gradle

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

versions/1.11/build.gradle

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

versions/1.12.1/build.gradle

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

versions/1.12.2/build.gradle

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

versions/1.12/build.gradle

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

versions/1.8.9/build.gradle

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

versions/1.8/build.gradle

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

versions/1.9.4/build.gradle

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

versions/common.gradle

@@ -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'
 }
 

versions/core/build.gradle

@@ -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
 }