Update RxJava1 to RxJava2 in kotlinx-coroutines-rx-example

Author: takahirom

reactive/kotlinx-coroutines-rx-example/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
-    ext.retrofit_version = '2.1.0'
-    compile project(':kotlinx-coroutines-rx1')
+    ext.retrofit_version = '2.3.0'
+    compile project(':kotlinx-coroutines-rx2')
     compile "com.squareup.retrofit2:retrofit:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
+    compile "com.squareup.retrofit2:adapter-rxjava2:$retrofit_version"
 }

reactive/kotlinx-coroutines-rx-example/src/main/kotlin/main.kt

@@ -14,26 +14,25 @@
  * limitations under the License.
  */
 
-
+import io.reactivex.Single
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.launch
-import kotlinx.coroutines.experimental.rx1.awaitSingle
+import kotlinx.coroutines.experimental.rx2.await
 import retrofit2.Retrofit
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
-import rx.Observable
 
 interface GitHub {
     @GET("/repos/{owner}/{repo}/contributors")
     fun contributors(
             @Path("owner") owner: String,
             @Path("repo") repo: String
-    ): Observable<List<Contributor>>
+    ): Single<List<Contributor>>
 
     @GET("users/{user}/repos")
-    fun listRepos(@Path("user") user: String): Observable<List<Repo>>
+    fun listRepos(@Path("user") user: String): Single<List<Repo>>
 }
 
 data class Contributor(val login: String, val contributions: Int)
@@ -43,21 +42,21 @@ fun main(args: Array<String>) {
     val retrofit = Retrofit.Builder().apply {
         baseUrl("https://api.github.com")
         addConverterFactory(GsonConverterFactory.create())
-        addCallAdapterFactory(RxJavaCallAdapterFactory.create())
+        addCallAdapterFactory(RxJava2CallAdapterFactory.create())
     }.build()
 
     val github = retrofit.create(GitHub::class.java)
 
     launch(CommonPool) {
         val contributors =
                 github.contributors("JetBrains", "Kotlin")
-                      .awaitSingle().take(10)
+                      .await().take(10)
 
         for ((name, contributions) in contributors) {
             println("$name has $contributions contributions, other repos: ")
 
             val otherRepos =
-                    github.listRepos(name).awaitSingle()
+                    github.listRepos(name).await()
                           .map(Repo::name).joinToString(", ")
 
             println(otherRepos)