diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 141b1628..5a4bcf10 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -50,6 +50,7 @@ -keep class com.titi.app.feature.main.model.** {*;} -keep class com.titi.app.feature.measure.model.** {*;} -keep class com.titi.app.feature.time.model.** {*;} +-keep class com.titi.app.feature.setting.model.** {*;} -keepclasseswithmembers class * { @com.squareup.moshi.* ; @@ -72,4 +73,9 @@ } -keepattributes Signature --keepclassmembers class com.titi.app.feature.setting.model.** {*;} \ No newline at end of file +-keepclassmembers class com.titi.app.feature.setting.model.** {*;} + +-keepclassmembers class com.google.firebase.database.** {*;} +-keep class com.google.firebase.database.** {*;} +-keepclassmembers class com.google.firebase.database.GenericTypeIndicator { *; } +-keep class com.google.firebase.database.GenericTypeIndicator { *; } \ No newline at end of file diff --git a/build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt b/build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt index 0812cfb8..9041324c 100644 --- a/build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt +++ b/build-logic/src/main/kotlin/com/titi/common/BuildInfo.kt @@ -10,6 +10,6 @@ object BuildType { object AppConfig { const val APP_ID = "com.titi.app" const val APP_VERSION_NAME = "1.0.3" - const val APP_VERSION_CODE = 25 + const val APP_VERSION_CODE = 26 const val APP_NAME = "TiTi" } \ No newline at end of file diff --git a/build-logic/src/main/kotlin/com/titi/common/Extensions.kt b/build-logic/src/main/kotlin/com/titi/common/Extensions.kt index 54ded446..cb25c145 100644 --- a/build-logic/src/main/kotlin/com/titi/common/Extensions.kt +++ b/build-logic/src/main/kotlin/com/titi/common/Extensions.kt @@ -9,13 +9,13 @@ import org.gradle.api.artifacts.VersionCatalogsExtension import org.gradle.api.plugins.ExtensionContainer import org.gradle.kotlin.dsl.getByType -internal val Project.applicationExtension: CommonExtension<*, *, *, *, *> +internal val Project.applicationExtension: CommonExtension<*, *, *, *, *, *> get() = extensions.getByType() -internal val Project.libraryExtension: CommonExtension<*, *, *, *, *> +internal val Project.libraryExtension: CommonExtension<*, *, *, *, *, *> get() = extensions.getByType() -internal val Project.androidExtension: CommonExtension<*, *, *, *, *> +internal val Project.androidExtension: CommonExtension<*, *, *, *, *, *> get() = runCatching { libraryExtension } .recoverCatching { applicationExtension } .onFailure { println("Could not find Library or Application extension from this project") } @@ -24,9 +24,9 @@ internal val Project.androidExtension: CommonExtension<*, *, *, *, *> internal val ExtensionContainer.libs: VersionCatalog get() = getByType().named("libs") -internal fun Project.android(action: CommonExtension<*, *, *, *, *>.() -> Unit) { +internal fun Project.android(action: CommonExtension<*, *, *, *, *, *>.() -> Unit) { val androidExtension = extensions.getByName("android") - if (androidExtension is CommonExtension<*, *, *, *, *>) { + if (androidExtension is CommonExtension<*, *, *, *, *, *>) { androidExtension.apply(action) } } \ No newline at end of file diff --git a/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/SettingScreen.kt b/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/SettingScreen.kt index e3d4276d..1091d968 100644 --- a/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/SettingScreen.kt +++ b/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/SettingScreen.kt @@ -38,7 +38,6 @@ import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.FirebaseDatabase import com.google.firebase.database.ValueEventListener -import com.google.firebase.database.getValue import com.titi.app.core.designsystem.R import com.titi.app.core.designsystem.component.TdsText import com.titi.app.core.designsystem.navigation.TdsBottomNavigationBar @@ -71,7 +70,7 @@ fun SettingScreen( val latestVersion = snapshot .children .lastOrNull() - ?.getValue() + ?.getValue(Version::class.java) ?.currentVersion val currentVersion = context diff --git a/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/UpdatesListScreen.kt b/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/UpdatesListScreen.kt index 278da84e..e7e4094a 100644 --- a/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/UpdatesListScreen.kt +++ b/feature/setting/src/main/kotlin/com/titi/app/feature/setting/ui/UpdatesListScreen.kt @@ -33,7 +33,6 @@ import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.FirebaseDatabase import com.google.firebase.database.ValueEventListener -import com.google.firebase.database.getValue import com.titi.app.core.designsystem.R import com.titi.app.core.designsystem.component.TdsIconButton import com.titi.app.core.designsystem.component.TdsText @@ -54,7 +53,7 @@ fun UpdatesListScreen(onNavigateUp: () -> Unit) { object : ValueEventListener { override fun onDataChange(snapshot: DataSnapshot) { for (data in snapshot.children) { - data.getValue()?.let { + data.getValue(Version::class.java)?.let { updates.add(it) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1370c2b6..eaffb6d4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ compileSdk = "34" targetSdk = "34" minSdk = "26" -agp = "8.3.0-alpha11" +agp = "8.3.2" kotlin = "1.9.21" coreKtx = "1.12.0" coroutine = "1.7.3" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 71ce15ba..14aaa515 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Sep 27 15:03:19 KST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/release-note.txt b/release-note.txt index 7eec99f6..9d5025ba 100644 --- a/release-note.txt +++ b/release-note.txt @@ -1,4 +1,5 @@ -TiTi android dev 1.0.3(25) +TiTi android dev 1.0.3(26) - 세팅 화면 - 데일리 추가, 수정 로직 변경 -- 측정화면 activity -> screen \ No newline at end of file +- 측정화면 activity -> screen +- proguard \ No newline at end of file