Skip to content

Commit

Permalink
⬆️ [Release] version 2.1.0 (#638)
Browse files Browse the repository at this point in the history
  • Loading branch information
kittinunf authored May 13, 2019
1 parent f193e21 commit e4cae0f
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -205,7 +205,7 @@ subprojects {
dependsOn(doc)
from(doc)

classifier = "javadoc"
archiveClassifier.set("javadoc")
}

val sourcesJar by tasks
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Constants.kt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion deploy_bintray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down

0 comments on commit e4cae0f

Please sign in to comment.