From e4cae0fceb752e73a649fd308f8dcd05aff25779 Mon Sep 17 00:00:00 2001
From: Kittinun Vantasin <kittinun.f@gmail.com>
Date: Mon, 13 May 2019 20:06:47 +0900
Subject: [PATCH] :arrow_up: [Release] version 2.1.0 (#638)

---
 README.md                                                   | 2 +-
 build.gradle.kts                                            | 6 +++---
 buildSrc/src/main/kotlin/Constants.kt                       | 4 ++--
 deploy_bintray.sh                                           | 2 +-
 .../kotlin/com/github/kittinunf/fuel/core/Deserializable.kt | 4 ++--
 .../kittinunf/fuel/core/requests/SuspendableRequest.kt      | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index cf345600e..6d5bb0e76 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ We offer maven and jitpack installations. Maven via bintray only has stable rele
 ### Maven
 You can [download](https://bintray.com/kittinunf/maven/Fuel-Android/_latestVersion) and install `Fuel` with `Maven` and `Gradle`. The core package has the following dependencies:
 * Kotlin - [![Kotlin](https://img.shields.io/badge/Kotlin-1.3.30-blue.svg)](https://kotlinlang.org)
-* Result - 2.0.0
+* Result - 2.2.0
 
 ```groovy
   //core
diff --git a/build.gradle.kts b/build.gradle.kts
index 8ff3ba442..c66f268be 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -66,7 +66,7 @@ subprojects {
 
         val sourcesJar by tasks.registering(Jar::class) {
             from(sourceSets["main"].allSource)
-            classifier = "sources"
+            archiveClassifier.set("sources")
         }
 
         val doc by tasks.creating(Javadoc::class) {
@@ -120,7 +120,7 @@ subprojects {
 
             val sourcesJar by tasks.registering(Jar::class) {
                 from(sourceSets["main"].java.srcDirs)
-                classifier = "sources"
+                archiveClassifier.set("sources")
             }
 
             val doc by tasks.creating(Javadoc::class) {
@@ -205,7 +205,7 @@ subprojects {
                 dependsOn(doc)
                 from(doc)
 
-                classifier = "javadoc"
+                archiveClassifier.set("javadoc")
             }
 
             val sourcesJar by tasks
diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt
index 24b01fb30..6321df9d3 100644
--- a/buildSrc/src/main/kotlin/Constants.kt
+++ b/buildSrc/src/main/kotlin/Constants.kt
@@ -1,6 +1,6 @@
 // Library version
 object Fuel {
-    const val publishVersion = "2.0.1"
+    const val publishVersion = "2.1.0"
     const val groupId = "com.github.kittinunf.fuel"
 
     const val compileSdkVersion = 28
@@ -71,7 +71,7 @@ object Kotlin {
 }
 
 object Result {
-    const val version = "2.0.0"
+    const val version = "2.2.0"
     const val dependency = "com.github.kittinunf.result:result:$version"
 }
 
diff --git a/deploy_bintray.sh b/deploy_bintray.sh
index 4fe2a4278..bc1061356 100755
--- a/deploy_bintray.sh
+++ b/deploy_bintray.sh
@@ -9,7 +9,7 @@ if [[ "$TRAVIS_BRANCH" == */release-* ]]; then
     m=${i%%/}
     if [[ $m == fuel* ]]; then
       echo ">> Deploying $m ..."
-      ./gradlew :$m:clean :$m:build :$m:bintrayUpload -PBINTRAY_USER=$BINTRAY_USER -PBINTRAY_KEY=$BINTRAY_KEY -PdryRun=false -Ppublish=true
+      ./gradlew :$m:clean :$m:build :$m:bintrayUpload -PBINTRAY_USER=$BINTRAY_USER -PBINTRAY_KEY=$BINTRAY_KEY -PdryRun=false -Ppublish=true --no-configure-on-demand --no-parallel
     fi
   done
 
diff --git a/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/Deserializable.kt b/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/Deserializable.kt
index dc77e91b3..993751ff0 100644
--- a/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/Deserializable.kt
+++ b/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/Deserializable.kt
@@ -172,8 +172,8 @@ fun <T : Any, U : Deserializable<T>> Request.response(deserializable: U): Respon
         .getOrThrow()
 
     // By this time it should have a response, but deserialization might fail
-    return runCatching { Triple(this, rawResponse, Result.Success<T, FuelError>(deserializable.deserialize(rawResponse))) }
-        .recover { error -> Triple(this, rawResponse, Result.Failure<T, FuelError>(FuelError.wrap(error, rawResponse))) }
+    return runCatching { Triple(this, rawResponse, Result.Success(deserializable.deserialize(rawResponse))) }
+        .recover { error -> Triple(this, rawResponse, Result.Failure(FuelError.wrap(error, rawResponse))) }
         .getOrThrow()
 }
 
diff --git a/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/requests/SuspendableRequest.kt b/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/requests/SuspendableRequest.kt
index 7baf9cde4..6bc234d62 100644
--- a/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/requests/SuspendableRequest.kt
+++ b/fuel/src/main/kotlin/com/github/kittinunf/fuel/core/requests/SuspendableRequest.kt
@@ -54,8 +54,8 @@ class SuspendableRequest private constructor(private val wrapped: Request) : Req
                     interruptCallback.invoke(request)
                 }
             }
-            .map { Result.Success<Response, FuelError>(it) }
-            .recover { Result.Failure<Response, FuelError>(it as FuelError) }
+            .map { Result.Success(it) }
+            .recover { Result.Failure(it as FuelError) }
             .getOrThrow()
     }