Merge pull request #211 from joreilly/kotlin-inject

remove unncessary expect/actual

Author: joreilly

common/src/androidMain/kotlin/dev/johnoreilly/common/actual.kt

@@ -1,10 +1,7 @@
 package dev.johnoreilly.common
 
-import io.ktor.client.engine.android.*
 import java.util.Locale
 
-actual val httpClientEngine = Android.create()
-
 actual fun getCountryName(countryCode: String): String {
     val locale = Locale("", countryCode)
     return locale.displayCountry

common/src/androidMain/kotlin/dev/johnoreilly/common/di/AndroidApplicationComponent.kt

@@ -3,6 +3,7 @@ package dev.johnoreilly.common.di
 import dev.johnoreilly.common.ui.CountryListScreen
 import dev.johnoreilly.common.ui.NetworkListScreen
 import dev.johnoreilly.common.ui.StationsScreen
+import io.ktor.client.engine.android.Android
 import me.tatarka.inject.annotations.Component
 
 
@@ -16,5 +17,7 @@ abstract class AndroidApplicationComponent: SharedApplicationComponent {
     abstract val networkListScreen: NetworkListScreen
     abstract val stationsScreen: StationsScreen
 
+    override fun getHttpClientEngine() = Android.create()
+
     companion object
 }

common/src/commonMain/kotlin/dev/johnoreilly/common/di/SharedApplicationComponent.kt

@@ -1,6 +1,5 @@
 package dev.johnoreilly.common.di
 
-import dev.johnoreilly.common.httpClientEngine
 import dev.johnoreilly.common.remote.CityBikesApi
 import dev.johnoreilly.common.repository.CityBikesRepository
 import dev.johnoreilly.common.repository.NetworkDb
@@ -49,7 +48,10 @@ interface SharedApplicationComponent {
         }
 
     @Provides
-    fun httpClient(): HttpClient = createHttpClient(httpClientEngine, json)
+    fun getHttpClientEngine(): HttpClientEngine
+
+    @Provides
+    fun httpClient(): HttpClient = createHttpClient(getHttpClientEngine(), json)
 }
 
 fun createHttpClient(httpClientEngine: HttpClientEngine, json: Json) = HttpClient(httpClientEngine) {

common/src/commonMain/kotlin/dev/johnoreilly/common/expect.kt

@@ -1,8 +1,3 @@
 package dev.johnoreilly.common
 
-import io.ktor.client.engine.HttpClientEngine
-
-
-expect val httpClientEngine: HttpClientEngine
-
 expect fun getCountryName(countryCode: String): String

common/src/iosMain/kotlin/dev/johnoreilly/common/actual.kt

@@ -1,13 +1,10 @@
 package dev.johnoreilly.common
 
-import io.ktor.client.engine.darwin.Darwin
 import platform.Foundation.NSLocale
 import platform.Foundation.NSLocaleCountryCode
 import platform.Foundation.currentLocale
 
 
-actual val httpClientEngine = Darwin.create()
-
 actual fun getCountryName(countryCode: String): String {
     return NSLocale.currentLocale.displayNameForKey(NSLocaleCountryCode, countryCode) ?: countryCode
 }

common/src/iosMain/kotlin/dev/johnoreilly/common/di/IosApplicationComponent.kt

@@ -1,11 +1,14 @@
 package dev.johnoreilly.common.di
 
+import io.ktor.client.engine.darwin.Darwin
 import me.tatarka.inject.annotations.Component
 
 
 @Component
 @Singleton
 abstract class IosApplicationComponent: SharedApplicationComponent {
 
+    override fun getHttpClientEngine() = Darwin.create()
+
     companion object
 }

common/src/jvmMain/kotlin/dev/johnoreilly/common/actual.kt

@@ -1,10 +1,7 @@
 package dev.johnoreilly.common
 
-import io.ktor.client.engine.java.*
 import java.util.Locale
 
-actual val httpClientEngine = Java.create()
-
 actual fun getCountryName(countryCode: String): String {
     val locale = Locale("", countryCode)
     return locale.displayCountry

common/src/jvmMain/kotlin/dev/johnoreilly/common/di/DesktopApplicationComponent.kt

@@ -1,10 +1,13 @@
 package dev.johnoreilly.common.di
 
+import io.ktor.client.engine.java.Java
 import me.tatarka.inject.annotations.Component
 
 @Component
 @Singleton
 abstract class DesktopApplicationComponent: SharedApplicationComponent {
 
+  override fun getHttpClientEngine() = Java.create()
+
   companion object
 }

common/src/macosMain/kotlin/dev/johnoreilly/common/actual.kt

@@ -1,13 +1,10 @@
 package dev.johnoreilly.common
 
-import io.ktor.client.engine.darwin.Darwin
 import platform.Foundation.NSLocale
 import platform.Foundation.NSLocaleCountryCode
 import platform.Foundation.currentLocale
 
 
-actual val httpClientEngine = Darwin.create()
-
 actual fun getCountryName(countryCode: String): String {
     return NSLocale.currentLocale.displayNameForKey(NSLocaleCountryCode, countryCode) ?: countryCode
 }