Merge branch 'feature/coroutines-app-executors' of https://github.com…

…/XinyueZ/android-sunflower into feature/coroutines-app-executors
android · Nov 16, 2018 · 4887e15 · 4887e15
2 parents 917edcc + a827fb8
commit 4887e15
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Libraries Used
   * [Layout][35] - Lay out widgets using different algorithms.
 * Third party
   * [Glide][90] for image loading
-  * [Kotlin Coroutines][91] for async jobs, plays the role like light-weight threads.
+  * [Kotlin Coroutines][91] for managing background threads with simplified code and reducing needs for callbacks
 
 [0]: https://developer.android.com/jetpack/foundation/
 [1]: https://developer.android.com/topic/libraries/support-library/packages#v7-appcompat
@@ -84,7 +84,7 @@ Libraries Used
 [34]: https://developer.android.com/guide/components/fragments
 [35]: https://developer.android.com/guide/topics/ui/declaring-layout
 [90]: https://bumptech.github.io/glide/
-[91]: https://github.com/Kotlin/kotlinx.coroutines
+[91]: https://kotlinlang.org/docs/reference/coroutines-overview.html
 
 Upcoming features
 -----------------

diff --git a/app/build.gradle b/app/build.gradle
@@ -63,8 +63,8 @@ dependencies {
     implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"
     implementation "com.google.code.gson:gson:$rootProject.gsonVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.coroutines"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.coroutines"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$rootProject.coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$rootProject.coroutinesVersion"
 
     // Testing dependencies
     androidTestImplementation "androidx.arch.core:core-testing:$rootProject.coreTestingVersion"

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/viewmodels/ScopedViewModel.kt b/app/src/main/java/com/google/samples/apps/sunflower/viewmodels/ScopedViewModel.kt
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
         // App dependencies
         constraintLayoutVersion = '2.0.0-alpha2'
         coreTestingVersion = '2.0.0'
-        coroutines = "1.0.1"
+        coroutinesVersion = "1.0.1"
         espressoVersion = '3.1.0-alpha4'
         glideVersion = '4.8.0'
         gradleVersion = '3.2.1'