diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f35eecc..448120b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -63,6 +63,9 @@ dependencies { // AirMQ SDK implementation(project(":sdk")) + // OSM + implementation(libs.osmdroid.android) + // Android implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) @@ -80,13 +83,6 @@ dependencies { implementation(libs.androidx.hilt.navigation.compose) ksp(libs.hilt.compiler) - // Firebase - implementation(platform(libs.firebase.bom)) - implementation(libs.firebase.analytics) - implementation(libs.firebase.crashlytics) - implementation(libs.firebase.messaging) - implementation(libs.osmdroid.android) - // Tests testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/build.gradle.kts b/build.gradle.kts index 456f85c..59b3276 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,4 +7,5 @@ plugins { alias(libs.plugins.ksp) apply false alias(libs.plugins.apollo) apply false alias(libs.plugins.hilt.android) apply false + alias(libs.plugins.google.services) apply false } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 345efbc..b94fec8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,7 @@ hilt = "2.57.2" hiltNavigationCompose = "1.2.0" okhttpLogging = "4.12.0" ksp = "2.0.21-1.0.27" +google-services = "4.4.4" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -47,7 +48,6 @@ apollo-runtime = { group = "com.apollographql.apollo", name = "apollo-runtime", hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" } hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" } androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" } -okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttpLogging" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" } @@ -55,7 +55,7 @@ android-library = { id = "com.android.library", version.ref = "agp" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } apollo = { id = "com.apollographql.apollo", version.ref = "apollo" } -kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" } hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } +google-services = { id = "com.google.gms.google-services", version.ref = "google-services" } diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts index bc9d44f..700d970 100644 --- a/sdk/build.gradle.kts +++ b/sdk/build.gradle.kts @@ -2,6 +2,7 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.ksp) alias(libs.plugins.apollo) + alias(libs.plugins.google.services) } android { @@ -43,7 +44,16 @@ apollo { } dependencies { + // Apollo GraphQL implementation(libs.apollo.runtime) + + // Firebase + implementation(platform(libs.firebase.bom)) + implementation(libs.firebase.analytics) + implementation(libs.firebase.crashlytics) + implementation(libs.firebase.messaging) + + // Hilt implementation(libs.hilt.android) ksp(libs.hilt.compiler) } diff --git a/sdk/google-services.json b/sdk/google-services.json new file mode 100644 index 0000000..49e2197 --- /dev/null +++ b/sdk/google-services.json @@ -0,0 +1,75 @@ +{ + "project_info": { + "project_number": "223884730019", + "project_id": "db3-airmq-debug", + "storage_bucket": "db3-airmq-debug.firebasestorage.app" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:223884730019:android:ebe25591cd4c41c2562916", + "android_client_info": { + "package_name": "org.db3.airmq" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyCcgdvdp8xec2dKUqlQHl9peQAyOWRVga4" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "223884730019-1hkbacov3tem4snsih7vs218lt9ppvde.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + }, + { + "client_info": { + "mobilesdk_app_id": "1:223884730019:android:1345a64a13459de7562916", + "android_client_info": { + "package_name": "org.db3.airmq.debug" + } + }, + "oauth_client": [ + { + "client_id": "223884730019-0cobqn6haoga9n5o60lqcke9uglqihea.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "org.db3.airmq.debug", + "certificate_hash": "38547bbc27af278e820c78fc012227a40f64505f" + } + }, + { + "client_id": "223884730019-p44o1v2t3g6v0kmopsa65f0umf60ksif.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "org.db3.airmq.debug", + "certificate_hash": "195356c67cabf18c9ab0a8ccfcec45c3346b6b6c" + } + } + ], + "api_key": [ + { + "current_key": "AIzaSyCcgdvdp8xec2dKUqlQHl9peQAyOWRVga4" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "223884730019-1hkbacov3tem4snsih7vs218lt9ppvde.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file