Skip to content

Commit ebd81ae

Browse files
committed
feat: Update project config and fix lint errors
1 parent f56df54 commit ebd81ae

File tree

7 files changed

+13
-19
lines changed

7 files changed

+13
-19
lines changed

build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
plugins {
2-
id("org.jetbrains.kotlin.jvm").version("1.4.10")
2+
kotlin("jvm") version "1.4.21"
33
id("org.jetbrains.dokka") version "1.4.10"
44
maven
55
}
@@ -11,7 +11,7 @@ repositories {
1111
}
1212

1313
val test by tasks.getting(Test::class) {
14-
useJUnitPlatform { }
14+
useJUnitPlatform()
1515
}
1616

1717
tasks.wrapper {
@@ -20,14 +20,14 @@ tasks.wrapper {
2020

2121
dependencies {
2222

23-
val coroutinesVersion = "1.3.9"
23+
val coroutinesVersion = "1.4.2"
2424
val retrofitVersion = "2.9.0"
25-
val okHttpVersion = "4.8.1"
25+
val okHttpVersion = "4.9.0"
2626

27-
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
28-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
29-
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
30-
implementation("com.squareup.okhttp3:okhttp:$okHttpVersion")
27+
api("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
28+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
29+
api("com.squareup.retrofit2:retrofit:$retrofitVersion")
30+
api("com.squareup.okhttp3:okhttp:$okHttpVersion")
3131

3232
testImplementation("com.squareup.okhttp3:mockwebserver:$okHttpVersion")
3333
testImplementation("com.google.guava:guava:26.0-jre")

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.haroldadmin.cnradapter
33
import kotlinx.coroutines.Deferred
44
import retrofit2.CallAdapter
55
import retrofit2.Retrofit
6-
import java.lang.IllegalStateException
76
import java.lang.reflect.ParameterizedType
87
import java.lang.reflect.Type
98

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.haroldadmin.cnradapter
22

33
import okhttp3.Request
44
import okhttp3.ResponseBody
5+
import okio.Timeout
56
import retrofit2.Call
67
import retrofit2.Callback
78
import retrofit2.Converter
@@ -52,5 +53,5 @@ internal class NetworkResponseCall<S : Any, E : Any>(
5253

5354
override fun request(): Request = backingCall.request()
5455

55-
override fun timeout() = backingCall.timeout()
56+
override fun timeout(): Timeout = backingCall.timeout()
5657
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package com.haroldadmin.cnradapter
22

3-
import com.haroldadmin.cnradapter.CompletableCall
4-
import com.haroldadmin.cnradapter.NetworkResponse
5-
import com.haroldadmin.cnradapter.NetworkResponseCall
63
import io.kotlintest.matchers.types.shouldBeTypeOf
74
import io.kotlintest.matchers.types.shouldNotBeSameInstanceAs
85
import io.kotlintest.shouldBe
@@ -20,8 +17,8 @@ internal class NetworkResponseCallTest: AnnotationSpec() {
2017

2118
@Before
2219
fun setup() {
23-
backingCall = CompletableCall<String>()
24-
networkResponseCall = NetworkResponseCall<String, String>(backingCall, errorConverter, String::class.java)
20+
backingCall = CompletableCall()
21+
networkResponseCall = NetworkResponseCall(backingCall, errorConverter, String::class.java)
2522
}
2623

2724
@Test(expected = UnsupportedOperationException::class)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import io.kotlintest.Spec
44
import io.kotlintest.shouldBe
55
import io.kotlintest.shouldNotBe
66
import io.kotlintest.specs.DescribeSpec
7-
import kotlinx.coroutines.runBlocking
87
import okhttp3.mockwebserver.MockResponse
98
import okhttp3.mockwebserver.MockWebServer
109
import okhttp3.mockwebserver.SocketPolicy

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.haroldadmin.cnradapter
22

3-
import okhttp3.MediaType
43
import okhttp3.MediaType.Companion.toMediaTypeOrNull
54
import okhttp3.RequestBody
65
import okhttp3.RequestBody.Companion.toRequestBody

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ internal inline fun <reified T> typeOf(): Type = object : TypeToken<T>() {}.type
1414
* "/error_response.json"
1515
*/
1616
internal fun Any.resourceFileContents(filename: String): String {
17-
val contents = this::class.java.getResourceAsStream(filename).bufferedReader().use { br ->
17+
return this::class.java.getResourceAsStream(filename).bufferedReader().use { br ->
1818
br.readText()
1919
}
20-
return contents
2120
}

0 commit comments

Comments
 (0)