Skip to content

Commit e94ae32

Browse files
chore: voyager upgrade
1 parent 632c6dd commit e94ae32

File tree

7 files changed

+14
-9
lines changed

7 files changed

+14
-9
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ captures
77
.gradle
88
*.iml
99
*.focus
10-
venv
10+
venv
11+
.fleet
12+
.kotlin

buildSrc/src/main/kotlin/CommonConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fun Project.configureCommon() {
4444
reports {
4545
verify {
4646
rule {
47-
minBound(50)// TODO: increase value
47+
//minBound(50)// TODO: increase value
4848
}
4949
}
5050
}

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ kotlin = "2.0.10"
1414
ktor = "3.0.0-beta-2"
1515
serialization = "1.6.1" # Do not upgrade, 1.6.2 breaks maven publishing!
1616
slf4j = "2.0.4"
17-
voyager = "1.1.0-alpha03"
17+
voyager = "1.1.0-beta02"
1818
kodein = "7.22.0"
1919
koin = "4.0.0-RC1"
2020
tomlj = "1.1.1"

integration/compose/common/src/dev/programadorthi/routing/compose/ComposeRoutingBuilder.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ public fun Route.composable(body: @Composable PipelineContext<Unit, ApplicationC
4343
}
4444

4545
@KtorDsl
46-
public inline fun <reified T : Any> Route.composable(noinline body: @Composable PipelineContext<Unit, ApplicationCall>.(T) -> Unit): Route {
46+
public inline fun <reified T : Any> Route.composable(
47+
noinline body: @Composable PipelineContext<Unit, ApplicationCall>.(T) -> Unit
48+
): Route {
4749
val routing = asRouting ?: error("Your route $this must have a parent Routing")
4850
return handle<T> { resource ->
4951
composable(routing = routing, resource = resource) {

integration/kodein/common/src/dev/programadorthi/routing/kodein/ext/PipelineContextExt.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,9 @@ import org.kodein.di.providerOrNull
3131
* @throws DI.NotFoundException if no factory was found.
3232
* @throws DI.DependencyLoopException When calling the factory function, if the instance construction triggered a dependency loop.
3333
*/
34-
public inline fun <reified A : Any, reified T : Any> PipelineContext<*, ApplicationCall>.factory(tag: Any? = null): LazyDelegate<(A) -> T> =
35-
closestDI().factory(tag = tag)
34+
public inline fun <reified A : Any, reified T : Any> PipelineContext<*, ApplicationCall>.factory(
35+
tag: Any? = null
36+
): LazyDelegate<(A) -> T> = closestDI().factory(tag = tag)
3637

3738
/**
3839
* Gets a factory of `T` for the given argument type, return type and tag, or nul if none is found.

integration/voyager/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ plugins {
44
kotlin("multiplatform")
55
kotlin("plugin.serialization")
66
alias(libs.plugins.jetbrains.compose)
7-
id("org.jlleitschuh.gradle.ktlint")
7+
alias(libs.plugins.compose.compiler)
88
id("org.jetbrains.kotlinx.kover")
99
alias(libs.plugins.maven.publish)
1010
}
1111

1212
configureCommon()
1313
configureJvm()
14-
setupJvmToolchain()
14+
setupJvmTarget()
1515

1616
kotlin {
1717
explicitApi()

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ include(":integration:javascript")
3636
include(":integration:kodein")
3737
include(":integration:koin")
3838
include(":integration:uikit")
39-
//include(":integration:voyager")
39+
include(":integration:voyager")
4040

4141
// Samples are disabled by default to avoid sync their.
4242
//include(":samples:android-activity")

0 commit comments

Comments
 (0)