Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libraries #259

Merged
merged 4 commits into from
Dec 10, 2023
Merged

Update libraries #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aed20f
Update libraries for retrofit
fornewid Dec 10, 2023
1e518ec
Update libraries for kotlin, coroutines, ksp
fornewid Dec 10, 2023
346468f
Update libraries for hilt
fornewid Dec 10, 2023
b716d34
Fix wrong gradle scan
fornewid Dec 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions app/dependencies/releaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ androidx.emoji2:emoji2:1.4.0-alpha01
androidx.exifinterface:exifinterface:1.3.3
androidx.fragment:fragment-ktx:1.5.6
androidx.fragment:fragment:1.5.6
androidx.hilt:hilt-common:1.0.0
androidx.hilt:hilt-navigation-compose:1.0.0
androidx.hilt:hilt-navigation:1.0.0
androidx.hilt:hilt-work:1.0.0
androidx.hilt:hilt-common:1.1.0
androidx.hilt:hilt-navigation-compose:1.1.0
androidx.hilt:hilt-navigation:1.1.0
androidx.hilt:hilt-work:1.1.0
androidx.interpolator:interpolator:1.0.0
androidx.legacy:legacy-support-core-ui:1.0.0
androidx.legacy:legacy-support-core-utils:1.0.0
Expand Down Expand Up @@ -138,10 +138,10 @@ com.google.android.play:core-common:2.0.2
com.google.android.ump:user-messaging-platform:2.0.0
com.google.code.findbugs:jsr305:3.0.2
com.google.code.gson:gson:2.8.9
com.google.dagger:dagger-lint-aar:2.45
com.google.dagger:dagger:2.45
com.google.dagger:hilt-android:2.45
com.google.dagger:hilt-core:2.45
com.google.dagger:dagger-lint-aar:2.48.1
com.google.dagger:dagger:2.48.1
com.google.dagger:hilt-android:2.48.1
com.google.dagger:hilt-core:2.48.1
com.google.errorprone:error_prone_annotations:2.9.0
com.google.firebase:firebase-abt:21.1.0
com.google.firebase:firebase-analytics-ktx:21.2.0
Expand Down Expand Up @@ -173,7 +173,7 @@ com.google.firebase:firebase-perf:20.3.1
com.google.firebase:protolite-well-known-types:18.0.0
com.google.guava:listenablefuture:1.0
com.google.protobuf:protobuf-javalite:3.17.3
com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0
com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0
com.jakewharton.timber:timber:5.0.1
com.kakao.sdk:v2-common:2.13.0
com.kakao.sdk:v2-network:2.13.0
Expand Down Expand Up @@ -203,18 +203,18 @@ io.github.fornewid:photo-compose:1.0.0
javax.inject:javax.inject:1
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.5.21
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.5.21
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10
org.jetbrains.kotlin:kotlin-stdlib:1.8.10
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
org.jetbrains.kotlin:kotlin-stdlib:1.9.10
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.0
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.0
org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.0
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.0
org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0
org.jetbrains:annotations:20.1.0
org.jetbrains:annotations:23.0.0
2 changes: 1 addition & 1 deletion build-logic/convention/src/main/kotlin/soup/movie/buildlogic/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ package soup.movie.buildlogic

object Versions {
const val minSdk = 23
const val compileSdk = 33
const val compileSdk = 34
const val targetSdk = 33
}
18 changes: 10 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ androidGradlePlugin = "8.1.4"
gms = "4.3.14"

# Kotlin
kotlin = "1.8.10"
coroutines = "1.6.4"
kotlin = "1.9.10"
coroutines = "1.7.3"
serialization = "1.5.0"
ksp = "1.8.10-1.0.9"
ksp = "1.9.10-1.0.13"

# Dagger
dagger = "2.45"
androidxhilt = "1.0.0"
dagger = "2.48.1"
androidxhilt = "1.1.0"

# AndroidX
activity = "1.6.1"
Expand All @@ -23,7 +23,7 @@ work = "2.8.1"

# Compose
compose-bom = "2023.05.01"
composeCompiler = "1.4.4"
composeCompiler = "1.5.3"
accompanist = "0.30.0"
metronome = "0.5.2"
navermapcompose = "1.3.3"
Expand All @@ -34,6 +34,8 @@ photo = "1.0.0"
# Etc
coil = "2.2.2"
dependencyGuard = "0.3.2"
retrofit = "2.9.0"
retrofit-serialization = "1.0.0"


[libraries]
Expand Down Expand Up @@ -145,8 +147,8 @@ firebase-perf = { module = "com.google.firebase:firebase-perf-ktx" }
coil-runtime = { module = "io.coil-kt:coil", version.ref = "coil" }
coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }

retrofit-runtime = "com.squareup.retrofit2:retrofit:2.9.0"
retrofit-serialization = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0"
retrofit-runtime = { module = "com.squareup.retrofit2:retrofit" , version.ref = "retrofit"}
retrofit-serialization = { module = "com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter" , version.ref = "retrofit-serialization"}
kakaoLink = "com.kakao.sdk:v2-share:2.13.0"
naverMapCompose = { module = "io.github.fornewid:naver-map-compose", version.ref = "navermapcompose" }
timber = "com.jakewharton.timber:timber:5.0.1"
Expand Down
4 changes: 3 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ dependencyResolutionManagement {
content {
includeGroupByRegex("com.android.*")
includeGroupByRegex("androidx.*")
includeGroupByRegex("com.google.*")
includeGroupByRegex("com.google.android.*")
includeGroup("com.google.gms")
includeGroup("com.google.firebase")
}
}
maven {
Expand Down