diff --git a/app/build.gradle b/app/build.gradle index 90b072dc6..c95ec1e86 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ plugins { id "moop.android.compose" id "moop.android.hilt" alias libs.plugins.firebase.crashlytics - alias libs.plugins.firebase.perf + alias libs.plugins.firebase.performance alias libs.plugins.dependencyGuard } if (file("google-services.json").exists()) { @@ -123,11 +123,11 @@ dependencies { implementation platform(libs.firebase.bom) implementation libs.firebase.analytics - implementation libs.firebase.config + implementation libs.firebase.cloudmessaging implementation libs.firebase.crashlytics - implementation libs.firebase.messaging - implementation libs.firebase.dynamicLinks - implementation libs.firebase.perf + implementation libs.firebase.dynamiclinks + implementation libs.firebase.performance + implementation libs.firebase.remoteconfig implementation libs.androidx.activity.compose implementation libs.androidx.hilt.navigation.compose diff --git a/app/dependencies/releaseRuntimeClasspath.txt b/app/dependencies/releaseRuntimeClasspath.txt index ab3ce7862..87633b0d6 100644 --- a/app/dependencies/releaseRuntimeClasspath.txt +++ b/app/dependencies/releaseRuntimeClasspath.txt @@ -81,6 +81,8 @@ androidx.navigation:navigation-compose:2.6.0-alpha08 androidx.navigation:navigation-runtime-ktx:2.6.0-alpha08 androidx.navigation:navigation-runtime:2.6.0-alpha08 androidx.print:print:1.0.0 +androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05 +androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05 androidx.profileinstaller:profileinstaller:1.3.0 androidx.recyclerview:recyclerview:1.0.0 androidx.resourceinspection:resourceinspection-annotation:1.0.1 @@ -112,8 +114,8 @@ com.google.accompanist:accompanist-pager:0.30.0 com.google.accompanist:accompanist-permissions:0.30.0 com.google.accompanist:accompanist-swiperefresh:0.30.0 com.google.android.datatransport:transport-api:3.0.0 -com.google.android.datatransport:transport-backend-cct:3.1.8 -com.google.android.datatransport:transport-runtime:3.1.8 +com.google.android.datatransport:transport-backend-cct:3.1.9 +com.google.android.datatransport:transport-runtime:3.1.9 com.google.android.gms:play-services-ads-base:21.3.0 com.google.android.gms:play-services-ads-identifier:18.0.0 com.google.android.gms:play-services-ads-lite:21.3.0 @@ -123,12 +125,12 @@ com.google.android.gms:play-services-base:18.0.1 com.google.android.gms:play-services-basement:18.1.0 com.google.android.gms:play-services-cloud-messaging:17.0.1 com.google.android.gms:play-services-location:16.0.0 -com.google.android.gms:play-services-measurement-api:21.2.0 -com.google.android.gms:play-services-measurement-base:21.2.0 -com.google.android.gms:play-services-measurement-impl:21.2.0 -com.google.android.gms:play-services-measurement-sdk-api:21.2.0 -com.google.android.gms:play-services-measurement-sdk:21.2.0 -com.google.android.gms:play-services-measurement:21.2.0 +com.google.android.gms:play-services-measurement-api:21.5.0 +com.google.android.gms:play-services-measurement-base:21.5.0 +com.google.android.gms:play-services-measurement-impl:21.5.0 +com.google.android.gms:play-services-measurement-sdk-api:21.5.0 +com.google.android.gms:play-services-measurement-sdk:21.5.0 +com.google.android.gms:play-services-measurement:21.5.0 com.google.android.gms:play-services-places-placereport:16.0.0 com.google.android.gms:play-services-stats:17.0.2 com.google.android.gms:play-services-tasks:18.0.2 @@ -142,37 +144,35 @@ com.google.dagger:dagger-lint-aar:2.48.1 com.google.dagger:dagger:2.48.1 com.google.dagger:hilt-android:2.48.1 com.google.dagger:hilt-core:2.48.1 -com.google.errorprone:error_prone_annotations:2.9.0 -com.google.firebase:firebase-abt:21.1.0 -com.google.firebase:firebase-analytics-ktx:21.2.0 -com.google.firebase:firebase-analytics:21.2.0 +com.google.errorprone:error_prone_annotations:2.11.0 +com.google.firebase:firebase-abt:21.1.1 +com.google.firebase:firebase-analytics:21.5.0 com.google.firebase:firebase-annotations:16.2.0 com.google.firebase:firebase-auth-interop:20.0.0 -com.google.firebase:firebase-bom:31.2.0 -com.google.firebase:firebase-common-ktx:20.3.0 -com.google.firebase:firebase-common:20.3.0 -com.google.firebase:firebase-components:17.1.0 -com.google.firebase:firebase-config-ktx:21.2.1 -com.google.firebase:firebase-config:21.2.1 -com.google.firebase:firebase-crashlytics-ktx:18.3.3 -com.google.firebase:firebase-crashlytics:18.3.3 -com.google.firebase:firebase-datatransport:18.1.7 -com.google.firebase:firebase-dynamic-links-ktx:21.1.0 -com.google.firebase:firebase-dynamic-links:21.1.0 -com.google.firebase:firebase-encoders-json:18.0.0 +com.google.firebase:firebase-bom:32.5.0 +com.google.firebase:firebase-common-ktx:20.4.2 +com.google.firebase:firebase-common:20.4.2 +com.google.firebase:firebase-components:17.1.5 +com.google.firebase:firebase-config:21.5.0 +com.google.firebase:firebase-crashlytics:18.5.1 +com.google.firebase:firebase-datatransport:18.1.8 +com.google.firebase:firebase-dynamic-links:21.2.0 +com.google.firebase:firebase-encoders-json:18.0.1 com.google.firebase:firebase-encoders-proto:16.0.0 com.google.firebase:firebase-encoders:17.0.0 com.google.firebase:firebase-iid-interop:17.1.0 -com.google.firebase:firebase-installations-interop:17.1.0 -com.google.firebase:firebase-installations:17.1.0 +com.google.firebase:firebase-installations-interop:17.1.1 +com.google.firebase:firebase-installations:17.2.0 com.google.firebase:firebase-measurement-connector:19.0.0 -com.google.firebase:firebase-messaging-ktx:23.1.1 -com.google.firebase:firebase-messaging:23.1.1 -com.google.firebase:firebase-perf-ktx:20.3.1 -com.google.firebase:firebase-perf:20.3.1 +com.google.firebase:firebase-messaging:23.3.1 +com.google.firebase:firebase-perf:20.5.0 +com.google.firebase:firebase-sessions:1.1.0 com.google.firebase:protolite-well-known-types:18.0.0 -com.google.guava:listenablefuture:1.0 -com.google.protobuf:protobuf-javalite:3.17.3 +com.google.guava:failureaccess:1.0.1 +com.google.guava:guava:31.1-android +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +com.google.j2objc:j2objc-annotations:1.3 +com.google.protobuf:protobuf-javalite:3.21.11 com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0 com.jakewharton.timber:timber:5.0.1 com.kakao.sdk:v2-common:2.13.0 @@ -201,6 +201,7 @@ io.github.fornewid:material-motion-compose-navigation:1.0.0 io.github.fornewid:naver-map-compose:1.3.3 io.github.fornewid:photo-compose:1.0.0 javax.inject:javax.inject:1 +org.checkerframework:checker-qual:3.12.0 org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.5.21 org.jetbrains.kotlin:kotlin-parcelize-runtime:1.5.21 org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10 diff --git a/app/src/main/java/soup/movie/config/RemoteConfig.kt b/app/src/main/java/soup/movie/config/RemoteConfig.kt index 14365d858..5e28dac81 100644 --- a/app/src/main/java/soup/movie/config/RemoteConfig.kt +++ b/app/src/main/java/soup/movie/config/RemoteConfig.kt @@ -15,10 +15,10 @@ */ package soup.movie.config -import com.google.firebase.ktx.Firebase +import com.google.firebase.Firebase import com.google.firebase.remoteconfig.FirebaseRemoteConfig -import com.google.firebase.remoteconfig.ktx.remoteConfig -import com.google.firebase.remoteconfig.ktx.remoteConfigSettings +import com.google.firebase.remoteconfig.remoteConfig +import com.google.firebase.remoteconfig.remoteConfigSettings import soup.movie.R class RemoteConfig : Config { diff --git a/build.gradle b/build.gradle index 7457e3186..6acfdd415 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { alias(libs.plugins.ksp) apply false alias(libs.plugins.dependencyGuard) apply false alias(libs.plugins.firebase.crashlytics) apply false - alias(libs.plugins.firebase.perf) apply false + alias(libs.plugins.firebase.performance) apply false } apply from: "$rootDir/gradle/version.gradle" diff --git a/core/ads/build.gradle b/core/ads/build.gradle index 64d2fd3c0..0269b8dd8 100644 --- a/core/ads/build.gradle +++ b/core/ads/build.gradle @@ -17,8 +17,8 @@ dependencies { implementation libs.compose.foundation implementation libs.compose.ui - implementation libs.google.ads - implementation libs.androidx.constraintlayout + implementation libs.google.admob + implementation libs.androidx.constraintlayout implementation libs.androidx.lifecycle.runtime } diff --git a/feature/deeplink/build.gradle b/feature/deeplink/build.gradle index ebb8d0710..91b54a5bd 100644 --- a/feature/deeplink/build.gradle +++ b/feature/deeplink/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation libs.kotlin.stdlib implementation platform(libs.firebase.bom) - implementation libs.firebase.dynamicLinks + implementation libs.firebase.dynamiclinks implementation libs.kakaoLink } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0a4de2bb4..424a45778 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,6 @@ # Android androidGradlePlugin = "8.1.4" -gms = "4.3.14" # Kotlin kotlin = "1.9.10" @@ -21,6 +20,13 @@ navigation = "2.6.0-alpha08" room = "2.4.3" work = "2.8.1" +# Google +gms = "4.3.14" +admob = "21.3.0" +firebase-bom = "32.5.0" +firebase-crashlytics = "2.9.9" +firebase-perf = "1.4.2" + # Compose compose-bom = "2023.05.01" composeCompiler = "1.5.3" @@ -132,15 +138,16 @@ androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.2.0" # Google google-play-appUpdate = "com.google.android.play:app-update-ktx:2.0.1" -google-ads = "com.google.android.gms:play-services-ads:21.3.0" +google-admob = { module = "com.google.android.gms:play-services-ads", version.ref = "admob" } -firebase-bom = { module = "com.google.firebase:firebase-bom", version = "31.2.0" } -firebase-analytics = { module = "com.google.firebase:firebase-analytics-ktx" } -firebase-config = { module = "com.google.firebase:firebase-config-ktx" } -firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics-ktx" } -firebase-dynamicLinks = { module = "com.google.firebase:firebase-dynamic-links-ktx" } -firebase-messaging = { module = "com.google.firebase:firebase-messaging-ktx" } -firebase-perf = { module = "com.google.firebase:firebase-perf-ktx" } +# https://firebase.google.com/support/release-notes/android#latest_sdk_versions +firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebase-bom" } +firebase-analytics = { module = "com.google.firebase:firebase-analytics" } +firebase-cloudmessaging = { module = "com.google.firebase:firebase-messaging" } +firebase-crashlytics = { module = "com.google.firebase:firebase-crashlytics" } +firebase-dynamiclinks = { module = "com.google.firebase:firebase-dynamic-links" } +firebase-performance = { module = "com.google.firebase:firebase-perf" } +firebase-remoteconfig = { module = "com.google.firebase:firebase-config" } # Etc @@ -166,5 +173,5 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } dependencyGuard = { id = "com.dropbox.dependency-guard", version.ref = "dependencyGuard" } -firebase-crashlytics = { id = "com.google.firebase.crashlytics", version = "2.9.2" } -firebase-perf = { id = "com.google.firebase.firebase-perf", version = "1.4.2" } +firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebase-crashlytics" } +firebase-performance = { id = "com.google.firebase.firebase-perf", version.ref = "firebase-perf" }