build cleanup

buildSrc/src/main/java/Dependencies.kt

@@ -109,7 +109,6 @@ object Deps {
     object Ktor {
         const val serverCore = "io.ktor:ktor-server-core:${Versions.ktor}"
         const val serverNetty = "io.ktor:ktor-server-netty:${Versions.ktor}"
-        //const val serialization = "io.ktor:ktor-serialization:${Versions.ktor}"
         const val contentNegotiation = "io.ktor:ktor-client-content-negotiation:${Versions.ktor}"
         const val json = "io.ktor:ktor-serialization-kotlinx-json:${Versions.ktor}"
 

common/build.gradle.kts

@@ -28,18 +28,6 @@ android {
     }
 }
 
-// Workaround for https://youtrack.jetbrains.com/issue/KT-43944
-android {
-    configurations {
-        create("androidTestApi")
-        create("androidTestDebugApi")
-        create("androidTestReleaseApi")
-        create("testApi")
-        create("testDebugApi")
-        create("testReleaseApi")
-    }
-}
-
 kotlin {
     val iosTarget: (String, KotlinNativeTarget.() -> Unit) -> KotlinNativeTarget = when {
         System.getenv("SDK_NAME")?.startsWith("iphoneos") == true -> ::iosArm64
@@ -73,9 +61,6 @@ kotlin {
 
     sourceSets {
         sourceSets["commonMain"].dependencies {
-            implementation(Deps.Kotlinx.coroutinesCore) {
-                isForce = true
-            }
 
             with(Deps.Ktor) {
                 implementation(clientCore)
@@ -86,6 +71,7 @@ kotlin {
             }
 
             with(Deps.Kotlinx) {
+                implementation(Deps.Kotlinx.coroutinesCore)
                 implementation(serializationCore)
             }
 
@@ -111,10 +97,6 @@ kotlin {
             implementation(Deps.SqlDelight.androidDriver)
         }
         sourceSets["androidTest"].dependencies {
-            // having issue with following after update to Kotlin 1.5.21
-            // need to investigate further
-            //implementation(Deps.Test.kotlinTest)
-            //implementation(Deps.Test.kotlinTestJUnit)
             implementation(Deps.Test.junit)
         }
 

common/src/commonMain/kotlin/com/surrus/common/di/Koin.kt

@@ -42,7 +42,7 @@ fun createJson() = Json { isLenient = true; ignoreUnknownKeys = true }
 
 fun createHttpClient(httpClientEngine: HttpClientEngine, json: Json, enableNetworkLogs: Boolean) = HttpClient(httpClientEngine) {
     install(ContentNegotiation) {
-        json()
+        json(json)
     }
     if (enableNetworkLogs) {
         install(Logging) {