Kotlin 1.9.0

kosi-libs · Aug 4, 2023 · 466de0d · 466de0d
1 parent 6a17432
commit 466de0d
Show file tree

Hide file tree

Showing 8 changed files with 279 additions and 524 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 
 allprojects {
     group = "org.kodein.type"
-    version = "2.5.0"
+    version = "2.6.0"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kaverit/build.gradle.kts b/kaverit/build.gradle.kts
@@ -13,7 +13,10 @@ kotlin.kodein {
 kotlin.sourceSets {
     val nonJvmMain = create("nonJvmMain") { dependsOn(commonMain.get()) }
     getByName("nativeMain").dependsOn(nonJvmMain)
-    getByName("jsBasedMain").dependsOn(nonJvmMain)
+    val jsBasedMain by getting {
+        dependsOn(nonJvmMain)
+    }
+    getByName("wasmMain").dependsOn(jsBasedMain)
 }
 
 kodeinUpload {

diff --git a/kaverit/src/nativeMain/kotlin/org/kodein/type/typeTokensNative.kt b/kaverit/src/nativeMain/kotlin/org/kodein/type/typeTokensNative.kt
@@ -1,5 +1,8 @@
+@file:OptIn(BetaInteropApi::class)
+
 package org.kodein.type
 
+import kotlinx.cinterop.BetaInteropApi
 import kotlinx.cinterop.ObjCClass
 import kotlinx.cinterop.ObjCProtocol
 import kotlinx.cinterop.getOriginalKotlinClass
@@ -24,7 +27,6 @@ public actual inline fun <reified T : Any> erased(): TypeToken<T> = erased(T::cl
  * @param T The type to get.
  * @return The type object representing `T`.
  */
-@OptIn(ExperimentalStdlibApi::class)
 @Suppress("UNCHECKED_CAST")
 public actual inline fun <reified T : Any> generic(): TypeToken<T> = typeToken(typeOf<T>()) as TypeToken<T>
 

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,7 +4,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:8.0.0")
+        classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:8.2.0")
     }
 }
 

diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts
@@ -4,8 +4,18 @@ plugins {
 
 kotlin.kodein {
     all()
-
+    wasm {
+        target {
+            browser {
+                testTask(Action { enabled = false })
+            }
+        }
+    }
     common.mainDependencies {
         implementation(projects.kaverit)
     }
 }
+
+android {
+    namespace = "org.kodein.di.type.test"
+}
diff --git a/tests/src/androidMain/AndroidManifest.xml b/tests/src/androidMain/AndroidManifest.xml