From 228bc0bcc55ae9dcc3fe97ad8a75ae73c6e08b6c Mon Sep 17 00:00:00 2001 From: michaelbel Date: Sun, 31 Mar 2024 23:28:00 +0300 Subject: [PATCH] Update project --- androidApp/build.gradle.kts | 2 +- core/platform-services/foss-kmp/build.gradle.kts | 2 ++ .../movies/platform/impl/PlatformKoinModule.kt | 5 +++++ .../movies/platform/impl/review/ReviewServiceImpl.kt | 1 - .../movies/platform/impl/FirebaseKoinModule.kt | 2 +- .../movies/platform/impl/GoogleApiKoinModule.kt | 2 +- .../movies/platform/impl/PlatformKoinModule.kt | 11 +++++++++++ .../michaelbel/movies/platform/impl/PlayKoinModule.kt | 2 +- core/platform-services/hms-kmp/build.gradle.kts | 2 ++ .../movies/platform/impl/PlatformKoinModule.kt | 5 +++++ .../movies/platform/inject/FlavorServiceKtorModule.kt | 8 ++------ 11 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt create mode 100644 core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt create mode 100644 core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index b4260428d..f3980bca0 100644 --- 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 index bba21e9c0..92ced2a26 100644 --- 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/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt new file mode 100644 index 000000000..3e5a678a8 --- /dev/null +++ b/core/platform-services/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 {} \ No newline at end of file diff --git a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt b/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt index 1b6bb8f3e..7bfaa913f 100644 --- a/core/platform-services/foss-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/review/ReviewServiceImpl.kt +++ b/core/platform-services/foss-kmp/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/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt b/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt index 4f61b2292..a29892dce 100644 --- a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/FirebaseKoinModule.kt +++ b/core/platform-services/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/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt b/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt index 7113dffc3..587ca48de 100644 --- a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/GoogleApiKoinModule.kt +++ b/core/platform-services/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() } } \ No newline at end of file diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt new file mode 100644 index 000000000..0e4b94770 --- /dev/null +++ b/core/platform-services/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 + ) +} \ No newline at end of file diff --git a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt b/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt index e11fe3d32..812e2f215 100644 --- a/core/platform-services/gms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlayKoinModule.kt +++ b/core/platform-services/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 index c24efe12c..85b844378 100644 --- 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/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt b/core/platform-services/hms-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/impl/PlatformKoinModule.kt new file mode 100644 index 000000000..3e5a678a8 --- /dev/null +++ b/core/platform-services/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 {} \ No newline at end of file diff --git a/core/platform-services/inject-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt b/core/platform-services/inject-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt index 49428b432..4afd38757 100644 --- a/core/platform-services/inject-kmp/src/androidMain/kotlin/org/michaelbel/movies/platform/inject/FlavorServiceKtorModule.kt +++ b/core/platform-services/inject-kmp/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() } singleOf(::AppServiceImpl) { bind() }