Merge pull request #131 from depromeet/develop

v1.2.2 release

Author: hyuns66

.github/workflows/android_ci.yml

@@ -58,8 +58,10 @@ jobs:
       - name: Access local properties
         env:
           BASE_URL: ${{ secrets.BASE_URL }}
+          AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}
         run: |
           echo "dev.base.url=\"$BASE_URL\"" >> local.properties
+          echo "amplitude.dev.api.key=\"AMPLITUDE_API_KEY\"" >> local.properties
 
       # ✅ Lint Check
       - name: Lint Check

app/.DS_Store

@@ -16,16 +16,29 @@ val properties = Properties().apply {
 }
 
 android {
+    val keystorePath = properties["keystore.path"] as? String
+    val isSigningAvailable = !keystorePath.isNullOrBlank()
+
+    signingConfigs {
+        create("release") {
+            if (isSigningAvailable) {
+                storeFile = if (!keystorePath.isNullOrBlank()) file(keystorePath) else null
+                storePassword = properties["keystore.password"] as? String ?: ""
+                keyAlias = properties["keystore.alias"] as? String ?: ""
+                keyPassword = properties["key.password"] as? String ?: ""
+            }
+        }
+    }
+
     namespace = "com.depromeet.team6"
     compileSdk = 35
 
     defaultConfig {
-        manifestPlaceholders += mapOf()
         applicationId = "com.depromeet.team6"
         minSdk = 26
         targetSdk = 34
-        versionCode = 2
-        versionName = "1.0"
+        versionCode = 13
+        versionName = "1.2.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "KAKAO_NATIVE_APP_KEY", properties["kakao.native.app.key"].toString())
@@ -38,15 +51,18 @@ android {
             isMinifyEnabled = true
             isShrinkResources = true
             buildConfigField("String", "BASE_URL", properties["release.base.url"].toString())
+            buildConfigField("String", "AMPLITUDE_API_KEY", properties["amplitude.prod.api.key"].toString())
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            if (isSigningAvailable) signingConfig = signingConfigs.getByName("release")
         }
         debug {
             isMinifyEnabled = false
             isDebuggable = true
             buildConfigField("String", "BASE_URL", properties["dev.base.url"].toString())
+            buildConfigField("String", "AMPLITUDE_API_KEY", properties["amplitude.dev.api.key"].toString())
         }
     }
     compileOptions {
@@ -78,6 +94,7 @@ dependencies {
     implementation(libs.play.services.maps)
     implementation(libs.play.services.location)
     implementation(libs.play.services.auth)
+    implementation(libs.androidx.runtime.livedata)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -109,15 +126,35 @@ dependencies {
     implementation(libs.androidx.security.crypto)
 
     // Tmap
-    implementation(files("libs/tmap-sdk-1.8.aar"))
+    implementation(files("libs/tmap-sdk-1.9.aar"))
     implementation(files("libs/vsm-tmap-sdk-v2-android-1.7.23.aar"))
+    implementation(libs.flatbuffers.java)
 
     // Firebase
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
 
     // WebView
     implementation(libs.accompanist.webview)
+
+    // SplashScreen
+    implementation(libs.androidx.core.splashscreen)
+
+    // View Pager
+    implementation(libs.bundles.pager)
+
+    // Timber
+    implementation(libs.timber)
+
+    // Lottie
+    implementation(libs.lottie.compose)
+
+    // SystemUiController
+    implementation(libs.accompanist.systemuicontroller)
+
+    // Amplitude
+    implementation(libs.amplitude)
+    implementation(libs.play.services.appset)
 }
 java {
     toolchain {

app/build.gradle.kts

@@ -23,6 +23,12 @@
 -keep class com.kakao.sdk.**.model.* { <fields>; }
 -keep class * extends com.google.gson.TypeAdapter
 -keep interface com.kakao.sdk.**.*Api
+# Keep Gson model classes
+-keep class com.depromeet.team6.data.dataremote.model.** { *; }
+-keep class com.depromeet.team6.data.datalocal.model.** { *; }
+-keep class com.depromeet.team6.domain.model.** { *; }
+-keep class com.depromeet.team6.presentation.model.** { *; }
+-keep class com.depromeet.team6.data.dataremote.** { *; }
 
 -keepattributes Signature, InnerClasses, EnclosingMethod
 -keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
@@ -50,4 +56,12 @@
 -dontwarn org.bouncycastle.**
 -dontwarn org.openjsse.**
 -dontwarn com.google.flatbuffers.Struct
--dontwarn com.google.flatbuffers.Table
+-dontwarn com.google.flatbuffers.Table
+
+# Keep annotations
+-keepattributes *Annotation*
+
+# Optional: if you're using Retrofit + Gson
+-keep class retrofit2.** { *; }
+-keep class com.google.gson.** { *; }
+-keep class okhttp3.** { *; }