Merge remote-tracking branch 'origin/master' into kotlin-1.3

Author: gildor

CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## Version 0.13.0-eap13 (2017-10-10)
+
+- kotlinx.coroutines 0.30.2-eap13
+- Compiled against Kotlin 1.3.0-rc-146
+
+## Version 0.13.0 (2017-10-10)
+
+- [kotlinx.coroutines 0.30.2](https://github.com/Kotlin/kotlinx.coroutines/releases/tag/0.30.2)
+- Compiled against Kotlin 1.2.71
+
 ## Version 0.12.0-eap13 (2017-08-04) - Stable coroutines
 
 First version of kotlin-coroutines-retrofit based on stable coroutines API from Kotlin 1.3

README.md

@@ -11,12 +11,34 @@ Based on [kotlinx.coroutines](https://github.com/Kotlin/kotlinx.coroutines) impl
 This branch uses stable version of Kotlin coroutines and work only on Kotlin 1.3 (including EAP builds)
 
 ## Download
+
 Download the [JAR](https://bintray.com/gildor/maven/kotlin-coroutines-retrofit#files/ru/gildor/coroutines/kotlin-coroutines-retrofit):
 
+### If you use Kotlin 1.2: Version of the library based on experimental coroutines API
+
+Gradle:
+
+```groovy
+compile 'ru.gildor.coroutines:kotlin-coroutines-retrofit:0.13.0'
+```
+
+Maven:getOrThrow
+
+```xml
+<dependency>
+  <groupId>ru.gildor.coroutines</groupId>
+  <artifactId>kotlin-coroutines-retrofit</artifactId>
+  <version>0.13.0</version>
+</dependency>
+```
+
+### If you use Kotlin 1.3: Version based on stable coroutines API
+
+
 Gradle:
 
 ```groovy
-compile 'ru.gildor.coroutines:kotlin-coroutines-retrofit:0.12.0-eap13'
+compile 'ru.gildor.coroutines:kotlin-coroutines-retrofit:0.13.0-eap13'
 ```
 
 Maven:getOrThrow
@@ -25,7 +47,7 @@ Maven:getOrThrow
 <dependency>
   <groupId>ru.gildor.coroutines</groupId>
   <artifactId>kotlin-coroutines-retrofit</artifactId>
-  <version>0.12.0-eap13</version>
+  <version>0.13.0-eap13</version>
 </dependency>
 ```
 

build.gradle.kts

@@ -20,7 +20,7 @@ plugins {
 }
 
 group = "ru.gildor.coroutines"
-version = "0.12.0-eap13"
+version = "0.13.0-eap13"
 description = "Provides Kotlin Coroutines suspendable await() extensions for Retrofit Call"
 
 repositories {
@@ -78,7 +78,7 @@ val releaseTag = "v${project.version}"
 val sourcesJar by tasks.creating(Jar::class) {
     dependsOn("classes")
     classifier = "sources"
-    from(java.sourceSets["main"].allSource)
+    from(sourceSets["main"].allSource)
 }
 
 val javadocJar by tasks.creating(Jar::class) {

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-# suppress inspection "UnusedProperty" for whole file
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists