Retrofit to Ktor (#275)

michaelbel · Mar 27, 2024 · b838612 · b838612
1 parent 37d2c4d
commit b838612
Show file tree

Hide file tree

Showing 26 changed files with 120 additions and 334 deletions.
diff --git a/core/network-kmp/build.gradle.kts b/core/network-kmp/build.gradle.kts
@@ -25,13 +25,13 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(libs.kotlinx.serialization.json)
+            implementation(libs.bundles.ktor.common)
             implementation(libs.bundles.koin.common)
         }
         androidMain.dependencies {
+            implementation(libs.bundles.ktor.android)
             implementation(libs.androidx.startup.runtime)
             implementation(libs.okhttp.logging.interceptor)
-            implementation(libs.bundles.retrofit)
-            implementation(libs.bundles.ktor)
             implementation(libs.flaker.android.okhttp)
             implementation(libs.koin.android)
         }

diff --git a/...network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/AccountNetworkService.kt b/...network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/AccountNetworkService.kt
diff --git a/...-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/AuthenticationNetworkService.kt b/...-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/AuthenticationNetworkService.kt
diff --git a/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/MovieNetworkService.kt b/core/network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/MovieNetworkService.kt
diff --git a/.../network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/SearchNetworkService.kt b/.../network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/SearchNetworkService.kt
diff --git a/.../network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/di/NetworkKoinModule.kt b/.../network-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/di/NetworkKoinModule.kt
@@ -5,16 +5,14 @@ import org.michaelbel.movies.network.AccountNetworkService
 import org.michaelbel.movies.network.AuthenticationNetworkService
 import org.michaelbel.movies.network.MovieNetworkService
 import org.michaelbel.movies.network.SearchNetworkService
-import org.michaelbel.movies.network.ktor.di.ktorNetworkKoinModule
-import org.michaelbel.movies.network.retrofit.di.retrofitNetworkKoinModule
+import org.michaelbel.movies.network.ktor.ktorNetworkKoinModule
 
 val networkKoinModule = module {
     includes(
-        ktorNetworkKoinModule,
-        retrofitNetworkKoinModule
+        ktorNetworkKoinModule
     )
-    single { AccountNetworkService(get(), get()) }
-    single { AuthenticationNetworkService(get(), get()) }
-    single { MovieNetworkService(get(), get()) }
-    single { SearchNetworkService(get(), get()) }
+    single { AccountNetworkService(get()) }
+    single { AuthenticationNetworkService(get()) }
+    single { MovieNetworkService(get()) }
+    single { SearchNetworkService(get()) }
 }
diff --git a/.../movies/network/ktor/di/KtorKoinModule.kt → ...bel/movies/network/ktor/KtorKoinModule.kt b/.../movies/network/ktor/di/KtorKoinModule.kt → ...bel/movies/network/ktor/KtorKoinModule.kt
@@ -1,4 +1,4 @@
-package org.michaelbel.movies.network.ktor.di
+package org.michaelbel.movies.network.ktor
 
 import com.chuckerteam.chucker.api.ChuckerInterceptor
 import io.github.rotbolt.flakerokhttpcore.FlakerInterceptor

diff --git a/...rk-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/KtorNetworkKoinModule.kt b/...rk-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/KtorNetworkKoinModule.kt
@@ -0,0 +1,13 @@
+package org.michaelbel.movies.network.ktor
+
+import org.koin.dsl.module
+
+val ktorNetworkKoinModule = module {
+    includes(
+        ktorKoinModule
+    )
+    single { KtorAccountService(get()) }
+    single { KtorAuthenticationService(get()) }
+    single { KtorMovieService(get()) }
+    single { KtorSearchService(get()) }
+}
diff --git a/...kmp/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorNetworkKoinModule.kt b/...kmp/src/androidMain/kotlin/org/michaelbel/movies/network/ktor/di/KtorNetworkKoinModule.kt
diff --git a/...p/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitAccountService.kt b/...p/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitAccountService.kt
diff --git a/...ndroidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitAuthenticationService.kt b/...ndroidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitAuthenticationService.kt
diff --git a/...kmp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitMovieService.kt b/...kmp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitMovieService.kt
diff --git a/...mp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitSearchService.kt b/...mp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/RetrofitSearchService.kt
diff --git a/...mp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/di/RetrofitKoinModule.kt b/...mp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/di/RetrofitKoinModule.kt
diff --git a/...androidMain/kotlin/org/michaelbel/movies/network/retrofit/di/RetrofitNetworkKoinModule.kt b/...androidMain/kotlin/org/michaelbel/movies/network/retrofit/di/RetrofitNetworkKoinModule.kt
diff --git a/...work-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/ktx/RetrofitKtx.kt b/...work-kmp/src/androidMain/kotlin/org/michaelbel/movies/network/retrofit/ktx/RetrofitKtx.kt
diff --git a/...roidMain/kotlin/org/michaelbel/movies/network/serialization/ConverterFactoryKoinModule.kt b/...roidMain/kotlin/org/michaelbel/movies/network/serialization/ConverterFactoryKoinModule.kt