fix: Decouple from idofront now that it depends on this library

Author: 0ffz

.gitignore

@@ -1,4 +1,5 @@
 .gradle
 build/
 .idea
-.kotlin
+.kotlin
+kotlin-js-store

build.gradle.kts

@@ -1,3 +1,3 @@
 plugins {
-    alias(idofrontLibs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
 }

core/build.gradle.kts

@@ -1,13 +1,14 @@
 plugins {
-    alias(idofrontLibs.plugins.mia.kotlin.multiplatform)
-    alias(idofrontLibs.plugins.mia.publication)
+    id(libs.plugins.kotlin.multiplatform.get().pluginId)
+    alias(miaConventions.plugins.mia.publication)
 }
 
 repositories {
     mavenCentral()
 }
 
 kotlin {
+    jvmToolchain(17)
     jvm()
     js(IR) {
         browser()
@@ -24,15 +25,15 @@ kotlin {
 
     sourceSets {
         commonMain.dependencies {
-            implementation(idofrontLibs.kotlinx.serialization.json)
+//            implementation(idofrontLibs.kotlinx.serialization.json)
             implementation(libs.kodein.di)
-            implementation(idofrontLibs.kermit)
-        }
-        commonTest.dependencies {
-            implementation(kotlin("test"))
-        }
-        all {
-            languageSettings.enableLanguageFeature("ContextParameters")
+            implementation(libs.kermit)
         }
+//        commonTest.dependencies {
+//            implementation(kotlin("test"))
+//        }
+//        all {
+//            languageSettings.enableLanguageFeature("ContextParameters")
+//        }
     }
 }

core/src/commonMain/kotlin/com/mineinabyss/features/FeatureDSL.kt

@@ -20,8 +20,8 @@ fun FeatureDI.addCloseables(vararg closeable: AutoCloseable) {
     closeable.forEach { instance<FeatureContext>().onClose.add(it) }
 }
 
-context(di: DirectDI)
-inline fun <reified T : Any> get() = di.instance<T>()
+//context(di: DirectDI)
+inline fun <reified T : Any> DirectDI.get() = di.instance<T>()
 
 fun feature(name: String, block: FeatureBuilder.() -> Unit): Feature<Unit> {
     return FeatureBuilder(name, Unit::class).apply(block).build(extract = { })

core/src/commonMain/kotlin/com/mineinabyss/features/FeatureManager.kt

@@ -11,7 +11,7 @@ import org.kodein.di.*
 class FeatureManager(val rootDI: DI) {
     private val loadedFeatures = mutableSetOf<Feature<*>>()
     private val dependencies = mutableMapOf<Feature<*>, MutableSet<Feature<*>>>()
-    private val enabledFeatures = mutableMapOf<Feature<*>, FeatureInstance>()
+    private val enabledFeatures = mutableMapOf<String, FeatureInstance>()
     private val logger = rootDI.direct.instanceOrNull<Logger>() ?: Logger
     private val defaultModule = DI.Module("default", allowSilentOverride = true) {
         bindSingletonOf(::FeatureContext)
@@ -53,27 +53,27 @@ class FeatureManager(val rootDI: DI) {
     }
 
     fun enable(feature: Feature<*>): FeatureInstance {
-        if (feature in enabledFeatures) return enabledFeatures.getValue(feature)
+        if (feature.name in enabledFeatures) return enabledFeatures.getValue(feature.name)
         load(feature)
 //        if (!feature.canEnable()) error("Could not enable $feature")
         val di = DI {
             feature.dependencies.features.forEach {
-                val enabled = enabledFeatures[it] ?: enable(it)
+                val enabled = enabledFeatures[it.name] ?: enable(it)
                 extend(enabled.di, allowOverride = true)
             }
             extend(rootDI, allowOverride = true)
             import(defaultModule, allowOverride = true)
             feature.diBuilder(this)
         }
         val instance = FeatureInstance(di)
-        enabledFeatures[feature] = instance
+        enabledFeatures[feature.name] = instance
         return instance
     }
 
     fun disable(feature: Feature<*>): List<Feature<*>> {
-        if (feature !in enabledFeatures) return emptyList()
+        if (feature.name !in enabledFeatures) return emptyList()
         val children = dependencies[feature]?.flatMap { disable(it) } ?: emptyList()
-        enabledFeatures.remove(feature)?.close()
+        enabledFeatures.remove(feature.name)?.close()
         return (children + feature).distinct()
     }
 
@@ -87,15 +87,15 @@ class FeatureManager(val rootDI: DI) {
     }
 
     fun disableAll() {
-        enabledFeatures.keys.toList().forEach { disable(it) }
+        enabledFeatures.keys.toList().forEach { name -> disable(loadedFeatures.first { it.name == name }) } //TODO cleanup
     }
 
     fun reloadAll() {
         disableAll()
         enableAll()
     }
 
-    fun getInstance(feature: Feature<*>): FeatureInstance? = enabledFeatures[feature]
+    fun getInstance(feature: Feature<*>): FeatureInstance? = enabledFeatures[feature.name]
 
     fun <T : Any> getOrNull(feature: Feature<T>): T? =
         getInstance(feature)?.di?.direct?.let { feature.extract(it) }

core/src/commonTest/kotlin/com/mineinabyss/features/KodeinTests.kt

@@ -1,4 +1,5 @@
 kotlin.code.style=official
 idofrontVersion=2.0.0-dev.4
 group=com.mineinabyss.features
-version=0.1
+version=0.0.1
+conventionsVersion=1.1.0

gradle.properties

@@ -1,5 +1,10 @@
 [versions]
+kotlin = "2.3.20"
 kodein = "7.30.0"
 
 [libraries]
 kodein-di = { module = "org.kodein.di:kodein-di", version.ref = "kodein" }
+kermit = "co.touchlab:kermit:2.0.5"
+
+[plugins]
+kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }

gradle/libs.versions.toml

@@ -9,18 +9,17 @@ pluginManagement {
     }
 }
 
-dependencyResolutionManagement {
-    val idofrontVersion: String by settings
+val conventionsVersion: String by settings
 
+dependencyResolutionManagement {
     repositories {
         maven("https://repo.mineinabyss.com/releases")
         maven("https://repo.mineinabyss.com/snapshots")
         mavenLocal()
     }
-
     versionCatalogs {
-        create("idofrontLibs") {
-            from("com.mineinabyss:catalog:$idofrontVersion")
+        create("miaConventions") {
+            from("com.mineinabyss.conventions:catalog:$conventionsVersion")
         }
     }
 }