diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e609cb45..6acfdd53 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -23,8 +23,8 @@ android { applicationId = "com.eatssu.android" minSdk = 28 targetSdk = 35 - versionCode = 45 - versionName = "3.1.7" + versionCode = 46 + versionName = "3.1.8" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index c8461761..a14e469a 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -27,10 +27,7 @@ # https://firebase.google.com/docs/database/android/start?hl=ko -keepattributes Signature --keep class com.eatssu.android.data.dto.** { - *; -} --keep class com.eatssu.android.data.enums.** { +-keep class com.eatssu.android.data.remote.dto.** { *; } -keep class com.eatssu.android.data.model.** { diff --git a/app/src/main/java/com/eatssu/android/data/remote/repository/FirebaseRemoteConfigRepositoryImpl.kt b/app/src/main/java/com/eatssu/android/data/remote/repository/FirebaseRemoteConfigRepositoryImpl.kt index b546c994..2aad4884 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/repository/FirebaseRemoteConfigRepositoryImpl.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/repository/FirebaseRemoteConfigRepositoryImpl.kt @@ -7,7 +7,6 @@ import com.eatssu.common.enums.Restaurant import com.google.firebase.remoteconfig.FirebaseRemoteConfig import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings import com.google.gson.Gson -import com.google.gson.reflect.TypeToken import kotlinx.coroutines.tasks.await import timber.log.Timber import javax.inject.Inject @@ -60,8 +59,7 @@ class FirebaseRemoteConfigRepositoryImpl @Inject constructor( private fun parseCafeteriaJson(json: String): List { return try { val gson = Gson() - val listType = object : TypeToken>() {}.type - val dtoList: List = gson.fromJson(json, listType) + val dtoList = gson.fromJson(json, Array::class.java) ?: emptyArray() dtoList.map { dto -> RestaurantInfo(