Merge pull request google-developer-training#33 from google-developer…

…-training/retrofit-callbacks Uses Retrofit *Call* callbacks vs discrete types/suspend functions
k12e5989 · Aug 26, 2020 · 64e2463 · 64e2463
2 parents e339470 + 48b4486
commit 64e2463
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/DevBytes-starter/app/build.gradle b/DevBytes-starter/app/build.gradle
@@ -41,7 +41,14 @@ android {
     buildFeatures {
         dataBinding true
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 }
 
 dependencies {
@@ -70,12 +77,12 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
     // retrofit for networking
-    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
-    implementation 'com.squareup.retrofit2:converter-moshi:2.5.0'
+    implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
 
     // moshi for parsing the JSON format
-    def moshi_version = "1.6.0"
+    def moshi_version = "1.9.3"
     implementation "com.squareup.moshi:moshi:$moshi_version"
     implementation "com.squareup.moshi:moshi-kotlin:$moshi_version"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"

diff --git a/DevBytes-starter/app/src/main/java/com/example/android/devbyteviewer/network/Service.kt b/DevBytes-starter/app/src/main/java/com/example/android/devbyteviewer/network/Service.kt
@@ -31,7 +31,7 @@ import retrofit2.http.GET
  */
 interface DevbyteService {
     @GET("devbytes")
-    fun getPlaylist(): Deferred<NetworkVideoContainer>
+    suspend fun getPlaylist(): NetworkVideoContainer
 }
 
 /**
@@ -43,11 +43,7 @@ object DevByteNetwork {
     private val retrofit = Retrofit.Builder()
             .baseUrl("https://android-kotlin-fun-mars-server.appspot.com/")
             .addConverterFactory(MoshiConverterFactory.create())
-            .addCallAdapterFactory(CoroutineCallAdapterFactory())
             .build()
 
     val devbytes = retrofit.create(DevbyteService::class.java)
-
 }
-
-
diff --git a/...tarter/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt b/...tarter/app/src/main/java/com/example/android/devbyteviewer/viewmodels/DevByteViewModel.kt
@@ -110,7 +110,7 @@ class DevByteViewModel(application: Application) : AndroidViewModel(application)
     private fun refreshDataFromNetwork() = viewModelScope.launch {
 
         try {
-             val playlist = DevByteNetwork.devbytes.getPlaylist().await()
+             val playlist = DevByteNetwork.devbytes.getPlaylist()
             _playlist.postValue(playlist.asDomainModel())
 
             _eventNetworkError.value = false