kinject to kinject-core and created a bom

ScottPierce · Jul 2, 2024 · 2b2a817 · 2b2a817
1 parent b875dba
commit 2b2a817
Show file tree

Hide file tree

Showing 19 changed files with 56 additions and 7 deletions.
diff --git a/benchmark/benchmark-shared/build.gradle.kts b/benchmark/benchmark-shared/build.gradle.kts
@@ -11,7 +11,7 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            api(project(":kinject"))
+            api(project(":kinject-core"))
             api(libs.koin.core)
         }
     }

diff --git a/kinject-android/build.gradle.kts b/kinject-android/build.gradle.kts
@@ -9,6 +9,6 @@ android {
 }
 
 dependencies {
-    api(project(":kinject"))
+    api(project(":kinject-core"))
     implementation(libs.androidx.lifecycle.viewmodel.android)
 }
diff --git a/kinject-bom/build.gradle.kts b/kinject-bom/build.gradle.kts
@@ -0,0 +1,18 @@
+plugins {
+    `java-platform`
+    alias(libs.plugins.gradleMavenPublish)
+}
+
+javaPlatform {
+    allowDependencies()
+}
+
+dependencies {
+    constraints {
+        api(project(":kinject-core"))
+        api(project(":kinject-android"))
+        api(project(":kinject-compose"))
+        api(project(":kinject-compose-viewmodel"))
+        api(project(":kinject-viewmodel"))
+    }
+}
diff --git a/kinject-compose/build.gradle.kts b/kinject-compose/build.gradle.kts
@@ -21,6 +21,6 @@ composeCompiler {
 }
 
 dependencies {
-    implementation(project(":kinject"))
+    implementation(project(":kinject-core"))
     implementation(libs.compose.runtime)
 }
diff --git a/kinject/build.gradle.kts → kinject-core/build.gradle.kts b/kinject/build.gradle.kts → kinject-core/build.gradle.kts
@@ -1,4 +1,6 @@
-import com.vanniktech.maven.publish.SonatypeHost
+@file:OptIn(ExperimentalWasmDsl::class)
+
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
@@ -11,6 +13,8 @@ kotlin {
         browser()
         nodejs()
     }
+    wasmJs()
+    wasmWasi()
     macosArm64()
     macosX64()
     iosX64()
@@ -20,6 +24,8 @@ kotlin {
     tvosArm64()
     tvosSimulatorArm64()
 
+    applyDefaultHierarchyTemplate()
+
     sourceSets {
         commonTest.dependencies {
             implementation(kotlin("test"))

diff --git a/...n/kotlin/kinject/KinjectPlatform.apple.kt → ...n/kotlin/kinject/KinjectPlatform.apple.kt b/...n/kotlin/kinject/KinjectPlatform.apple.kt → ...n/kotlin/kinject/KinjectPlatform.apple.kt
diff --git a/.../src/commonMain/kotlin/kinject/Binding.kt → .../src/commonMain/kotlin/kinject/Binding.kt b/.../src/commonMain/kotlin/kinject/Binding.kt → .../src/commonMain/kotlin/kinject/Binding.kt
diff --git a/...c/commonMain/kotlin/kinject/Exceptions.kt → ...c/commonMain/kotlin/kinject/Exceptions.kt b/...c/commonMain/kotlin/kinject/Exceptions.kt → ...c/commonMain/kotlin/kinject/Exceptions.kt
diff --git a/...monMain/kotlin/kinject/KinjectPlatform.kt → ...monMain/kotlin/kinject/KinjectPlatform.kt b/...monMain/kotlin/kinject/KinjectPlatform.kt → ...monMain/kotlin/kinject/KinjectPlatform.kt
diff --git a/.../commonMain/kotlin/kinject/ObjectGraph.kt → .../commonMain/kotlin/kinject/ObjectGraph.kt b/.../commonMain/kotlin/kinject/ObjectGraph.kt → .../commonMain/kotlin/kinject/ObjectGraph.kt
diff --git a/...monTest/kotlin/kinject/ObjectGraphTest.kt → ...monTest/kotlin/kinject/ObjectGraphTest.kt b/...monTest/kotlin/kinject/ObjectGraphTest.kt → ...monTest/kotlin/kinject/ObjectGraphTest.kt
diff --git a/...Main/kotlin/kinject/KinjectPlatform.js.kt → ...Main/kotlin/kinject/KinjectPlatform.js.kt b/...Main/kotlin/kinject/KinjectPlatform.js.kt → ...Main/kotlin/kinject/KinjectPlatform.js.kt
diff --git a/...ain/kotlin/kinject/KinjectPlatform.jvm.kt → ...ain/kotlin/kinject/KinjectPlatform.jvm.kt b/...ain/kotlin/kinject/KinjectPlatform.jvm.kt → ...ain/kotlin/kinject/KinjectPlatform.jvm.kt
diff --git a/...jvmMain/kotlin/kinject/ObjectGraph.jvm.kt → ...jvmMain/kotlin/kinject/ObjectGraph.jvm.kt b/...jvmMain/kotlin/kinject/ObjectGraph.jvm.kt → ...jvmMain/kotlin/kinject/ObjectGraph.jvm.kt
diff --git a/kinject-core/src/wasmJsMain/kotlin/kinject/KinjectPlatform.wasmJs.kt b/kinject-core/src/wasmJsMain/kotlin/kinject/KinjectPlatform.wasmJs.kt
@@ -0,0 +1,12 @@
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+
+package kinject
+
+import kotlin.reflect.KClass
+
+internal actual object KinjectPlatform {
+    actual val KClass<*>.className: String
+        get() = this.simpleName ?: error("No qualified name found for '$this'")
+
+    actual inline fun <R> synchronized(lock: Any, func: () -> R): R = func()
+}
diff --git a/kinject-core/src/wasmWasiMain/kotlin/kinject/KinjectPlatform.wasmWasi.kt b/kinject-core/src/wasmWasiMain/kotlin/kinject/KinjectPlatform.wasmWasi.kt
@@ -0,0 +1,12 @@
+@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
+
+package kinject
+
+import kotlin.reflect.KClass
+
+internal actual object KinjectPlatform {
+    actual val KClass<*>.className: String
+        get() = this.simpleName ?: error("No qualified name found for '$this'")
+
+    actual inline fun <R> synchronized(lock: Any, func: () -> R): R = func()
+}
diff --git a/kinject-viewmodel/build.gradle.kts b/kinject-viewmodel/build.gradle.kts
@@ -9,6 +9,6 @@ android {
 }
 
 dependencies {
-    api(project(":kinject"))
+    api(project(":kinject-core"))
     implementation(libs.androidx.lifecycle.viewmodel.android)
 }
diff --git a/...e/kinject-sample-android/build.gradle.kts → ...android/kinject-sample-android.gradle.kts b/...e/kinject-sample-android/build.gradle.kts → ...android/kinject-sample-android.gradle.kts
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":kinject"))
+    implementation(project(":kinject-core"))
     implementation(project(":kinject-compose"))
     implementation(project(":kinject-compose-viewmodel"))
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -23,9 +23,10 @@ rootProject.name = "kinject"
 include(":benchmark:benchmark-android")
 include(":benchmark:benchmark-kotlin")
 include(":benchmark:benchmark-shared")
-include(":kinject")
 include(":kinject-android")
+include(":kinject-bom")
 include(":kinject-compose")
 include(":kinject-compose-viewmodel")
+include(":kinject-core")
 include(":kinject-viewmodel")
 include(":sample:kinject-sample-android")