Upgrade to OkHttp 4

shanbit200 · Nov 19, 2019 · c03db2d · c03db2d
1 parent 332ad29
commit c03db2d
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -46,7 +46,7 @@ buildscript { scriptHandler ->
             'material'           : '1.1.0-alpha05',
             'mockito'            : '2.23.0',
             'mockito_kotlin'     : '2.0.0-RC3',
-            'okhttp'             : '3.10.0',
+            'okhttp'             : '4.0.0',
             'retrofit'           : '2.6.0',
             'room'               : '2.1.0',
             'supportLibrary'     : '28.0.0',

diff --git a/core/src/main/java/io/plaidapp/core/dagger/ProductHuntModule.kt b/core/src/main/java/io/plaidapp/core/dagger/ProductHuntModule.kt
@@ -75,7 +75,7 @@ class ProductHuntModule {
     ): Retrofit {
         return Retrofit.Builder()
             .baseUrl(ProductHuntService.ENDPOINT)
-            .callFactory { okhttpClient.get().newCall(it) }
+            .callFactory(okhttpClient.get())
             .addConverterFactory(deEnvelopingConverter)
             .addConverterFactory(converterFactory)
             .build()

diff --git a/core/src/main/java/io/plaidapp/core/dagger/designernews/DesignerNewsDataModule.kt b/core/src/main/java/io/plaidapp/core/dagger/designernews/DesignerNewsDataModule.kt
@@ -78,7 +78,7 @@ class DesignerNewsDataModule {
     ): DesignerNewsService {
         return Retrofit.Builder()
             .baseUrl(DesignerNewsService.ENDPOINT)
-            .callFactory { client.get().newCall(it) }
+            .callFactory(client.get())
             .addConverterFactory(DeEnvelopingConverter(gson))
             .addConverterFactory(DesignerNewsSearchConverter.Factory())
             .addConverterFactory(GsonConverterFactory.create(gson))

diff --git a/core/src/main/java/io/plaidapp/core/dagger/dribbble/DribbbleDataModule.kt b/core/src/main/java/io/plaidapp/core/dagger/dribbble/DribbbleDataModule.kt
@@ -51,7 +51,7 @@ class DribbbleDataModule {
     ): DribbbleSearchService =
         Retrofit.Builder()
             .baseUrl(DribbbleSearchService.ENDPOINT)
-            .callFactory { client.get().newCall(it) }
+            .callFactory(client.get())
             .addConverterFactory(converterFactory)
             .build()
             .create(DribbbleSearchService::class.java)

diff --git a/core/src/main/java/io/plaidapp/core/designernews/data/api/ClientAuthInterceptor.kt b/core/src/main/java/io/plaidapp/core/designernews/data/api/ClientAuthInterceptor.kt
@@ -36,7 +36,7 @@ class ClientAuthInterceptor(
             requestBuilder.addHeader("Authorization",
                     "Bearer ${authTokenDataSource.authToken}")
         } else {
-            val url = chain.request().url().newBuilder()
+            val url = chain.request().url.newBuilder()
                     .addQueryParameter("client_id", clientId).build()
             requestBuilder.url(url)
         }

diff --git a/core/src/test/java/io/plaidapp/core/designernews/TestData.kt b/core/src/test/java/io/plaidapp/core/designernews/TestData.kt
@@ -33,7 +33,7 @@ val user = User(
     portraitUrl = "www"
 )
 
-val errorResponseBody = ResponseBody.create(MediaType.parse(""), "Error")!!
+val errorResponseBody = ResponseBody.create(MediaType.parse(""), "Error")
 
 const val userId = 123L
 

diff --git a/core/src/test/java/io/plaidapp/core/producthunt/data/TestData.kt b/core/src/test/java/io/plaidapp/core/producthunt/data/TestData.kt
@@ -22,7 +22,7 @@ import okhttp3.MediaType
 import okhttp3.ResponseBody
 import retrofit2.Response
 
-val errorResponseBody = ResponseBody.create(MediaType.parse(""), "Error")!!
+val errorResponseBody = ResponseBody.create(MediaType.parse(""), "Error")
 
 val post1 = GetPostItemResponse(
     id = 345L,
@@ -47,9 +47,9 @@ val post2 = GetPostItemResponse(
 
 val responseDataSuccess = GetPostsResponse(posts = listOf(post1, post2))
 
-val responseSuccess = Response.success(responseDataSuccess)!!
+val responseSuccess = Response.success(responseDataSuccess)
 
 val responseError = Response.error<GetPostsResponse>(
     400,
     errorResponseBody
-)!!
+)
diff --git a/designernews/src/main/java/io/plaidapp/designernews/dagger/DataModule.kt b/designernews/src/main/java/io/plaidapp/designernews/dagger/DataModule.kt
@@ -44,7 +44,7 @@ class DataModule {
     ): DesignerNewsService {
         return Retrofit.Builder()
             .baseUrl(DesignerNewsService.ENDPOINT)
-            .callFactory { client.get().newCall(it) }
+            .callFactory(client.get())
             .addConverterFactory(DeEnvelopingConverter(gson))
             .addConverterFactory(GsonConverterFactory.create(gson))
             .build()

diff --git a/designernews/src/main/java/io/plaidapp/designernews/data/api/ClientAuthInterceptor.kt b/designernews/src/main/java/io/plaidapp/designernews/data/api/ClientAuthInterceptor.kt
@@ -36,7 +36,7 @@ class ClientAuthInterceptor(
             requestBuilder.addHeader("Authorization",
                     "Bearer ${authTokenDataSource.authToken}")
         } else {
-            val url = chain.request().url().newBuilder()
+            val url = chain.request().url.newBuilder()
                     .addQueryParameter("client_id", clientId).build()
             requestBuilder.url(url)
         }