Skip to content

Commit bbfb122

Browse files
authored
Update libraries (#333)
1 parent f907a90 commit bbfb122

File tree

9 files changed

+144
-88
lines changed

9 files changed

+144
-88
lines changed

β€ŽCHECK.mdβ€Ž

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Check before PR
2+
3+
### Run all checks at once:
4+
5+
```bash
6+
./check.sh
7+
```
8+
9+
### Run checks individually
10+
11+
- dependencyGuard
12+
```bash
13+
./gradlew dependencyGuard
14+
```
15+
16+
- spotless
17+
```bash
18+
./gradlew spotlessCheck --init-script gradle/init.gradle.kts
19+
```
20+
21+
- lint
22+
```bash
23+
./gradlew lintDebug
24+
```
25+
26+
## Update baselines
27+
28+
- dependencyGuard
29+
```bash
30+
./gradlew dependencyGuardBaseline
31+
```
32+
33+
- spotless
34+
```bash
35+
./gradlew spotlessApply --init-script gradle/init.gradle.kts
36+
```

β€Žapp/dependencies/releaseRuntimeClasspath.txtβ€Ž

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ androidx.arch.core:core-common:2.2.0
1010
androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.0.0
1212
androidx.browser:browser:1.8.0
13-
androidx.collection:collection-jvm:1.4.5
14-
androidx.collection:collection-ktx:1.4.5
15-
androidx.collection:collection:1.4.5
13+
androidx.collection:collection-jvm:1.5.0
14+
androidx.collection:collection-ktx:1.5.0
15+
androidx.collection:collection:1.5.0
1616
androidx.compose.animation:animation-android:1.7.8
1717
androidx.compose.animation:animation-core-android:1.7.8
1818
androidx.compose.animation:animation-core:1.7.8
@@ -37,24 +37,24 @@ androidx.compose.material:material-icons-extended:1.7.8
3737
androidx.compose.material:material-ripple-android:1.7.8
3838
androidx.compose.material:material-ripple:1.7.8
3939
androidx.compose.material:material:1.7.8
40-
androidx.compose.runtime:runtime-android:1.7.8
41-
androidx.compose.runtime:runtime-saveable-android:1.7.8
42-
androidx.compose.runtime:runtime-saveable:1.7.8
43-
androidx.compose.runtime:runtime:1.7.8
44-
androidx.compose.ui:ui-android:1.7.8
45-
androidx.compose.ui:ui-geometry-android:1.7.8
46-
androidx.compose.ui:ui-geometry:1.7.8
47-
androidx.compose.ui:ui-graphics-android:1.7.8
48-
androidx.compose.ui:ui-graphics:1.7.8
49-
androidx.compose.ui:ui-text-android:1.7.8
50-
androidx.compose.ui:ui-text:1.7.8
51-
androidx.compose.ui:ui-tooling-preview-android:1.7.8
52-
androidx.compose.ui:ui-tooling-preview:1.7.8
53-
androidx.compose.ui:ui-unit-android:1.7.8
54-
androidx.compose.ui:ui-unit:1.7.8
55-
androidx.compose.ui:ui-util-android:1.7.8
56-
androidx.compose.ui:ui-util:1.7.8
57-
androidx.compose.ui:ui:1.7.8
40+
androidx.compose.runtime:runtime-android:1.8.2
41+
androidx.compose.runtime:runtime-saveable-android:1.8.2
42+
androidx.compose.runtime:runtime-saveable:1.8.2
43+
androidx.compose.runtime:runtime:1.8.2
44+
androidx.compose.ui:ui-android:1.8.2
45+
androidx.compose.ui:ui-geometry-android:1.8.2
46+
androidx.compose.ui:ui-geometry:1.8.2
47+
androidx.compose.ui:ui-graphics-android:1.8.2
48+
androidx.compose.ui:ui-graphics:1.8.2
49+
androidx.compose.ui:ui-text-android:1.8.2
50+
androidx.compose.ui:ui-text:1.8.2
51+
androidx.compose.ui:ui-tooling-preview-android:1.8.2
52+
androidx.compose.ui:ui-tooling-preview:1.8.2
53+
androidx.compose.ui:ui-unit-android:1.8.2
54+
androidx.compose.ui:ui-unit:1.8.2
55+
androidx.compose.ui:ui-util-android:1.8.2
56+
androidx.compose.ui:ui-util:1.8.2
57+
androidx.compose.ui:ui:1.8.2
5858
androidx.compose:compose-bom:2025.02.00
5959
androidx.concurrent:concurrent-futures-ktx:1.1.0
6060
androidx.concurrent:concurrent-futures:1.1.0
@@ -77,54 +77,57 @@ androidx.datastore:datastore-preferences-proto:1.1.3
7777
androidx.datastore:datastore-preferences:1.1.3
7878
androidx.datastore:datastore:1.1.3
7979
androidx.drawerlayout:drawerlayout:1.0.0
80-
androidx.emoji2:emoji2-views-helper:1.3.0
81-
androidx.emoji2:emoji2:1.3.0
80+
androidx.emoji2:emoji2-views-helper:1.4.0
81+
androidx.emoji2:emoji2:1.4.0
8282
androidx.exifinterface:exifinterface:1.3.7
8383
androidx.fragment:fragment:1.5.4
8484
androidx.graphics:graphics-path:1.0.1
85-
androidx.hilt:hilt-common:1.2.0
86-
androidx.hilt:hilt-navigation-compose:1.2.0
87-
androidx.hilt:hilt-navigation:1.2.0
88-
androidx.hilt:hilt-work:1.2.0
85+
androidx.hilt:hilt-common:1.3.0
86+
androidx.hilt:hilt-lifecycle-viewmodel-compose:1.3.0
87+
androidx.hilt:hilt-lifecycle-viewmodel:1.3.0
88+
androidx.hilt:hilt-navigation-compose:1.3.0
89+
androidx.hilt:hilt-work:1.3.0
8990
androidx.interpolator:interpolator:1.0.0
90-
androidx.lifecycle:lifecycle-common-java8:2.9.0-alpha11
91-
androidx.lifecycle:lifecycle-common-jvm:2.9.0-alpha11
92-
androidx.lifecycle:lifecycle-common:2.9.0-alpha11
93-
androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.0-alpha11
94-
androidx.lifecycle:lifecycle-livedata-core:2.9.0-alpha11
95-
androidx.lifecycle:lifecycle-livedata:2.9.0-alpha11
96-
androidx.lifecycle:lifecycle-process:2.9.0-alpha11
97-
androidx.lifecycle:lifecycle-runtime-android:2.9.0-alpha11
98-
androidx.lifecycle:lifecycle-runtime-compose-android:2.9.0-alpha11
99-
androidx.lifecycle:lifecycle-runtime-compose:2.9.0-alpha11
100-
androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.0-alpha11
101-
androidx.lifecycle:lifecycle-runtime-ktx:2.9.0-alpha11
102-
androidx.lifecycle:lifecycle-runtime:2.9.0-alpha11
103-
androidx.lifecycle:lifecycle-service:2.9.0-alpha11
104-
androidx.lifecycle:lifecycle-viewmodel-android:2.9.0-alpha11
105-
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.9.0-alpha11
106-
androidx.lifecycle:lifecycle-viewmodel-compose:2.9.0-alpha11
107-
androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.0-alpha11
108-
androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.0-alpha11
109-
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.0-alpha11
110-
androidx.lifecycle:lifecycle-viewmodel:2.9.0-alpha11
91+
androidx.lifecycle:lifecycle-common-java8:2.9.1
92+
androidx.lifecycle:lifecycle-common-jvm:2.9.1
93+
androidx.lifecycle:lifecycle-common:2.9.1
94+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.9.1
95+
androidx.lifecycle:lifecycle-livedata-core:2.9.1
96+
androidx.lifecycle:lifecycle-livedata:2.9.1
97+
androidx.lifecycle:lifecycle-process:2.9.1
98+
androidx.lifecycle:lifecycle-runtime-android:2.9.1
99+
androidx.lifecycle:lifecycle-runtime-compose-android:2.9.1
100+
androidx.lifecycle:lifecycle-runtime-compose:2.9.1
101+
androidx.lifecycle:lifecycle-runtime-ktx-android:2.9.1
102+
androidx.lifecycle:lifecycle-runtime-ktx:2.9.1
103+
androidx.lifecycle:lifecycle-runtime:2.9.1
104+
androidx.lifecycle:lifecycle-service:2.9.1
105+
androidx.lifecycle:lifecycle-viewmodel-android:2.9.1
106+
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.9.1
107+
androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
108+
androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1
109+
androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.1
110+
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
111+
androidx.lifecycle:lifecycle-viewmodel:2.9.1
111112
androidx.loader:loader:1.0.0
112-
androidx.navigation:navigation-common-android:2.9.0-alpha07
113-
androidx.navigation:navigation-common:2.9.0-alpha07
114-
androidx.navigation:navigation-compose-android:2.9.0-alpha07
115-
androidx.navigation:navigation-compose:2.9.0-alpha07
116-
androidx.navigation:navigation-runtime-android:2.9.0-alpha07
117-
androidx.navigation:navigation-runtime:2.9.0-alpha07
113+
androidx.navigation:navigation-common-android:2.9.6
114+
androidx.navigation:navigation-common:2.9.6
115+
androidx.navigation:navigation-compose-android:2.9.6
116+
androidx.navigation:navigation-compose:2.9.6
117+
androidx.navigation:navigation-runtime-android:2.9.6
118+
androidx.navigation:navigation-runtime:2.9.6
118119
androidx.profileinstaller:profileinstaller:1.4.1
119120
androidx.resourceinspection:resourceinspection-annotation:1.0.1
120121
androidx.room:room-common-jvm:2.7.0-rc01
121122
androidx.room:room-common:2.7.0-rc01
122123
androidx.room:room-ktx:2.7.0-rc01
123124
androidx.room:room-runtime-android:2.7.0-rc01
124125
androidx.room:room-runtime:2.7.0-rc01
125-
androidx.savedstate:savedstate-android:1.3.0-alpha09
126-
androidx.savedstate:savedstate-ktx:1.3.0-alpha09
127-
androidx.savedstate:savedstate:1.3.0-alpha09
126+
androidx.savedstate:savedstate-android:1.3.0
127+
androidx.savedstate:savedstate-compose-android:1.3.0
128+
androidx.savedstate:savedstate-compose:1.3.0
129+
androidx.savedstate:savedstate-ktx:1.3.0
130+
androidx.savedstate:savedstate:1.3.0
128131
androidx.sqlite:sqlite-android:2.5.0-rc01
129132
androidx.sqlite:sqlite-framework-android:2.5.0-rc01
130133
androidx.sqlite:sqlite-framework:2.5.0-rc01
@@ -142,10 +145,10 @@ androidx.window:window:1.4.0-beta02
142145
androidx.work:work-runtime:2.10.0
143146
com.google.accompanist:accompanist-drawablepainter:0.36.0
144147
com.google.code.findbugs:jsr305:3.0.2
145-
com.google.dagger:dagger-lint-aar:2.55
146-
com.google.dagger:dagger:2.55
147-
com.google.dagger:hilt-android:2.55
148-
com.google.dagger:hilt-core:2.55
148+
com.google.dagger:dagger-lint-aar:2.57.2
149+
com.google.dagger:dagger:2.57.2
150+
com.google.dagger:hilt-android:2.57.2
151+
com.google.dagger:hilt-core:2.57.2
149152
com.google.guava:listenablefuture:1.0
150153
com.jakewharton.timber:timber:5.0.1
151154
com.squareup.okhttp3:okhttp:4.12.0
@@ -191,10 +194,10 @@ org.jetbrains.compose.ui:ui-util:1.7.3
191194
org.jetbrains.compose.ui:ui:1.7.3
192195
org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.22
193196
org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22
194-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10
195-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.10
196-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10
197-
org.jetbrains.kotlin:kotlin-stdlib:2.1.10
197+
org.jetbrains.kotlin:kotlin-stdlib-common:2.2.21
198+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.21
199+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.21
200+
org.jetbrains.kotlin:kotlin-stdlib:2.2.21
198201
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
199202
org.jetbrains.kotlinx:atomicfu:0.23.2
200203
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1

β€Žbuild-logic/convention/src/main/kotlin/soup/movie/buildlogic/Android.ktβ€Ž

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,6 @@ fun Project.configureAndroid() {
2020
compileOptions {
2121
sourceCompatibility = JavaVersion.VERSION_11
2222
targetCompatibility = JavaVersion.VERSION_11
23-
isCoreLibraryDesugaringEnabled = true
24-
}
25-
26-
val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
27-
dependencies {
28-
coreLibraryDesugaring(libs.findLibrary("android.desugar.jdk").get())
2923
}
3024
}
3125
}

β€Žbuild-logic/convention/src/main/kotlin/soup/movie/buildlogic/Dependencies.ktβ€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ fun DependencyHandler.compileOnly(dependencyNotation: Any): Dependency? {
2323
return add("compileOnly", dependencyNotation)
2424
}
2525

26-
fun DependencyHandler.coreLibraryDesugaring(dependencyNotation: Any): Dependency? {
27-
return add("coreLibraryDesugaring", dependencyNotation)
28-
}
29-
3026
fun DependencyHandler.project(
3127
path: String,
3228
configuration: String? = null,

β€Žbuild-logic/convention/src/main/kotlin/soup/movie/buildlogic/Versions.ktβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ package soup.movie.buildlogic
22

33
object Versions {
44
const val minSdk = 26
5-
const val compileSdk = 35
5+
const val compileSdk = 36
66
const val targetSdk = 35
77
}

β€Žcheck.shβ€Ž

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/bash
2+
# Check script for PR submission
3+
# Validates dependencies, code formatting, lint.
4+
5+
# Exit immediately if any command fails
6+
set -e
7+
8+
echo "Starting check validations..."
9+
echo ""
10+
11+
# Verify dependency changes
12+
echo "πŸ” [1/3] Checking dependency guard..."
13+
./gradlew dependencyGuard
14+
echo "βœ“ Dependency guard check passed"
15+
echo ""
16+
17+
# Verify code formatting
18+
echo "πŸ” [2/3] Checking code formatting..."
19+
./gradlew spotlessCheck --init-script gradle/init.gradle.kts
20+
echo "βœ“ Code formatting check passed"
21+
echo ""
22+
23+
# Static analysis and lint checks
24+
echo "πŸ” [3/3] Running lint checks..."
25+
./gradlew lintDebug
26+
echo "βœ“ Lint check passed"
27+
echo ""
28+
29+
echo "βœ… All checks passed successfully!"

β€Žfeature/search/impl/src/main/java/soup/movie/feature/search/impl/SearchScreen.ktβ€Ž

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,14 @@ private fun SearchTopBar(
121121
windowInsets: WindowInsets = TopAppBarDefaults.windowInsets,
122122
) {
123123
Surface(
124-
modifier = modifier.windowInsetsPadding(windowInsets)
124+
modifier = modifier
125+
.windowInsetsPadding(windowInsets)
125126
.fillMaxWidth()
126127
.height(56.dp),
127128
color = MovieTheme.colorScheme.surfaceContainerLowest,
128129
) {
129130
val focusManager = LocalFocusManager.current
130-
val focusRequester = FocusRequester()
131+
val focusRequester = remember { FocusRequester() }
131132
LaunchedEffect(Unit) {
132133
focusRequester.requestFocus()
133134
}

β€Žgradle/libs.versions.tomlβ€Ž

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
[versions]
22

33
# Android
4-
androidGradlePlugin = "8.9.0"
4+
androidGradlePlugin = "8.13.1"
55

66
# Kotlin
7-
kotlin = "2.1.10"
7+
kotlin = "2.2.21"
88
coroutines = "1.10.1"
99
serialization = "1.8.0"
10-
ksp = "2.1.10-1.0.30"
10+
ksp = "2.3.2"
1111

1212
# Dagger
13-
dagger = "2.55"
14-
androidxhilt = "1.2.0"
13+
dagger = "2.57.2"
14+
androidxhilt = "1.3.0"
1515

1616
# AndroidX
1717
androidx-activity = "1.10.1"
@@ -21,7 +21,7 @@ androidx-browser = "1.8.0"
2121
androidx-core = "1.16.0-alpha02"
2222
androidx-datastore = "1.1.3"
2323
androidx-lifecycle = "2.9.0-alpha11"
24-
androidx-navigation = "2.9.0-alpha07"
24+
androidx-navigation = "2.9.6"
2525
androidx-profileinstaller = "1.4.1"
2626
androidx-room = "2.7.0-rc01"
2727
androidx-startup = "1.2.0"
@@ -43,9 +43,6 @@ timber = "5.0.1"
4343

4444
[libraries]
4545

46-
# Android
47-
android-desugar-jdk = "com.android.tools:desugar_jdk_libs:2.1.5"
48-
4946
# Kotlin
5047

5148
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sat May 18 19:55:32 KST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
Β (0)