Skip to content

Updated kotlin to 1.2.41 and coroutines to 0.23.1. #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 12, 2018
Merged

Updated kotlin to 1.2.41 and coroutines to 0.23.1. #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
794cdeb
Updated kotlin to 1.2.41 and coroutines to 0.23.1
bohsen Jun 11, 2018
14913b2
Fixed failing tests caused by breaking change in coroutines version 0…
bohsen Jun 11, 2018
0430c03
invokeOnCompletion was deprecated in kotlin coroutines 0.23.0. Refact…
bohsen Jun 12, 2018
5aced4e
Updated Changelog and Readme.
bohsen Jun 12, 2018
6a99304
Updated version to 0.10.1.
bohsen Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# CHANGELOG

## Version 0.10.1 (2017-06-12)

- [kotlinx.coroutines 0.23.1](https://github.com/Kotlin/kotlinx.coroutines/releases/)
- Compiled against Kotlin 1.2.41

## Version 0.10.0 (2017-04-26)

- [Retrofit 2.4.0](https://github.com/square/retrofit/blob/parent-2.4.0/CHANGELOG.md#version-240-2018-03-14)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Download the [JAR](https://bintray.com/gildor/maven/kotlin-coroutines-retrofit#f
Gradle:

```groovy
compile 'ru.gildor.coroutines:kotlin-coroutines-retrofit:0.10.0'
compile 'ru.gildor.coroutines:kotlin-coroutines-retrofit:0.10.1'
```

Maven:
Expand All @@ -23,7 +23,7 @@ Maven:
<dependency>
<groupId>ru.gildor.coroutines</groupId>
<artifactId>kotlin-coroutines-retrofit</artifactId>
<version>0.10.0</version>
<version>0.10.1</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper

plugins {
id("org.jetbrains.kotlin.jvm") version "1.2.40"
id("org.jetbrains.kotlin.jvm") version "1.2.41"
id("com.jfrog.bintray") version "1.7.3"
jacoco
`maven-publish`
id("org.jetbrains.dokka") version "0.9.16"
}

group = "ru.gildor.coroutines"
version = "0.10.0"
version = "0.10.1"
description = "Provides Kotlin Coroutines suspendable await() extensions for Retrofit Call"

repositories {
Expand All @@ -34,7 +34,7 @@ java {

dependencies {
compile("org.jetbrains.kotlin:kotlin-stdlib")
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:0.22.5")
compile("org.jetbrains.kotlinx:kotlinx-coroutines-core:0.23.1")
compile("com.squareup.retrofit2:retrofit:2.4.0")
testCompile("junit:junit:4.12")
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/ru/gildor/coroutines/retrofit/CallAwait.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public suspend fun <T : Any> Call<T>.awaitResult(): Result<T> {
}

private fun Call<*>.registerOnCompletion(continuation: CancellableContinuation<*>) {
continuation.invokeOnCompletion {
continuation.invokeOnCancellation {
if (continuation.isCancelled)
try {
cancel()
Expand Down
1 change: 1 addition & 0 deletions src/test/kotlin/ru/gildor/coroutines/retrofit/CallAwaitTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import retrofit2.HttpException
import ru.gildor.coroutines.retrofit.util.MockedCall
import ru.gildor.coroutines.retrofit.util.NullBodyCall
import ru.gildor.coroutines.retrofit.util.errorResponse
import kotlin.coroutines.experimental.coroutineContext

private const val DONE = "Done!"

Expand Down