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

Split VM / Nav API - Retrograde to composeNavigation = "2.8.0-alpha02" #1953

Merged
merged 1 commit into from
Aug 27, 2024
Merged

Split VM / Nav API - Retrograde to composeNavigation = "2.8.0-alpha02" #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions projects/bom/koin-bom/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies {
api(project(":core:koin-core"))
api(project(":core:koin-core-coroutines"))
api(project(":core:koin-core-viewmodel"))
api(project(":core:koin-core-viewmodel-navigation"))
api(project(":core:koin-test"))
api(project(":core:koin-test-junit4"))
api(project(":core:koin-test-junit5"))
Expand All @@ -28,6 +29,7 @@ dependencies {

api(project(":compose:koin-compose"))
api(project(":compose:koin-compose-viewmodel"))
api(project(":compose:koin-compose-viewmodel-navigation"))
api(project(":compose:koin-androidx-compose"))
api(project(":compose:koin-androidx-compose-navigation"))
}
Expand Down
1 change: 1 addition & 0 deletions projects/compose/koin-androidx-compose-navigation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ tasks.withType<KotlinCompile>().all {

dependencies {
api(project(":compose:koin-androidx-compose"))
api(project(":core:koin-core-viewmodel-navigation"))
api(libs.androidx.composeNavigation)
}

Expand Down
56 changes: 56 additions & 0 deletions projects/compose/koin-compose-viewmodel-navigation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.kotlinMultiplatform)
alias(libs.plugins.jetbrainsCompose)
alias(libs.plugins.compose.compiler)
}

val koinVersion: String by project
version = koinVersion

kotlin {
jvmToolchain(1_8)
jvm {
withJava()
}

js(IR) {
nodejs()
browser()
binaries.executable()
}

wasmJs {
nodejs()
binaries.executable()
}

iosX64()
iosArm64()
iosSimulatorArm64()
macosX64()
macosArm64()

sourceSets {
commonMain.dependencies {
api(project(":compose:koin-compose-viewmodel"))
api(project(":core:koin-core-viewmodel-navigation"))
api(libs.jb.composeNavigation)
}
}
}

tasks.withType<KotlinCompile>().all {
kotlinOptions {
jvmTarget = "11"
}
}

tasks.withType<org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask>().configureEach {
args.add("--ignore-engines")
}

apply(from = file("../../gradle/publish.gradle.kts"))
0 ...rg/koin/compose/viewmodel/NavViewModel.kt → ...rg/koin/compose/viewmodel/NavViewModel.kt
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion projects/compose/koin-compose-viewmodel/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ kotlin {
api(project(":compose:koin-compose"))
api(project(":core:koin-core-viewmodel"))
api(libs.jb.composeViewmodel)
api(libs.jb.composeNavigation)
}
}
}
Expand Down
55 changes: 55 additions & 0 deletions projects/core/koin-core-viewmodel-navigation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.kotlinMultiplatform)
}

val koinVersion: String by project
version = koinVersion

kotlin {
jvmToolchain(1_8)
jvm {
withJava()
}

js(IR) {
nodejs()
browser()
binaries.executable()
}

wasmJs {
binaries.executable()
nodejs()
}

iosX64()
iosArm64()
iosSimulatorArm64()
macosX64()
macosArm64()

sourceSets {
commonMain.dependencies {
api(project(":core:koin-core-viewmodel"))
api(libs.jb.navigation)
}
}
}

tasks.withType<KotlinCompile>().all {
kotlinOptions {
jvmTarget = "11"
}
}

tasks.withType<KotlinCompile>().all {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_1_8)
}
}

apply(from = file("../../gradle/publish.gradle.kts"))
14 changes: 14 additions & 0 deletions ...n-core-viewmodel-navigation/src/commonMain/kotlin/org/koin/viewmodel/CreationExtrasExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.koin.viewmodel

import androidx.lifecycle.HasDefaultViewModelProviderFactory
import androidx.lifecycle.ViewModelStoreOwner
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.navigation.NavBackStackEntry
import org.koin.core.annotation.KoinInternalApi

@OptIn(KoinInternalApi::class)
fun defaultNavExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras = when {
viewModelStoreOwner is NavBackStackEntry && viewModelStoreOwner.arguments != null -> viewModelStoreOwner.arguments?.toExtras(viewModelStoreOwner) ?: CreationExtras.Empty
viewModelStoreOwner is HasDefaultViewModelProviderFactory -> viewModelStoreOwner.defaultViewModelCreationExtras
else -> CreationExtras.Empty
}
1 change: 0 additions & 1 deletion projects/core/koin-core-viewmodel/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ kotlin {
api(libs.jb.lifecycleViewmodelSavedState)
api(libs.jb.bundle)
api(libs.jb.savedstate)
api(libs.jb.navigation)
}
}
}
Expand Down
9 changes: 0 additions & 9 deletions ...ts/core/koin-core-viewmodel/src/commonMain/kotlin/org/koin/viewmodel/CreationExtrasExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,8 @@ package org.koin.viewmodel
import androidx.lifecycle.HasDefaultViewModelProviderFactory
import androidx.lifecycle.ViewModelStoreOwner
import androidx.lifecycle.viewmodel.CreationExtras
import androidx.navigation.NavBackStackEntry
import org.koin.core.annotation.KoinInternalApi

fun defaultExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras = when {
viewModelStoreOwner is HasDefaultViewModelProviderFactory -> viewModelStoreOwner.defaultViewModelCreationExtras
else -> CreationExtras.Empty
}

@OptIn(KoinInternalApi::class)
fun defaultNavExtras(viewModelStoreOwner: ViewModelStoreOwner): CreationExtras = when {
viewModelStoreOwner is NavBackStackEntry && viewModelStoreOwner.arguments != null -> viewModelStoreOwner.arguments?.toExtras(viewModelStoreOwner) ?: CreationExtras.Empty
viewModelStoreOwner is HasDefaultViewModelProviderFactory -> viewModelStoreOwner.defaultViewModelCreationExtras
else -> CreationExtras.Empty
}
5 changes: 2 additions & 3 deletions projects/core/koin-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand Down Expand Up @@ -43,8 +42,8 @@ kotlin {

sourceSets {
commonMain.dependencies {
api(libs.extras.stately)
api(libs.extras.stately.collections)
implementation(libs.extras.stately)
implementation(libs.extras.stately.collections)
// api(libs.extras.uuid)
}
commonTest.dependencies {
Expand Down
Loading
Loading