From ef66087044615c7a4bdff5187c751b1edfc138e1 Mon Sep 17 00:00:00 2001
From: NikkyAI <root@nikky.moe>
Date: Sun, 25 Nov 2018 23:37:07 +0100
Subject: [PATCH] fix potential library mismatch.. again

---
 1.7.10/build.gradle |  3 ++-
 core/build.gradle   | 10 +++++-----
 gradle.properties   |  2 +-
 scripts/test12.sh   |  2 +-
 scripts/test9.sh    |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/1.7.10/build.gradle b/1.7.10/build.gradle
index f65652a..62bf528 100644
--- a/1.7.10/build.gradle
+++ b/1.7.10/build.gradle
@@ -30,7 +30,7 @@ configurations {
 }
 
 dependencies {
-    shade (project(':core')) { transitive = false }
+    shade (project(':core')) { transitive = true }
     shade (project(':Jankson')) { transitive = false }
 
     shade group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-jdk8', version: kotlinVersion
@@ -41,6 +41,7 @@ dependencies {
     shade(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion)
     shade(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion)
     shade(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion)
+
 //    shade group: 'com.github.kittinunf.fuel', name: 'fuel', version: fuelVersion
 //    shade group: 'com.github.kittinunf.result', name: 'result', version: resultVersion
 }
diff --git a/core/build.gradle b/core/build.gradle
index f28627b..03a4241 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -24,13 +24,13 @@ dependencies {
     compile group: 'com.google.guava', name: 'guava', version: '+'
 
     compile(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion)
-    shadow(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion) { transitive = false }
+    shadow(group: "com.github.kittinunf.Fuel", name: "fuel", version: fuelVersion) { transitive = true }
     compile(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion)
-    shadow(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion) { transitive = false }
-    compile(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion)
-    shadow(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion) { transitive = false }
+    shadow(group: "com.github.kittinunf.Fuel", name: "fuel-coroutines", version: fuelVersion) { transitive = true }
+//    compile(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion)
+//    shadow(group: 'com.github.kittinunf.result', name: 'result', version: resultVersion) { transitive = false }
 
-    compile(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutinesVersion)
+//    compile(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutinesVersion)
 //    shadow(group: "org.jetbrains.kotlinx", name: "kotlinx-coroutines-core", version: coroutinesVersion) { transitive = false }
 
     compile(group: "org.jetbrains.kotlinx", name: "kotlinx-serialization-runtime", version: serializationVersion)
diff --git a/gradle.properties b/gradle.properties
index e3d4f4f..6b52b55 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,7 @@ kotlinVersion = 1.3.10
 coroutinesVersion = 1.0.1
 serializationVersion = 0.9.1
 shadowVersion = 2.0.2
-fuelVersion = b5d2b1fd05
+fuelVersion = 8690665998
 resultVersion = 2.0.0
 cursegradleVersion = 1.1.0
 curseId = 287323
diff --git a/scripts/test12.sh b/scripts/test12.sh
index 6119936..61aba10 100755
--- a/scripts/test12.sh
+++ b/scripts/test12.sh
@@ -15,7 +15,7 @@ fi
 cd "$RUN"
 
 curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.12.2-14.23.5.2768/forge-1.12.2-14.23.5.2768-installer.jar"
-curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2633578/download"
+curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2640952/download"
 
 $DIR/scripts/start.sh
 
diff --git a/scripts/test9.sh b/scripts/test9.sh
index 9946670..158cba0 100755
--- a/scripts/test9.sh
+++ b/scripts/test9.sh
@@ -15,7 +15,7 @@ fi
 cd "$RUN"
 
 curl -o forge-installer.jar "https://files.minecraftforge.net/maven/net/minecraftforge/forge/1.9.4-12.17.0.2051/forge-1.9.4-12.17.0.2051-installer.jar"
-curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2505090/download" # "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2573311/download"
+curl -L -o "$RUN/mods/Forgelin.jar" "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2640952/download" # "https://minecraft.curseforge.com/projects/shadowfacts-forgelin/files/2573311/download"
 
 $DIR/scripts/start.sh