diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f7c4ea81..f8f41b08 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ jobs: repository_id: ${{ steps.create.outputs.repository_id }} steps: - id: create - uses: nexus-actions/create-nexus-staging-repo@main + uses: nexus-actions/create-nexus-staging-repo@3e5e7209801629febdcf75541a4898710d28df9a #v1.2 with: base_url: https://s01.oss.sonatype.org/service/local/ username: ${{ secrets.SONATYPE_USERNAME }} diff --git a/build.gradle.kts b/build.gradle.kts index a8e0f143..3493e5de 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,5 +5,5 @@ plugins { allprojects { group = "org.kodein.di" - version = "7.20.1" + version = "7.20.2" } diff --git a/doc/antora.yml b/doc/antora.yml index 136af211..65663cc1 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -11,6 +11,6 @@ nav: asciidoc: attributes: branch: '7.20' - version: '7.20.1' + version: '7.20.2' kotlin: '1.8.10' jdk: '1.8' \ No newline at end of file diff --git a/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt b/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt index 09f73381..f28a8cac 100644 --- a/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt +++ b/framework/compose/kodein-di-framework-android-x-compose/src/androidMain/kotlin/org/kodein/di/compose/android/viewModel.kt @@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner import org.kodein.di.compose.localDI import org.kodein.type.erased +import org.kodein.type.generic /** * Gets an instance of a [VM] as an android [ViewModel] for the given [tag]. @@ -93,7 +94,7 @@ public inline fun rememberViewModel( factoryProducer = { KodeinViewModelScopedFactory( di = di, - argType = erased(), + argType = generic(), arg = arg, tag = tag ) @@ -127,7 +128,7 @@ public inline fun viewModel( remember { val provider = ViewModelProvider( viewModelStoreOwner, - KodeinViewModelScopedFactory(di = di, argType = erased(), arg = arg, tag = tag) + KodeinViewModelScopedFactory(di = di, argType = generic(), arg = arg, tag = tag) ) if (tag == null) { provider[VM::class.java]