Merge remote-tracking branch 'origin/android-main' into Feature/#48-프…

…로필_화면_구현 # Conflicts: # android/2023-emmsale/app/build.gradle.kts
woowacourse-teams · Aug 1, 2023 · bf98e2b · bf98e2b
2 parents f35a5de + c2b4c00
commit bf98e2b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/android/2023-emmsale/app/build.gradle.kts b/android/2023-emmsale/app/build.gradle.kts
@@ -31,12 +31,24 @@ android {
         buildConfig = true
     }
     buildTypes {
+        getByName("debug") {
+            isMinifyEnabled = true
+            configure<CrashlyticsExtension> {
+                mappingFileUploadEnabled = false
+            }
+        }
+
         getByName("release") {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            configure<CrashlyticsExtension> {
+                nativeSymbolUploadEnabled = true
+                strippedNativeLibsDir = "$buildDir/ndklibs/obj"
+                unstrippedNativeLibsDir = "$buildDir/ndklibs/libs"
+            }
         }
     }
     compileOptions {
@@ -55,6 +67,21 @@ android {
             events.addAll(arrayOf(org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED, org.gradle.api.tasks.testing.logging.TestLogEvent.SKIPPED, org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED))
         }
     }
+    flavorDimensions += "environment"
+    productFlavors {
+        create("staging") {
+            dimension = "environment"
+            configure<CrashlyticsExtension> {
+                mappingFileUploadEnabled = false
+            }
+        }
+        create("prod") {
+            dimension = "environment"
+            configure<CrashlyticsExtension> {
+                mappingFileUploadEnabled = true
+            }
+        }
+    }
 }
 
 fun getApiKey(propertyKey: String): String {
@@ -74,18 +101,19 @@ dependencies {
     implementation("com.google.firebase:firebase-messaging-ktx:23.2.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
-    implementation("androidx.fragment:fragment-ktx:1.6.0")
+    implementation("androidx.fragment:fragment-ktx:1.6.1")
     implementation("com.squareup.retrofit2:retrofit:2.9.0")
     implementation("com.squareup.okhttp3:okhttp:4.11.0")
     implementation("com.squareup.okhttp3:mockwebserver:4.11.0")
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
     implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
     implementation("com.github.bumptech.glide:glide:4.15.1")
-    implementation("de.hdodenhof:circleimageview:3.1.0")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
 
     implementation(platform("com.google.firebase:firebase-bom:32.2.0"))
     implementation("com.google.firebase:firebase-analytics-ktx")
+    implementation("com.google.firebase:firebase-messaging-ktx")
+    implementation("com.google.firebase:firebase-crashlytics-ktx")
     implementation("com.google.firebase:firebase-messaging:23.2.0")
 
     testImplementation("org.junit.jupiter", "junit-jupiter", "5.8.2")

diff --git a/android/2023-emmsale/build.gradle.kts b/android/2023-emmsale/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     id("com.android.application") version "8.0.2" apply false
     id("com.android.library") version agpVersion apply false
     id("com.google.gms.google-services") version "4.3.15" apply false
+    id("com.google.firebase.crashlytics") version "2.9.7" apply false
 
     val kotlinVersion = "1.8.20"
     kotlin("android") version kotlinVersion apply false