diff --git a/build.gradle.kts b/build.gradle.kts index d6381c57..857300d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,5 +4,5 @@ plugins { allprojects { group = "org.kodein.di" - version = "7.14.0" + version = "7.15.0-kotlin-1.7.20-RC" } diff --git a/doc/antora.yml b/doc/antora.yml index fab03a56..45ceb8d1 100644 --- a/doc/antora.yml +++ b/doc/antora.yml @@ -1,7 +1,7 @@ name: kodein-di title: Kodein-DI -version: '7.14.0' -display_version: '7.14.0' +version: '7.15.0-kotlin-1.7.20-RC' +display_version: '7.15.0-kotlin-1.7.20-RC' nav: - modules/ROOT/nav.adoc - modules/core/nav.adoc @@ -10,6 +10,6 @@ nav: - modules/migration/nav.adoc asciidoc: attributes: - version: '7.14.0' - kotlin: '1.7.10' + version: '7.15.0-kotlin-1.7.20-RC' + kotlin: '1.7.20-RC' jdk: '1.8' \ No newline at end of file diff --git a/doc/modules/framework/pages/compose.adoc b/doc/modules/framework/pages/compose.adoc index 4dff0c8d..2af46fea 100644 --- a/doc/modules/framework/pages/compose.adoc +++ b/doc/modules/framework/pages/compose.adoc @@ -13,12 +13,16 @@ Here is a table containing the version compatibility: |=== |Kodein-DI |Compose compiler |Kotlin +|7.15.0-kotlin-1.7.20-RC +|NOT COMPATIBLE +|1.7.20 + |7.14.0 -1.2.0-alpha01-dev745 +|1.2.0-alpha01-dev745 |1.7.10 |7.13.1 -1.2.0-alpha01-dev745 +|1.2.0-alpha01-dev745 |1.7.0 |7.10.0 diff --git a/framework/compose/kodein-di-framework-compose/build.gradle.kts b/framework/compose/kodein-di-framework-compose/build.gradle.kts index 8aaf9e88..9e391cb7 100644 --- a/framework/compose/kodein-di-framework-compose/build.gradle.kts +++ b/framework/compose/kodein-di-framework-compose/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("org.jetbrains.compose") version "1.2.0-alpha01-dev745" + id("org.jetbrains.compose") version "1.2.0-beta01" id("org.kodein.library.mpp-with-android") } @@ -17,7 +17,7 @@ kodein { add(kodeinTargets.jvm.android) { main.dependencies { api(project(":framework:android:kodein-di-framework-android-x")) - api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.0") + api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1") } } diff --git a/kodein-di/build.gradle.kts b/kodein-di/build.gradle.kts index d3bd3c14..fed6f987 100644 --- a/kodein-di/build.gradle.kts +++ b/kodein-di/build.gradle.kts @@ -7,7 +7,7 @@ kodein { common { main.dependencies { - api("org.kodein.type:kaverit:2.1.0") + api("org.kodein.type:kaverit:2.2.1-kotlin-1.7.20-RC") } test.dependencies { implementation(project(":test-utils")) diff --git a/kodein-di/src/allNativeMain/kotlin/org/kodein/di/internal/freezeNative.kt b/kodein-di/src/allNativeMain/kotlin/org/kodein/di/internal/freezeNative.kt deleted file mode 100644 index 0f4d82f4..00000000 --- a/kodein-di/src/allNativeMain/kotlin/org/kodein/di/internal/freezeNative.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.kodein.di.internal - -import kotlin.native.concurrent.ensureNeverFrozen as nativeEnsureNeverFrozen - - -public actual fun T.ensureNeverFrozen() : Unit = nativeEnsureNeverFrozen() diff --git a/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/DIContainerImpl.kt b/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/DIContainerImpl.kt index 8bce6aba..082c35e4 100644 --- a/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/DIContainerImpl.kt +++ b/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/DIContainerImpl.kt @@ -1,7 +1,18 @@ package org.kodein.di.internal -import org.kodein.di.* -import org.kodein.di.bindings.* +import org.kodein.di.AnyDIContext +import org.kodein.di.BindingsMap +import org.kodein.di.DI +import org.kodein.di.DIContainer +import org.kodein.di.DIContext +import org.kodein.di.DITree +import org.kodein.di.SearchSpecs +import org.kodein.di.Volatile +import org.kodein.di.bindings.BindingDI +import org.kodein.di.bindings.ExternalSource +import org.kodein.di.bindings.toKContext +import org.kodein.di.description +import org.kodein.di.fullDescription internal class DIContainerImpl private constructor( override val tree: DITree, @@ -13,10 +24,6 @@ internal class DIContainerImpl private constructor( @Volatile var initCallbacks: (() -> Unit)? = null private set - init { - ensureNeverFrozen() - } - /** * "Main" constructor that uses the bindings map configured by a [DIContainer.Builder]. */ diff --git a/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/ensureNeverFrozen.kt b/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/ensureNeverFrozen.kt deleted file mode 100644 index dfd35ed4..00000000 --- a/kodein-di/src/commonMain/kotlin/org/kodein/di/internal/ensureNeverFrozen.kt +++ /dev/null @@ -1,3 +0,0 @@ -package org.kodein.di.internal - -internal expect fun T.ensureNeverFrozen() diff --git a/kodein-di/src/jsMain/kotlin/org/kodein/di/internal/freezeJs.kt b/kodein-di/src/jsMain/kotlin/org/kodein/di/internal/freezeJs.kt deleted file mode 100644 index 760cd7c3..00000000 --- a/kodein-di/src/jsMain/kotlin/org/kodein/di/internal/freezeJs.kt +++ /dev/null @@ -1,4 +0,0 @@ -package org.kodein.di.internal - - -public actual fun T.ensureNeverFrozen() {} diff --git a/kodein-di/src/jvmMain/kotlin/org/kodein/di/internal/freezeJvm.kt b/kodein-di/src/jvmMain/kotlin/org/kodein/di/internal/freezeJvm.kt deleted file mode 100644 index 760cd7c3..00000000 --- a/kodein-di/src/jvmMain/kotlin/org/kodein/di/internal/freezeJvm.kt +++ /dev/null @@ -1,4 +0,0 @@ -package org.kodein.di.internal - - -public actual fun T.ensureNeverFrozen() {} diff --git a/settings.gradle.kts b/settings.gradle.kts index ad857667..ea89e069 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ buildscript { maven(url = "https://raw.githubusercontent.com/kosi-libs/kodein-internal-gradle-plugin/mvn-repo") } dependencies { - classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.20.0") + classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:6.20.2-kotlin-1.7.20-RC") } } @@ -39,6 +39,6 @@ framework("tfx").include( ":framework:tornadofx:kodein-di-framework-tornadofx-jvm" ) -framework("compose").include( - ":framework:compose:kodein-di-framework-compose" -) +//framework("compose").include( +// ":framework:compose:kodein-di-framework-compose" +//)