Update project

michaelbel · Mar 31, 2024 · 228bc0b · 228bc0b
1 parent 6ac6226
commit 228bc0b
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 11 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -57,7 +57,7 @@ android {
         compileSdk = libs.versions.compile.sdk.get().toInt()
         targetSdk = libs.versions.target.sdk.get().toInt()
         versionCode = gitCommitsCount
-        versionName = versionLastTag
+        versionName = "2.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         resourceConfigurations.addAll(listOf("en", "ru"))

diff --git a/core/platform-services/foss-kmp/build.gradle.kts b/core/platform-services/foss-kmp/build.gradle.kts
@@ -16,6 +16,8 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(libs.bundles.kotlinx.coroutines.common)
+            implementation(libs.bundles.koin.common)
         }
     }
 }

diff --git a/...foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/...foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
@@ -0,0 +1,5 @@
+package org.michaelbel.movies.platform.impl
+
+import org.koin.dsl.module
+
+val platformKoinModule = module {}
diff --git a/...mp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt b/...mp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt
@@ -1,7 +1,6 @@
 package org.michaelbel.movies.platform.impl.review
 
 import android.app.Activity
-import javax.inject.Inject
 import org.michaelbel.movies.platform.review.ReviewService
 
 class ReviewServiceImpl: ReviewService {

diff --git a/.../gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt b/.../gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt
@@ -12,7 +12,7 @@ import org.koin.dsl.module
 
 private const val FETCH_INTERVAL_IN_SECONDS = 5L
 
-val firebaseKoinModule = module {
+internal val firebaseKoinModule = module {
     single { Firebase.analytics }
     single { FirebaseCrashlytics.getInstance() }
     single { FirebaseMessaging.getInstance() }

diff --git a/...gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt b/...gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt
@@ -3,6 +3,6 @@ package org.michaelbel.movies.platform.impl
 import com.google.android.gms.common.GoogleApiAvailability
 import org.koin.dsl.module
 
-val googleApiKoinModule = module {
+internal val googleApiKoinModule = module {
     single { GoogleApiAvailability.getInstance() }
 }
diff --git a/.../gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/.../gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
@@ -0,0 +1,11 @@
+package org.michaelbel.movies.platform.impl
+
+import org.koin.dsl.module
+
+val platformKoinModule = module {
+    includes(
+        firebaseKoinModule,
+        googleApiKoinModule,
+        playKoinModule
+    )
+}
diff --git a/...ices/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt b/...ices/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt
@@ -6,7 +6,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 import org.michaelbel.movies.platform.impl.update.InAppUpdate
 
-val playKoinModule = module {
+internal val playKoinModule = module {
     single { ReviewManagerFactory.create(androidContext()) }
     single { AppUpdateManagerFactory.create(androidContext()) }
     single { InAppUpdate(get(), get()) }

diff --git a/core/platform-services/hms-kmp/build.gradle.kts b/core/platform-services/hms-kmp/build.gradle.kts
@@ -16,6 +16,8 @@ kotlin {
     sourceSets {
         commonMain.dependencies {
             implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(libs.bundles.kotlinx.coroutines.common)
+            implementation(libs.bundles.koin.common)
         }
     }
 }

diff --git a/.../hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/.../hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt
@@ -0,0 +1,5 @@
+package org.michaelbel.movies.platform.impl
+
+import org.koin.dsl.module
+
+val platformKoinModule = module {}
diff --git a/...p/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt b/...p/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt
@@ -11,10 +11,8 @@ import org.michaelbel.movies.platform.impl.analytics.AnalyticsServiceImpl
 import org.michaelbel.movies.platform.impl.app.AppServiceImpl
 import org.michaelbel.movies.platform.impl.config.ConfigServiceImpl
 import org.michaelbel.movies.platform.impl.crashlytics.CrashlyticsServiceImpl
-import org.michaelbel.movies.platform.impl.firebaseKoinModule
-import org.michaelbel.movies.platform.impl.googleApiKoinModule
 import org.michaelbel.movies.platform.impl.messaging.MessagingServiceImpl
-import org.michaelbel.movies.platform.impl.playKoinModule
+import org.michaelbel.movies.platform.impl.platformKoinModule
 import org.michaelbel.movies.platform.impl.review.ReviewServiceImpl
 import org.michaelbel.movies.platform.impl.update.UpdateServiceImpl
 import org.michaelbel.movies.platform.messaging.MessagingService
@@ -23,9 +21,7 @@ import org.michaelbel.movies.platform.update.UpdateService
 
 val flavorServiceKtorModule = module {
     includes(
-        firebaseKoinModule,
-        googleApiKoinModule,
-        playKoinModule
+        platformKoinModule
     )
     singleOf(::AnalyticsServiceImpl) { bind<AnalyticsService>() }
     singleOf(::AppServiceImpl) { bind<AppService>() }