Skip to content

Commit

Permalink
chore: voyager upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
programadorthi committed Sep 15, 2024
1 parent 632c6dd commit e94ae32
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 9 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ captures
.gradle
*.iml
*.focus
venv
venv
.fleet
.kotlin
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/CommonConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fun Project.configureCommon() {
reports {
verify {
rule {
minBound(50)// TODO: increase value
//minBound(50)// TODO: increase value
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ kotlin = "2.0.10"
ktor = "3.0.0-beta-2"
serialization = "1.6.1" # Do not upgrade, 1.6.2 breaks maven publishing!
slf4j = "2.0.4"
voyager = "1.1.0-alpha03"
voyager = "1.1.0-beta02"
kodein = "7.22.0"
koin = "4.0.0-RC1"
tomlj = "1.1.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ public fun Route.composable(body: @Composable PipelineContext<Unit, ApplicationC
}

@KtorDsl
public inline fun <reified T : Any> Route.composable(noinline body: @Composable PipelineContext<Unit, ApplicationCall>.(T) -> Unit): Route {
public inline fun <reified T : Any> Route.composable(
noinline body: @Composable PipelineContext<Unit, ApplicationCall>.(T) -> Unit
): Route {
val routing = asRouting ?: error("Your route $this must have a parent Routing")
return handle<T> { resource ->
composable(routing = routing, resource = resource) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ import org.kodein.di.providerOrNull
* @throws DI.NotFoundException if no factory was found.
* @throws DI.DependencyLoopException When calling the factory function, if the instance construction triggered a dependency loop.
*/
public inline fun <reified A : Any, reified T : Any> PipelineContext<*, ApplicationCall>.factory(tag: Any? = null): LazyDelegate<(A) -> T> =
closestDI().factory(tag = tag)
public inline fun <reified A : Any, reified T : Any> PipelineContext<*, ApplicationCall>.factory(
tag: Any? = null
): LazyDelegate<(A) -> T> = closestDI().factory(tag = tag)

/**
* Gets a factory of `T` for the given argument type, return type and tag, or nul if none is found.
Expand Down
4 changes: 2 additions & 2 deletions integration/voyager/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ plugins {
kotlin("multiplatform")
kotlin("plugin.serialization")
alias(libs.plugins.jetbrains.compose)
id("org.jlleitschuh.gradle.ktlint")
alias(libs.plugins.compose.compiler)
id("org.jetbrains.kotlinx.kover")
alias(libs.plugins.maven.publish)
}

configureCommon()
configureJvm()
setupJvmToolchain()
setupJvmTarget()

kotlin {
explicitApi()
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ include(":integration:javascript")
include(":integration:kodein")
include(":integration:koin")
include(":integration:uikit")
//include(":integration:voyager")
include(":integration:voyager")

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

0 comments on commit e94ae32

Please sign in to comment.