Skip to content

Commit 9f73d40

Browse files
fix(deps): update kotlin, ksp, mero (#3360)
* fix(deps): update kotlin, ksp, mero * Fix metro warnings * Remove the now obsolete graph arguments --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Paul Woitaschek <woitaschek@gmail.com>
1 parent edcc8da commit 9f73d40

File tree

5 files changed

+5
-32
lines changed

5 files changed

+5
-32
lines changed
Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package voice.core.data.repo.internals
22

3-
import android.content.Context
4-
import androidx.datastore.core.DataStore
53
import androidx.room.migration.Migration
6-
import androidx.test.core.app.ApplicationProvider
74
import dev.zacsweers.metro.AppScope
85
import dev.zacsweers.metro.DependencyGraph
9-
import dev.zacsweers.metro.Provides
106
import dev.zacsweers.metro.SingleIn
11-
import dev.zacsweers.metro.createGraphFactory
12-
import voice.core.data.store.DarkThemeStore
7+
import dev.zacsweers.metro.createGraph
138

149
@SingleIn(AppScope::class)
1510
@DependencyGraph(
@@ -18,25 +13,8 @@ import voice.core.data.store.DarkThemeStore
1813
internal interface TestGraph {
1914

2015
val migrations: Set<@JvmSuppressWildcards Migration>
21-
22-
@DependencyGraph.Factory
23-
interface Factory {
24-
25-
fun create(
26-
@Provides
27-
@DarkThemeStore
28-
darkThemeStore: DataStore<Boolean>,
29-
@Provides
30-
context: Context,
31-
): TestGraph
32-
}
3316
}
3417

3518
internal fun allMigrations(): Array<Migration> {
36-
return createGraphFactory<TestGraph.Factory>()
37-
.create(
38-
darkThemeStore = MemoryDataStore(false),
39-
context = ApplicationProvider.getApplicationContext(),
40-
)
41-
.migrations.toTypedArray()
19+
return createGraph<TestGraph>().migrations.toTypedArray()
4220
}
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
package voice.core.playback.di
22

3-
import dev.zacsweers.metro.Scope
4-
5-
@Scope
63
annotation class PlaybackScope

features/bookOverview/src/main/kotlin/voice/features/bookOverview/di/BookOverviewGraph.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,12 @@ package voice.features.bookOverview.di
33
import dev.zacsweers.metro.AppScope
44
import dev.zacsweers.metro.ContributesTo
55
import dev.zacsweers.metro.GraphExtension
6-
import dev.zacsweers.metro.Scope
76
import voice.features.bookOverview.bottomSheet.BottomSheetViewModel
87
import voice.features.bookOverview.deleteBook.DeleteBookViewModel
98
import voice.features.bookOverview.editTitle.EditBookTitleViewModel
109
import voice.features.bookOverview.fileCover.FileCoverViewModel
1110
import voice.features.bookOverview.overview.BookOverviewViewModel
1211

13-
@Scope
1412
annotation class BookOverviewScope
1513

1614
@GraphExtension(scope = BookOverviewScope::class)

features/bookmark/src/main/kotlin/voice/features/bookmark/BookmarkViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ class BookmarkViewModel(
178178

179179
@AssistedFactory
180180
interface Factory {
181-
fun create(id: BookId): BookmarkViewModel
181+
fun create(bookId: BookId): BookmarkViewModel
182182
}
183183
}

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ agp = "9.0.1"
1212
ktlint-core = "1.8.0"
1313
ktlint-gradlePlugin = "0.13.0"
1414
retrofit = "3.0.0"
15-
metro = "0.10.3"
15+
metro = "0.11.1"
1616
navigation3 = "1.0.1"
1717

1818
[libraries]
@@ -144,6 +144,6 @@ googleServices = { id = "com.google.gms.google-services", version = "4.4.4" }
144144
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
145145
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
146146
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
147-
ksp = { id = "com.google.devtools.ksp", version = "2.3.5" }
147+
ksp = { id = "com.google.devtools.ksp", version = "2.3.6" }
148148
ktlint = { id = "io.github.usefulness.ktlint-gradle-plugin", version.ref = "ktlint-gradlePlugin" }
149149
metro = { id = "dev.zacsweers.metro", version.ref = "metro" }

0 commit comments

Comments
 (0)