Draft: moving forward to Kotlin 1.9.0 and WASM

.github/workflows/release.yml

@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc #v3
         with:
           java-version: 17
-          distribution: temurin
+          distribution: 'temurin'
       # Host only for MacOS / Windows
       - name: Check (macos / windows)
         if: matrix.os != 'ubuntu-latest'

.github/workflows/snapshot.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc #v3
         with:
           java-version: 17
-          distribution: temurin
+          distribution: 'temurin'
       # Host only for MacOS / Windows
       - name: Check (macos / windows)
         if: matrix.os != 'ubuntu-latest'

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc #v3
         with:
           java-version: 17
-          distribution: temurin
+          distribution: 'temurin'
       - name: Check
         run: ./gradlew check
         shell: bash

framework/android/kodein-di-framework-android-core/build.gradle.kts

@@ -8,6 +8,11 @@ dependencies {
 
 android {
     namespace = "org.kodein.di.android"
+
+//    compileOptions {
+//        sourceCompatibility = JavaVersion.VERSION_17
+//        targetCompatibility = JavaVersion.VERSION_17
+//    }
 }
 
 kodeinUpload {

framework/android/kodein-di-framework-android-core/src/main/java/org/kodein/di/android/closest.kt

@@ -30,61 +30,61 @@ private fun closestDI(thisRef: Any?, rootContext: Context): DI {
  *
  * @param T The receiver type.
  */
-interface DIPropertyDelegateProvider<in T> {
+public interface DIPropertyDelegateProvider<in T> {
     /** @suppress */
-    operator fun provideDelegate(thisRef: T, property: KProperty<*>?): Lazy<DI>
+    public operator fun provideDelegate(thisRef: T, property: KProperty<*>?): Lazy<DI>
 }
 
 private class ContextDIPropertyDelegateProvider : DIPropertyDelegateProvider<Context> {
     override operator fun provideDelegate(thisRef: Context, property: KProperty<*>?) = lazy { closestDI(thisRef, thisRef) }
 }
 
-class LazyContextDIPropertyDelegateProvider(private val getContext: () -> Context) : DIPropertyDelegateProvider<Any?> {
-    override operator fun provideDelegate(thisRef: Any?, property: KProperty<*>?) = lazy { closestDI(thisRef, getContext()) }
+public class LazyContextDIPropertyDelegateProvider(private val getContext: () -> Context) : DIPropertyDelegateProvider<Any?> {
+    override operator fun provideDelegate(thisRef: Any?, property: KProperty<*>?): Lazy<DI> = lazy { closestDI(thisRef, getContext()) }
 }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  *
  * To be used on Android's `Context` classes, such as `Activity` or `Service`.
  */
-fun closestDI(): DIPropertyDelegateProvider<Context> = ContextDIPropertyDelegateProvider()
+public fun closestDI(): DIPropertyDelegateProvider<Context> = ContextDIPropertyDelegateProvider()
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  *
  * @param context The Android context to use to walk up the context hierarchy.
  */
-fun closestDI(context: Context): LazyContextDIPropertyDelegateProvider = LazyContextDIPropertyDelegateProvider { context }
+public fun closestDI(context: Context): LazyContextDIPropertyDelegateProvider = LazyContextDIPropertyDelegateProvider { context }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  *
  * @param getContext A function that returns the Android context to use to walk up the context hierarchy.
  */
-fun closestDI(getContext: () -> Context): DIPropertyDelegateProvider<Any?> = LazyContextDIPropertyDelegateProvider(getContext)
+public fun closestDI(getContext: () -> Context): DIPropertyDelegateProvider<Any?> = LazyContextDIPropertyDelegateProvider(getContext)
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Fragment.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { activity }
+public fun Fragment.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { activity }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Dialog.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
+public fun Dialog.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun View.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
+public fun View.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun AbstractThreadedSyncAdapter.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
+public fun AbstractThreadedSyncAdapter.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Loader<*>.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
+public fun Loader<*>.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }

framework/android/kodein-di-framework-android-core/src/main/java/org/kodein/di/android/module.kt

@@ -69,7 +69,7 @@ import org.kodein.di.bindings.SimpleContextTranslator
 import org.kodein.type.TypeToken
 import org.kodein.type.generic
 
-val androidCoreContextTranslators = DI.Module(name = "\u2063androidCoreContextTranslators") {
+public val androidCoreContextTranslators: DI.Module = DI.Module(name = "\u2063androidCoreContextTranslators") {
     RegisterContextTranslator(SimpleContextTranslator<Fragment, Activity>(generic(), generic()) { it.activity })
     RegisterContextTranslator(SimpleContextTranslator<Dialog, Context>(generic(), generic()) { it.context })
     RegisterContextTranslator(SimpleContextTranslator<View, Context>(generic(), generic()) { it.context })
@@ -84,7 +84,7 @@ val androidCoreContextTranslators = DI.Module(name = "\u2063androidCoreContextTr
  * @return An Android `DI.Module` that defines a lot of platform bindings.
  */
 @SuppressLint("NewApi")
-fun androidCoreModule(app: Application) = DI.Module(name = "\u2063androidModule") {
+public fun androidCoreModule(app: Application): DI.Module = DI.Module(name = "\u2063androidModule") {
 
     importOnce(androidCoreContextTranslators)
 

framework/android/kodein-di-framework-android-core/src/main/java/org/kodein/di/android/retained.kt

@@ -8,10 +8,10 @@ import android.os.Bundle
 import org.kodein.di.*
 
 /** @suppress */
-class RetainedDIFragment : Fragment() {
+public class RetainedDIFragment : Fragment() {
 
     private var _di: DI? = null
-    var di: DI?
+    public var di: DI?
         get() = _di
         set(value) {
             _di = value
@@ -34,7 +34,7 @@ private const val DI_RETAINED_FRAGMENT_TAG = "org.kodein.di.android.RetainedDIFr
  * @property allowSilentOverride Whether this module is allowed to non-explicit overrides.
  * @property init The block of configuration for this module.
  */
-fun Activity.retainedDI(allowSilentOverride: Boolean = false, init: DI.MainBuilder.() -> Unit): Lazy<DI> = lazy {
+public fun Activity.retainedDI(allowSilentOverride: Boolean = false, init: DI.MainBuilder.() -> Unit): Lazy<DI> = lazy {
     (fragmentManager.findFragmentByTag(DI_RETAINED_FRAGMENT_TAG) as? RetainedDIFragment)?.di?.let { return@lazy it }
 
     val di = DI(allowSilentOverride, init)

framework/android/kodein-di-framework-android-core/src/main/java/org/kodein/di/android/scopes.kt

@@ -15,30 +15,30 @@ private const val SCOPE_FRAGMENT_TAG = "org.kodein.android.ActivityRetainedScope
 /**
  * A scope that allows to get an activity-scoped singleton that's independent from the activity restart.
  */
-open class ActivityRetainedScope private constructor(private val registryType: RegistryType) : Scope<Activity> {
+public open class ActivityRetainedScope private constructor(private val registryType: RegistryType) : Scope<Activity> {
 
     private enum class RegistryType {
         Standard { override fun new() = StandardScopeRegistry() },
         SingleItem { override fun new() = SingleItemScopeRegistry() };
         abstract fun new(): ScopeRegistry
     }
 
-    object Keys {
-        const val registryTypeOrdinal = "org.kodein.di.android.registryTypeOrdinal"
+    public object Keys {
+        public const val registryTypeOrdinal: String = "org.kodein.di.android.registryTypeOrdinal"
     }
 
-    companion object MultiItem: ActivityRetainedScope(RegistryType.Standard)
+    public companion object MultiItem: ActivityRetainedScope(RegistryType.Standard)
 
-    object SingleItem: ActivityRetainedScope(RegistryType.SingleItem)
+    public object SingleItem: ActivityRetainedScope(RegistryType.SingleItem)
 
     /** @suppress */
-    class RetainedScopeFragment: Fragment() {
-        val registry by lazy {
+    public class RetainedScopeFragment: Fragment() {
+        public val registry: ScopeRegistry by lazy {
             val ordinal = arguments.getInt(Keys.registryTypeOrdinal)
-            RegistryType.values()[ordinal].new()
+            RegistryType.entries[ordinal].new()
         }
 
-        var transactionPendingFragmentCache: MutableMap<Activity, WeakReference<RetainedScopeFragment>>? = null
+        public var transactionPendingFragmentCache: MutableMap<Activity, WeakReference<RetainedScopeFragment>>? = null
 
         @Deprecated("Deprecated in Java")
         override fun onAttach(context: Context?) {

framework/android/kodein-di-framework-android-core/src/main/java/org/kodein/di/android/sub.kt

@@ -3,20 +3,20 @@ package org.kodein.di.android
 import android.app.Activity
 import org.kodein.di.*
 
-inline fun subDI(noinline parentDI: () -> DI, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit) = DI.lazy(allowSilentOverride) {
+public inline fun subDI(noinline parentDI: () -> DI, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit): LazyDI = DI.lazy(allowSilentOverride) {
     extend(parentDI(), copy = copy)
     init()
 }
 
-inline fun subDI(parentDI: Lazy<DI>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit) = subDI({ parentDI.value }, allowSilentOverride, copy, init)
+public inline fun subDI(parentDI: Lazy<DI>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit): LazyDI = subDI({ parentDI.value }, allowSilentOverride, copy, init)
 
-inline fun <T> T.subDI(parentDI: DIPropertyDelegateProvider<T>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit) = subDI(parentDI.provideDelegate(this, null), allowSilentOverride, copy, init)
+public inline fun <T> T.subDI(parentDI: DIPropertyDelegateProvider<T>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit): LazyDI = subDI(parentDI.provideDelegate(this, null), allowSilentOverride, copy, init)
 
-inline fun Activity.retainedSubDI(noinline parentDI: () -> DI, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit) = retainedDI(allowSilentOverride) {
+public inline fun Activity.retainedSubDI(noinline parentDI: () -> DI, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit): Lazy<DI> = retainedDI(allowSilentOverride) {
     extend(parentDI(), copy = copy)
     init()
 }
 
-inline fun Activity.retainedSubDI(parentDI: Lazy<DI>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit) = retainedSubDI({ parentDI.value }, allowSilentOverride, copy, init)
+public inline fun Activity.retainedSubDI(parentDI: Lazy<DI>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit): Lazy<DI> = retainedSubDI({ parentDI.value }, allowSilentOverride, copy, init)
 
-inline fun Activity.retainedSubDI(parentDI: DIPropertyDelegateProvider<Activity>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit) = retainedSubDI(parentDI.provideDelegate(this, null), allowSilentOverride, copy, init)
+public inline fun Activity.retainedSubDI(parentDI: DIPropertyDelegateProvider<Activity>, allowSilentOverride: Boolean = false, copy: Copy = Copy.NonCached, crossinline init: DI.MainBuilder.() -> Unit): Lazy<DI> = retainedSubDI(parentDI.provideDelegate(this, null), allowSilentOverride, copy, init)

framework/android/kodein-di-framework-android-support/build.gradle.kts

@@ -10,6 +10,11 @@ dependencies {
 
 android {
     namespace = "org.kodein.di.android.support"
+
+//    compileOptions {
+//        sourceCompatibility = JavaVersion.VERSION_17
+//        targetCompatibility = JavaVersion.VERSION_17
+//    }
 }
 
 kodeinUpload {

framework/android/kodein-di-framework-android-support/src/main/java/org/kodein/di/android/support/closest.kt

@@ -4,20 +4,22 @@ import android.app.Application
 import android.arch.lifecycle.AndroidViewModel
 import android.support.v4.app.Fragment
 import android.support.v4.content.Loader
+import org.kodein.di.android.DIPropertyDelegateProvider
+import org.kodein.di.android.LazyContextDIPropertyDelegateProvider
 import org.kodein.di.android.closestDI
 
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Fragment.closestDI() = closestDI { requireActivity() }
+public fun Fragment.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { requireActivity() }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Loader<*>.closestDI() = closestDI { context }
+public fun Loader<*>.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun AndroidViewModel.closestDI() = closestDI(getApplication<Application>())
+public fun AndroidViewModel.closestDI(): LazyContextDIPropertyDelegateProvider = closestDI(getApplication<Application>())

framework/android/kodein-di-framework-android-support/src/main/java/org/kodein/di/android/support/module.kt

@@ -12,15 +12,15 @@ import org.kodein.di.android.androidCoreModule
 import org.kodein.di.bindings.SimpleContextTranslator
 import org.kodein.type.generic
 
-val androidSupportContextTranslators = DI.Module("\u2063androidSupportContextTranslators") {
+public val androidSupportContextTranslators: DI.Module = DI.Module("\u2063androidSupportContextTranslators") {
     importOnce(androidCoreContextTranslators)
 
     RegisterContextTranslator(SimpleContextTranslator<Fragment, Activity>(generic(), generic()) { it.requireActivity() })
     RegisterContextTranslator(SimpleContextTranslator<Loader<*>, Context>(generic(), generic()) { it.context })
     RegisterContextTranslator(SimpleContextTranslator<AndroidViewModel, Application>(generic(), generic()) { it.getApplication() })
 }
 
-fun androidSupportModule(app: Application) = DI.Module("\u2063androidSupportModule") {
+public fun androidSupportModule(app: Application): DI.Module = DI.Module("\u2063androidSupportModule") {
     importOnce(androidSupportContextTranslators)
     importOnce(androidCoreModule(app))
 }

framework/android/kodein-di-framework-android-support/src/main/java/org/kodein/di/android/support/scopes.kt

@@ -8,11 +8,11 @@ import org.kodein.di.bindings.*
 import org.kodein.di.internal.synchronizedIfNull
 import java.util.HashMap
 
-open class AndroidLifecycleScope private constructor(private val newRegistry: () -> ScopeRegistry) : Scope<LifecycleOwner> {
+public open class AndroidLifecycleScope private constructor(private val newRegistry: () -> ScopeRegistry) : Scope<LifecycleOwner> {
 
-    companion object multiItem: AndroidLifecycleScope(::StandardScopeRegistry)
+    public companion object multiItem: AndroidLifecycleScope(::StandardScopeRegistry)
 
-    object singleItem: AndroidLifecycleScope(::SingleItemScopeRegistry)
+    public object singleItem: AndroidLifecycleScope(::SingleItemScopeRegistry)
 
     private val map = HashMap<LifecycleOwner, ScopeRegistry>()
 

framework/android/kodein-di-framework-android-x-viewmodel-savedstate/build.gradle.kts

@@ -13,6 +13,11 @@ dependencies {
 
 android {
     namespace = "org.kodein.di.android.x.viewmodel.savedstate"
+
+//    compileOptions {
+//        sourceCompatibility = JavaVersion.VERSION_17
+//        targetCompatibility = JavaVersion.VERSION_17
+//    }
 }
 
 kodeinUpload {

framework/android/kodein-di-framework-android-x-viewmodel-savedstate/src/main/java/org/kodein/di/android/x/viewmodel/savedstate/DIAware.kt

@@ -35,7 +35,7 @@ import org.kodein.type.generic
  * @throws DI.DependencyLoopException When calling the factory, if the value construction triggered a dependency loop.
  */
 @MainThread
-inline fun <A, reified VM> A.viewModelWithSavedStateHandle(
+public inline fun <A, reified VM> A.viewModelWithSavedStateHandle(
     tag: Any? = null,
 ): Lazy<VM> where A : AppCompatActivity, A : DIAware, VM : ViewModel {
     val factoryProducer = { object : AbstractSavedStateViewModelFactory(this@viewModelWithSavedStateHandle, null) {
@@ -74,7 +74,7 @@ inline fun <A, reified VM> A.viewModelWithSavedStateHandle(
  * @throws DI.DependencyLoopException When calling the factory, if the value construction triggered a dependency loop.
  */
 @MainThread
-inline fun <F, reified VM> F.viewModelWithSavedStateHandle(
+public inline fun <F, reified VM> F.viewModelWithSavedStateHandle(
     noinline ownerProducer: () -> ViewModelStoreOwner = { this },
     tag: Any? = null,
 ): Lazy<VM> where F : Fragment, F : DIAware, VM : ViewModel {

framework/android/kodein-di-framework-android-x-viewmodel/build.gradle.kts

@@ -12,6 +12,11 @@ dependencies {
 
 android {
     namespace = "org.kodein.di.android.x.viewmodel"
+
+//    compileOptions {
+//        sourceCompatibility = JavaVersion.VERSION_17
+//        targetCompatibility = JavaVersion.VERSION_17
+//    }
 }
 
 kodeinUpload {

framework/android/kodein-di-framework-android-x-viewmodel/src/main/java/org/kodein/di/android/x/viewmodel/DIAware.kt

@@ -30,7 +30,7 @@ import org.kodein.di.provider
  * @throws DI.DependencyLoopException When calling the provider, if the value construction triggered a dependency loop.
  */
 @MainThread
-inline fun <A, reified VM> A.viewModel(
+public inline fun <A, reified VM> A.viewModel(
     tag: Any? = null,
 ): Lazy<VM> where A : AppCompatActivity, A : DIAware, VM : ViewModel {
     val factoryProducer = { object : ViewModelProvider.Factory {
@@ -69,7 +69,7 @@ inline fun <A, reified VM> A.viewModel(
  * @throws DI.DependencyLoopException When calling the provider, if the value construction triggered a dependency loop.
  */
 @MainThread
-inline fun <F, reified VM> F.viewModel(
+public inline fun <F, reified VM> F.viewModel(
     noinline ownerProducer: () -> ViewModelStoreOwner = { this },
     tag: Any? = null,
 ): Lazy<VM> where F : Fragment, F : DIAware, VM : ViewModel {

framework/android/kodein-di-framework-android-x/build.gradle.kts

@@ -10,6 +10,11 @@ dependencies {
 
 android {
     namespace = "org.kodein.di.android.x"
+
+//    compileOptions {
+//        sourceCompatibility = JavaVersion.VERSION_17
+//        targetCompatibility = JavaVersion.VERSION_17
+//    }
 }
 
 kodeinUpload {

framework/android/kodein-di-framework-android-x/src/main/java/org/kodein/di/android/x/closest.kt

@@ -4,20 +4,22 @@ import android.app.Application
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.AndroidViewModel
 import androidx.loader.content.Loader
+import org.kodein.di.android.DIPropertyDelegateProvider
+import org.kodein.di.android.LazyContextDIPropertyDelegateProvider
 import org.kodein.di.android.closestDI
 
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Fragment.closestDI() = closestDI { requireActivity() }
+public fun Fragment.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { requireActivity() }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun Loader<*>.closestDI() = closestDI { context }
+public fun Loader<*>.closestDI(): DIPropertyDelegateProvider<Any?> = closestDI { context }
 
 /**
  * Returns the closest DI (or the app DI, if no closest DI could be found).
  */
-fun AndroidViewModel.closestDI() = closestDI(getApplication<Application>())
+public fun AndroidViewModel.closestDI(): LazyContextDIPropertyDelegateProvider = closestDI(getApplication<Application>())