Merge pull request #131 from TimerTiTi/129-fix-release-103

Release 1.0.3
TimerTiTi · Jun 2, 2024 · 076523d · 076523d
2 parents 6f37114 + 6ef694c
commit 076523d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git 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.* <methods>;
@@ -72,4 +73,9 @@
 }
 
 -keepattributes Signature
--keepclassmembers class com.titi.app.feature.setting.model.** {*;}
+-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 { *; }
diff --git 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"
 }
diff --git 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<ApplicationExtension>()
 
-internal val Project.libraryExtension: CommonExtension<*, *, *, *, *>
+internal val Project.libraryExtension: CommonExtension<*, *, *, *, *, *>
     get() = extensions.getByType<LibraryExtension>()
 
-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<VersionCatalogsExtension>().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)
     }
 }
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
@@ -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<Version>()
+                        ?.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
@@ -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<Version>()?.let {
+                        data.getValue(Version::class.java)?.let {
                             updates.add(it)
                         }
                     }

diff --git 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
@@ -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
@@ -1,4 +1,5 @@
-TiTi android dev 1.0.3(25)
+TiTi android dev 1.0.3(26)
 - 세팅 화면
 - 데일리 추가, 수정 로직 변경
-- 측정화면 activity -> screen
+- 측정화면 activity -> screen
+- proguard