Skip to content

Commit 239db4f

Browse files
authored
Merge pull request #370 from Runnect/feature/update-dependencies
전체 의존성 라이브러리 최신화
2 parents 970254f + 33569bf commit 239db4f

9 files changed

Lines changed: 46 additions & 47 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ dependencies {
118118
implementation libs.glide
119119
ksp libs.glide.ksp
120120
implementation libs.coil
121+
implementation libs.coil.network.okhttp
121122

122123
// Firebase
123124
implementation platform(libs.firebase.bom)

app/src/main/java/com/runnect/runnect/di/ServiceModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.runnect.runnect.di
22

33
import com.google.firebase.firestore.FirebaseFirestore
4-
import com.google.firebase.firestore.ktx.firestore
5-
import com.google.firebase.ktx.Firebase
4+
import com.google.firebase.Firebase
5+
import com.google.firebase.firestore.firestore
66
import com.runnect.runnect.data.service.CourseService
77
import com.runnect.runnect.data.service.LoginService
88
import com.runnect.runnect.data.service.ReverseGeocodingService

app/src/main/java/com/runnect/runnect/presentation/MainActivity.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import android.content.Intent
55
import android.os.Bundle
66
import android.view.View
77
import androidx.core.net.toUri
8-
import com.google.firebase.ktx.Firebase
9-
import com.google.firebase.remoteconfig.ktx.remoteConfig
10-
import com.google.firebase.remoteconfig.ktx.remoteConfigSettings
8+
import com.google.firebase.Firebase
9+
import com.google.firebase.remoteconfig.remoteConfig
10+
import com.google.firebase.remoteconfig.remoteConfigSettings
1111
import com.runnect.runnect.BuildConfig.REMOTE_KEY_APP_VERSION
1212
import com.runnect.runnect.R
1313
import com.runnect.runnect.binding.BindingActivity

app/src/main/java/com/runnect/runnect/presentation/detail/CourseDetailActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import android.widget.EditText
1111
import androidx.activity.OnBackPressedCallback
1212
import androidx.activity.viewModels
1313
import androidx.core.view.isVisible
14-
import coil.load
14+
import coil3.load
1515
import com.google.firebase.dynamiclinks.DynamicLink
1616
import com.google.firebase.dynamiclinks.FirebaseDynamicLinks
1717
import com.naver.maps.geometry.LatLng

app/src/main/java/com/runnect/runnect/presentation/mypage/history/adapter/MyHistoryAdapter.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.view.View
55
import android.view.ViewGroup
66
import androidx.recyclerview.widget.ListAdapter
77
import androidx.recyclerview.widget.RecyclerView
8-
import coil.load
8+
import coil3.load
99
import com.bumptech.glide.Glide
1010
import com.bumptech.glide.load.DecodeFormat
1111
import com.runnect.runnect.data.dto.HistoryInfoDTO
@@ -50,7 +50,8 @@ class MyHistoryAdapter(
5050
RecyclerView.ViewHolder(binding.root) {
5151
fun onBind(data: HistoryInfoDTO) {
5252
with(binding) {
53-
Glide.with(itemView).load(data.img).thumbnail(0.3f)
53+
Glide.with(itemView).load(data.img)
54+
.thumbnail(Glide.with(itemView).load(data.img).sizeMultiplier(0.3f))
5455
.format(DecodeFormat.PREFER_RGB_565)
5556
.into(ivMyPageHistoryCourse)
5657

app/src/main/java/com/runnect/runnect/presentation/mypage/reward/adapter/MyRewardAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MyRewardAdapter :
1717
with(binding) {
1818
Glide.with(itemView)
1919
.load(data.img)
20-
.thumbnail(0.3f)
20+
.thumbnail(Glide.with(itemView).load(data.img).sizeMultiplier(0.3f))
2121
.into(ivItemMyPageRewardCircleFrame)
2222
tvItemMyPageRewardCondition.text = data.condition
2323
}

app/src/main/java/com/runnect/runnect/presentation/mypage/upload/adapter/MyUploadAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class MyUploadAdapter(
6666

6767
Glide.with(itemView)
6868
.load(data.img)
69-
.thumbnail(0.3f)
69+
.thumbnail(Glide.with(itemView).load(data.img).sizeMultiplier(0.3f))
7070
.format(DecodeFormat.PREFER_RGB_565).into(ivMyPageUploadCourse)
7171

7272
tvMyPageUploadCourseTitle.text = data.title

app/src/main/java/com/runnect/runnect/util/binding/BindingAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.runnect.runnect.util.binding
33
import android.widget.ImageView
44
import androidx.appcompat.widget.AppCompatButton
55
import androidx.databinding.BindingAdapter
6-
import coil.load
6+
import coil3.load
77
import com.bumptech.glide.Glide
88
import com.bumptech.glide.load.DecodeFormat
99

@@ -46,7 +46,7 @@ fun AppCompatButton.updateEditFinishButtonBackground(
4646
fun ImageView.setDiscoverItemImage(imageUrl: String?) {
4747
Glide.with(context)
4848
.load(imageUrl)
49-
.thumbnail(0.3f)
49+
.thumbnail(Glide.with(context).load(imageUrl).sizeMultiplier(0.3f))
5050
.format(DecodeFormat.PREFER_RGB_565)
5151
.into(this)
5252
}

gradle/libs.versions.toml

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
# SDK
3-
compileSdk = "35"
3+
compileSdk = "36"
44
minSdk = "28"
55
targetSdk = "35"
66

@@ -14,55 +14,53 @@ kotlin = "2.2.0"
1414
ksp = "2.2.0-2.0.2"
1515

1616
# AndroidX
17-
core-ktx = "1.9.0"
18-
appcompat = "1.5.1"
19-
constraintlayout = "2.1.4"
20-
activity-ktx = "1.6.1"
21-
activity-compose = "1.9.0"
22-
fragment-ktx = "1.5.5"
23-
lifecycle = "2.8.2"
24-
recyclerview = "1.3.0"
25-
viewpager2 = "1.0.0"
26-
swiperefreshlayout = "1.1.0"
17+
core-ktx = "1.18.0"
18+
appcompat = "1.7.1"
19+
constraintlayout = "2.2.1"
20+
activity-ktx = "1.13.0"
21+
activity-compose = "1.13.0"
22+
fragment-ktx = "1.8.9"
23+
lifecycle = "2.10.0"
24+
recyclerview = "1.4.0"
25+
viewpager2 = "1.1.0"
26+
swiperefreshlayout = "1.2.0"
2727
preference-ktx = "1.2.1"
28-
security-crypto = "1.1.0-alpha03"
28+
security-crypto = "1.1.0"
2929

3030
# Compose
31-
compose-bom = "2023.03.00"
31+
compose-bom = "2026.03.01"
3232

3333
# Material
34-
material = "1.8.0"
34+
material = "1.13.0"
3535

3636
# Hilt
3737
hilt = "2.56.2"
3838

3939
# Network
4040
retrofit = "2.9.0"
41-
okhttp-bom = "4.10.0"
42-
kotlinx-serialization-json = "1.4.1"
43-
retrofit2-kotlinx-serialization = "0.8.0"
44-
gson = "2.10.1"
41+
okhttp-bom = "4.12.0"
42+
kotlinx-serialization-json = "1.10.0"
43+
retrofit2-kotlinx-serialization = "1.0.0"
44+
gson = "2.13.2"
4545

4646
# Coroutines
47-
coroutines = "1.6.4"
47+
coroutines = "1.10.2"
4848

4949
# Image
50-
glide = "4.16.0"
51-
coil = "2.2.2"
50+
glide = "5.0.5"
51+
coil = "3.4.0"
5252

5353
# Firebase
54-
firebase-bom = "31.2.3"
54+
firebase-bom = "33.14.0"
5555
firebase-crashlytics-gradle = "3.0.6"
56-
google-services = "4.3.15"
56+
google-services = "4.4.4"
5757

5858
# Map
59-
naver-map = "3.22.1"
59+
naver-map = "3.23.2"
6060
play-services-location = "21.3.0"
6161

6262
# Kakao
63-
kakao-sdk = "2.15.0"
64-
kakao-link = "2.9.0"
65-
kakao-login-legacy = "2.10.0"
63+
kakao-sdk = "2.23.3"
6664

6765
# Google
6866
play-services-auth = "20.4.1"
@@ -76,7 +74,7 @@ scalablelayout = "2.1.6"
7674
shimmer = "0.5.0"
7775

7876
# Permission
79-
tedpermission = "3.3.0"
77+
tedpermission = "3.4.2"
8078

8179
# Secrets
8280
secrets-gradle-plugin = "2.0.1"
@@ -86,8 +84,8 @@ foojay = "0.10.0"
8684

8785
# Test
8886
junit = "4.13.2"
89-
androidx-junit = "1.1.5"
90-
espresso = "3.5.1"
87+
androidx-junit = "1.3.0"
88+
espresso = "3.7.0"
9189

9290
[libraries]
9391
# AndroidX
@@ -139,7 +137,8 @@ kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-
139137
# Image
140138
glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "glide" }
141139
glide-ksp = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
142-
coil = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
140+
coil = { group = "io.coil-kt.coil3", name = "coil-android", version.ref = "coil" }
141+
coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
143142

144143
# Firebase (BOM 관리 - 개별 버전 불필요)
145144
firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebase-bom" }
@@ -159,8 +158,7 @@ play-services-location = { group = "com.google.android.gms", name = "play-servic
159158
# Kakao
160159
kakao-user = { group = "com.kakao.sdk", name = "v2-user", version.ref = "kakao-sdk" }
161160
kakao-talk = { group = "com.kakao.sdk", name = "v2-talk", version.ref = "kakao-sdk" }
162-
kakao-story = { group = "com.kakao.sdk", name = "v2-story", version.ref = "kakao-sdk" }
163-
kakao-link = { group = "com.kakao.sdk", name = "v2-link", version.ref = "kakao-link" }
161+
kakao-share = { group = "com.kakao.sdk", name = "v2-share", version.ref = "kakao-sdk" }
164162
kakao-navi = { group = "com.kakao.sdk", name = "v2-navi", version.ref = "kakao-sdk" }
165163

166164
# Google
@@ -196,8 +194,7 @@ firebase = [
196194
kakao = [
197195
"kakao-user",
198196
"kakao-talk",
199-
"kakao-story",
200-
"kakao-link",
197+
"kakao-share",
201198
"kakao-navi",
202199
]
203200
compose = [

0 commit comments

Comments
 (0)