Skip to content

Commit 906279e

Browse files
authored
Merge branch 'develop' into feat/remove_server_login
2 parents d033352 + 75c78bf commit 906279e

File tree

3 files changed

+18
-33
lines changed

3 files changed

+18
-33
lines changed

README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<br/>
1111
<div align="center">
1212
<p align="center">
13-
<img src="https://img.shields.io/badge/Kotlin-1.9.20-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white"/>
13+
<img src="https://img.shields.io/badge/Kotlin-2.1.20-7F52FF?style=for-the-badge&logo=Kotlin&logoColor=white"/>
1414
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
1515
<img src="https://img.shields.io/badge/all_contributors-3-orange.svg?style=for-the-badge"/>
1616
<!-- ALL-CONTRIBUTORS-BADGE:END -->
@@ -61,19 +61,6 @@
6161

6262
<!-- ALL-CONTRIBUTORS-LIST:END -->
6363

64-
# 시연영상
65-
## 온보딩 및 권한 추가
66-
https://github.com/Team-HMH/HMH-Android/assets/84266681/d5868d2f-9fc3-4bc8-b764-85877ee8c54f
67-
68-
## 앱 잠금 화면 및 챌린지 실패
69-
https://github.com/Team-HMH/HMH-Android/assets/93872496/c5fb98b2-6627-42a3-8e3b-796156e3af35
70-
71-
## 챌린지 실패 및 사용 연장
72-
https://github.com/Team-HMH/HMH-Android/assets/84266681/cacde6a4-b496-4214-a74d-189a02839cc6
73-
74-
## 앱 추가 및 삭제
75-
https://github.com/Team-HMH/HMH-Android/assets/84266681/a5d16efd-a870-41ba-8896-af3445e474f3
76-
7764

7865
## Folder Tree 📁
7966
``` kotlin
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.hmh.hamyeonham.core.network.point.model
22

3-
import com.google.gson.annotations.SerializedName
43
import kotlinx.serialization.Serializable
54

65
@Serializable
76
data class ChallengeDateRequest(
8-
@SerializedName("challengeDate")
97
val challengeDate: String
108
)

gradle/libs.versions.toml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ appVersion = "1.0.3"
66
versionCode = "1000301"
77

88
# kotlin
9-
kotlin = "2.1.0"
10-
kotlinx-serialization-json = "1.7.3"
9+
kotlin = "2.1.20"
10+
kotlinx-serialization-json = "1.8.1"
1111
kotlinx-serialization-converter = "1.0.0"
12-
kotlinx-coroutines = "1.10.1"
12+
kotlinx-coroutines = "1.10.2"
1313
kotlinx-datetime = "0.6.2"
14-
ksp = "2.1.0-1.0.29"
14+
ksp = "2.1.20-2.0.0"
1515

1616
# android
17-
corektx = "1.15.0"
17+
corektx = "1.16.0"
1818
appcompat = "1.7.0"
19-
activity = "1.10.0"
19+
activity = "1.10.1"
2020
lifecycle = "2.8.7"
21-
navigation = "2.8.6"
21+
navigation = "2.8.9"
2222
startup = "1.2.0"
23-
security = "1.1.0-alpha06"
24-
compose-bom = "2025.01.01"
25-
desugarJdk = "2.1.4"
23+
security = "1.1.0-alpha07"
24+
compose-bom = "2025.04.01"
25+
desugarJdk = "2.1.5"
2626
dagger-hilt = "2.54"
2727
flexbox = "3.0.0"
2828
fragment-ktx = "1.8.6"
2929
activity-compose = "1.7.2"
30-
exifInterface = "1.3.7"
30+
exifInterface = "1.4.1"
3131
zxing-core = "3.3.0"
3232
zxing-android-embedded = "4.3.0"
3333

@@ -38,8 +38,8 @@ in-app-update = "2.1.0"
3838
secret-gradle-plugin = "2.0.1"
3939
google-services = "4.4.2"
4040
crashlytics = "3.0.3"
41-
firebase = "33.9.0"
42-
admob = "23.6.0"
41+
firebase = "33.13.0"
42+
admob = "24.2.0"
4343
oss-plugin = "0.10.6"
4444
oss = "17.1.0"
4545

@@ -64,18 +64,18 @@ agp = "8.7.3"
6464
# third party
6565
okhttp = "4.12.0"
6666
retrofit = "2.11.0"
67-
room = "2.6.1"
67+
room = "2.7.1"
6868
coil = "2.7.0"
6969
lottie = "6.4.1"
7070
ktlint = "12.1.2"
7171
process-pheonix = "3.0.0"
72-
constraintlayout = "2.2.0"
72+
constraintlayout = "2.2.1"
7373
dot-indicator = "5.0"
74-
kakao = "2.20.6"
74+
kakao = "2.21.2"
7575
splash-screen = "1.0.1"
7676
javax-inject = "1"
7777
androidx-hilt = "1.2.0"
78-
work-runtime-ktx = "2.9.0"
78+
work-runtime-ktx = "2.10.1"
7979
timber = "5.0.1"
8080
amplitude = "2.+"
8181
hus = "0.0.5"

0 commit comments

Comments
 (0)