Rename flaker-retrofit* -> flaker-okhttp

RotBolt · Aug 27, 2023 · b6bfe0d · b6bfe0d
1 parent 1c7f252
commit b6bfe0d
Show file tree

Hide file tree

Showing 28 changed files with 20 additions and 21 deletions.
diff --git a/flaker-android-retrofit/.gitignore → flaker-android-okhttp/.gitignore b/flaker-android-retrofit/.gitignore → flaker-android-okhttp/.gitignore
diff --git a/flaker-android-retrofit/build.gradle.kts → flaker-android-okhttp/build.gradle.kts b/flaker-android-retrofit/build.gradle.kts → flaker-android-okhttp/build.gradle.kts
@@ -42,7 +42,7 @@ android {
 dependencies {
 
     implementation(project(":flaker-android-ui"))
-    api(project(":flaker-retrofit-core"))
+    api(project(":flaker-okhttp-core"))
     implementation(project(":flaker-domain"))
     implementation(project(":flaker-data"))
 

diff --git a/flaker-android-retrofit/consumer-rules.pro → flaker-android-okhttp/consumer-rules.pro b/flaker-android-retrofit/consumer-rules.pro → flaker-android-okhttp/consumer-rules.pro
diff --git a/flaker-android-retrofit/proguard-rules.pro → flaker-android-okhttp/proguard-rules.pro b/flaker-android-retrofit/proguard-rules.pro → flaker-android-okhttp/proguard-rules.pro
diff --git a/...ndroidretrofit/ExampleInstrumentedTest.kt → ...ndroidretrofit/ExampleInstrumentedTest.kt b/...ndroidretrofit/ExampleInstrumentedTest.kt → ...ndroidretrofit/ExampleInstrumentedTest.kt
diff --git a/...oid-retrofit/src/main/AndroidManifest.xml → ...droid-okhttp/src/main/AndroidManifest.xml b/...oid-retrofit/src/main/AndroidManifest.xml → ...droid-okhttp/src/main/AndroidManifest.xml
diff --git a/...akerandroidretrofit/FlakerIntentAction.kt → ...akerandroidretrofit/FlakerIntentAction.kt b/...akerandroidretrofit/FlakerIntentAction.kt → ...akerandroidretrofit/FlakerIntentAction.kt
diff --git a/...ofit/di/FlakerAndroidRetrofitContainer.kt → ...trofit/di/FlakerAndroidOkhttpContainer.kt b/...ofit/di/FlakerAndroidRetrofitContainer.kt → ...trofit/di/FlakerAndroidOkhttpContainer.kt
@@ -9,9 +9,9 @@ import io.rotlabs.di.FlakerDataContainer
 import io.rotlabs.flakerandroidretrofit.ui.FlakerViewModel
 import io.rotlabs.flakerdb.networkrequest.data.NetworkRequestRepo
 import io.rotlabs.flakerprefs.PrefDataStore
-import io.rotlabs.flakerretrofit.di.FlakerRetrofitCoreContainer
+import io.rotlabs.flakerretrofit.di.FlakerOkHttpCoreContainer
 
-object FlakerAndroidRetrofitContainer {
+object FlakerAndroidOkhttpContainer {
 
     private var networkRequestRepo: NetworkRequestRepo? = null
 
@@ -22,9 +22,9 @@ object FlakerAndroidRetrofitContainer {
     private fun prefDataStore() = prefDataStore!!
 
     fun install(appContext: Context) {
-        FlakerRetrofitCoreContainer.install(FlakerDataContainer(appContext))
-        networkRequestRepo = FlakerRetrofitCoreContainer.networkRequestRepo()
-        prefDataStore = FlakerRetrofitCoreContainer.prefDataStore()
+        FlakerOkHttpCoreContainer.install(FlakerDataContainer(appContext))
+        networkRequestRepo = FlakerOkHttpCoreContainer.networkRequestRepo()
+        prefDataStore = FlakerOkHttpCoreContainer.prefDataStore()
     }
 
     fun flakerViewModelFactory(): ViewModelProvider.Factory = viewModelFactory {

diff --git a/...lakerandroidretrofit/ui/FlakerActivity.kt → ...lakerandroidretrofit/ui/FlakerActivity.kt b/...lakerandroidretrofit/ui/FlakerActivity.kt → ...lakerandroidretrofit/ui/FlakerActivity.kt
@@ -19,7 +19,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import io.rotlabs.flakerandroidretrofit.di.FlakerAndroidRetrofitContainer
+import io.rotlabs.flakerandroidretrofit.di.FlakerAndroidOkhttpContainer
 import io.rotlabs.flakerandroidui.components.appbars.FlakerBar
 import io.rotlabs.flakerandroidui.components.lists.NetworkRequestList
 import io.rotlabs.flakerandroidui.screens.prefs.FlakerPrefsDialog
@@ -29,7 +29,7 @@ import io.rotlabs.flakerandroidui.theme.FlakerAndroidTheme
 @OptIn(ExperimentalMaterial3Api::class)
 class FlakerActivity : ComponentActivity() {
 
-    private val viewModel: FlakerViewModel by viewModels { FlakerAndroidRetrofitContainer.flakerViewModelFactory() }
+    private val viewModel: FlakerViewModel by viewModels { FlakerAndroidOkhttpContainer.flakerViewModelFactory() }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

diff --git a/...akerandroidretrofit/ui/FlakerViewModel.kt → ...akerandroidretrofit/ui/FlakerViewModel.kt b/...akerandroidretrofit/ui/FlakerViewModel.kt → ...akerandroidretrofit/ui/FlakerViewModel.kt
diff --git a/...-retrofit/src/main/res/values/strings.xml → ...id-okhttp/src/main/res/values/strings.xml b/...-retrofit/src/main/res/values/strings.xml → ...id-okhttp/src/main/res/values/strings.xml
diff --git a/flaker-android/build.gradle.kts b/flaker-android/build.gradle.kts
@@ -42,7 +42,7 @@ android {
 dependencies {
 
     implementation(project(":flaker-android-ui"))
-    implementation(project(":flaker-retrofit-core"))
+    implementation(project(":flaker-okhttp-core"))
     implementation(project(":flaker-ktor-core"))
 
     implementation(libs.core.ktx)

diff --git a/flaker-retrofit-core/.gitignore → flaker-okhttp-core/.gitignore b/flaker-retrofit-core/.gitignore → flaker-okhttp-core/.gitignore
diff --git a/flaker-retrofit-core/build.gradle.kts → flaker-okhttp-core/build.gradle.kts b/flaker-retrofit-core/build.gradle.kts → flaker-okhttp-core/build.gradle.kts
diff --git a/flaker-retrofit-core/consumer-rules.pro → flaker-okhttp-core/consumer-rules.pro b/flaker-retrofit-core/consumer-rules.pro → flaker-okhttp-core/consumer-rules.pro
diff --git a/flaker-retrofit-core/proguard-rules.pro → flaker-okhttp-core/proguard-rules.pro b/flaker-retrofit-core/proguard-rules.pro → flaker-okhttp-core/proguard-rules.pro
diff --git a/...flakerretrofit/ExampleInstrumentedTest.kt → ...flakerretrofit/ExampleInstrumentedTest.kt b/...flakerretrofit/ExampleInstrumentedTest.kt → ...flakerretrofit/ExampleInstrumentedTest.kt
diff --git a/...etrofit-core/src/main/AndroidManifest.xml → ...-okhttp-core/src/main/AndroidManifest.xml b/...etrofit-core/src/main/AndroidManifest.xml → ...-okhttp-core/src/main/AndroidManifest.xml
diff --git a/...tlabs/flakerretrofit/FlakerInterceptor.kt → ...tlabs/flakerretrofit/FlakerInterceptor.kt b/...tlabs/flakerretrofit/FlakerInterceptor.kt → ...tlabs/flakerretrofit/FlakerInterceptor.kt
@@ -3,7 +3,7 @@ package io.rotlabs.flakerretrofit
 import io.rotlabs.flakedomain.networkrequest.NetworkRequest
 import io.rotlabs.flakerdb.networkrequest.data.NetworkRequestRepo
 import io.rotlabs.flakerprefs.PrefDataStore
-import io.rotlabs.flakerretrofit.di.FlakerRetrofitCoreContainer
+import io.rotlabs.flakerretrofit.di.FlakerOkHttpCoreContainer
 import io.rotlabs.flakerretrofit.dto.FlakerFailResponse
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
@@ -93,8 +93,8 @@ class FlakerInterceptor private constructor(
         }
 
         fun build(): FlakerInterceptor {
-            val networkRequestRepo = FlakerRetrofitCoreContainer.networkRequestRepo()
-            val prefDataStore = FlakerRetrofitCoreContainer.prefDataStore()
+            val networkRequestRepo = FlakerOkHttpCoreContainer.networkRequestRepo()
+            val prefDataStore = FlakerOkHttpCoreContainer.prefDataStore()
             return FlakerInterceptor(failResponse, prefDataStore, networkRequestRepo)
         }
     }

diff --git a/...etrofit/di/FlakerRetrofitCoreContainer.kt → ...rretrofit/di/FlakerOkHttpCoreContainer.kt b/...etrofit/di/FlakerRetrofitCoreContainer.kt → ...rretrofit/di/FlakerOkHttpCoreContainer.kt
@@ -4,7 +4,7 @@ import io.rotlabs.di.FlakerDataContainer
 import io.rotlabs.flakerdb.networkrequest.data.NetworkRequestRepo
 import io.rotlabs.flakerprefs.PrefDataStore
 
-object FlakerRetrofitCoreContainer {
+object FlakerOkHttpCoreContainer {
 
     private var networkRequestRepo: NetworkRequestRepo? = null
 

diff --git a/.../flakerretrofit/dto/FlakerFailResponse.kt → .../flakerretrofit/dto/FlakerFailResponse.kt b/.../flakerretrofit/dto/FlakerFailResponse.kt → .../flakerretrofit/dto/FlakerFailResponse.kt
diff --git a/.../io/rotlabs/flakerretrofit/FakeContext.kt → .../io/rotlabs/flakerretrofit/FakeContext.kt b/.../io/rotlabs/flakerretrofit/FakeContext.kt → .../io/rotlabs/flakerretrofit/FakeContext.kt
diff --git a/...s/flakerretrofit/FlakerInterceptorTest.kt → ...s/flakerretrofit/FlakerInterceptorTest.kt b/...s/flakerretrofit/FlakerInterceptorTest.kt → ...s/flakerretrofit/FlakerInterceptorTest.kt
@@ -2,7 +2,7 @@ package io.rotlabs.flakerretrofit
 
 import io.rotlabs.flakerprefs.RetentionPolicy
 import io.rotlabs.flakerprefs.dto.FlakerPrefs
-import io.rotlabs.flakerretrofit.di.FlakerRetrofitCoreContainer
+import io.rotlabs.flakerretrofit.di.FlakerOkHttpCoreContainer
 import io.rotlabs.flakerretrofit.dto.FlakerFailResponse
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
@@ -30,7 +30,7 @@ class FlakerInterceptorTest {
 
     @Before
     fun setup() {
-        FlakerRetrofitCoreContainer.install(testDataDependencyContainer)
+        FlakerOkHttpCoreContainer.install(testDataDependencyContainer)
     }
 
     @Test

diff --git a/...labs/flakerretrofit/MainDispatcherRule.kt → ...labs/flakerretrofit/MainDispatcherRule.kt b/...labs/flakerretrofit/MainDispatcherRule.kt → ...labs/flakerretrofit/MainDispatcherRule.kt
diff --git a/...tlabs/flakerretrofit/TestDataContainer.kt → ...tlabs/flakerretrofit/TestDataContainer.kt b/...tlabs/flakerretrofit/TestDataContainer.kt → ...tlabs/flakerretrofit/TestDataContainer.kt
diff --git a/flakersampleapp/build.gradle.kts b/flakersampleapp/build.gradle.kts
@@ -69,6 +69,5 @@ dependencies {
     androidTestImplementation(libs.ui.test.junit4)
     debugImplementation(libs.ui.tooling)
     debugImplementation(libs.ui.test.manifest)
-
-    implementation(project(":flaker-android-retrofit"))
+    implementation(project(":flaker-android-okhttp"))
 }
diff --git a/flakersampleapp/src/main/java/io/rotlabs/flakersampleapp/MainApplication.kt b/flakersampleapp/src/main/java/io/rotlabs/flakersampleapp/MainApplication.kt
@@ -1,7 +1,7 @@
 package io.rotlabs.flakersampleapp
 
 import android.app.Application
-import io.rotlabs.flakerandroidretrofit.di.FlakerAndroidRetrofitContainer
+import io.rotlabs.flakerandroidretrofit.di.FlakerAndroidOkhttpContainer
 import io.rotlabs.flakersampleapp.di.AppContainer
 
 class MainApplication : Application() {
@@ -10,7 +10,7 @@ class MainApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        FlakerAndroidRetrofitContainer.install(this)
+        FlakerAndroidOkhttpContainer.install(this)
         appContainer = AppContainer()
     }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -15,9 +15,9 @@ dependencyResolutionManagement {
 
 rootProject.name = "Flaker"
 include(":flaker-android-ui")
-include(":flaker-retrofit-core")
+include(":flaker-okhttp-core")
 include(":flaker-ktor-core")
-include(":flaker-android-retrofit")
+include(":flaker-android-okhttp")
 include(":flaker-android-ktor")
 include(":flaker-android")
 include(":flaker-data")