Merge pull request #27 from haroldadmin/development

Update project config and fix lint errors

Author: haroldadmin

build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.jvm").version("1.4.10")
+    kotlin("jvm") version "1.4.21"
     id("org.jetbrains.dokka") version "1.4.10"
     maven
 }
@@ -11,7 +11,7 @@ repositories {
 }
 
 val test by tasks.getting(Test::class) {
-    useJUnitPlatform { }
+    useJUnitPlatform()
 }
 
 tasks.wrapper {
@@ -20,14 +20,14 @@ tasks.wrapper {
 
 dependencies {
 
-    val coroutinesVersion = "1.3.9"
+    val coroutinesVersion = "1.4.2"
     val retrofitVersion = "2.9.0"
-    val okHttpVersion = "4.8.1"
+    val okHttpVersion = "4.9.0"
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
-    implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
-    implementation("com.squareup.okhttp3:okhttp:$okHttpVersion")
+    api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
+    api("com.squareup.retrofit2:retrofit:$retrofitVersion")
+    api("com.squareup.okhttp3:okhttp:$okHttpVersion")
 
     testImplementation("com.squareup.okhttp3:mockwebserver:$okHttpVersion")
     testImplementation("com.google.guava:guava:26.0-jre")

src/main/kotlin/com/haroldadmin/cnradapter/CoroutinesNetworkResponseAdapterFactory.kt

@@ -3,7 +3,6 @@ package com.haroldadmin.cnradapter
 import kotlinx.coroutines.Deferred
 import retrofit2.CallAdapter
 import retrofit2.Retrofit
-import java.lang.IllegalStateException
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
 

src/main/kotlin/com/haroldadmin/cnradapter/NetworkResponseCall.kt

@@ -2,6 +2,7 @@ package com.haroldadmin.cnradapter
 
 import okhttp3.Request
 import okhttp3.ResponseBody
+import okio.Timeout
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Converter
@@ -52,5 +53,5 @@ internal class NetworkResponseCall<S : Any, E : Any>(
 
     override fun request(): Request = backingCall.request()
 
-    override fun timeout() = backingCall.timeout()
+    override fun timeout(): Timeout = backingCall.timeout()
 }

src/test/kotlin/com/haroldadmin/cnradapter/NetworkResponseCallTest.kt

@@ -1,8 +1,5 @@
 package com.haroldadmin.cnradapter
 
-import com.haroldadmin.cnradapter.CompletableCall
-import com.haroldadmin.cnradapter.NetworkResponse
-import com.haroldadmin.cnradapter.NetworkResponseCall
 import io.kotlintest.matchers.types.shouldBeTypeOf
 import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
 import io.kotlintest.shouldBe
@@ -20,8 +17,8 @@ internal class NetworkResponseCallTest: AnnotationSpec() {
 
     @Before
     fun setup() {
-        backingCall = CompletableCall<String>()
-        networkResponseCall = NetworkResponseCall<String, String>(backingCall, errorConverter, String::class.java)
+        backingCall = CompletableCall()
+        networkResponseCall = NetworkResponseCall(backingCall, errorConverter, String::class.java)
     }
 
     @Test(expected = UnsupportedOperationException::class)

src/test/kotlin/com/haroldadmin/cnradapter/RetryTest.kt

@@ -4,7 +4,6 @@ import io.kotlintest.Spec
 import io.kotlintest.shouldBe
 import io.kotlintest.shouldNotBe
 import io.kotlintest.specs.DescribeSpec
-import kotlinx.coroutines.runBlocking
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.SocketPolicy

src/test/kotlin/com/haroldadmin/cnradapter/StringConverterFactory.kt

@@ -1,6 +1,5 @@
 package com.haroldadmin.cnradapter
 
-import okhttp3.MediaType
 import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.RequestBody
 import okhttp3.RequestBody.Companion.toRequestBody

src/test/kotlin/com/haroldadmin/cnradapter/TestExtensions.kt

@@ -14,8 +14,7 @@ internal inline fun <reified T> typeOf(): Type = object : TypeToken<T>() {}.type
  * "/error_response.json"
  */
 internal fun Any.resourceFileContents(filename: String): String {
-    val contents = this::class.java.getResourceAsStream(filename).bufferedReader().use { br ->
+    return this::class.java.getResourceAsStream(filename).bufferedReader().use { br ->
         br.readText()
     }
-    return contents
 }