wip

.gitignore

@@ -140,4 +140,5 @@ bin/
 .idea/
 hidden-gradle.properties
 kotlin-js-store/
-mods/
+mods/
+.kotlin/

build.gradle.kts

@@ -1,8 +1,8 @@
 @file:Suppress("UNUSED_VARIABLE")
 
 plugins {
-    kotlin("multiplatform") version "1.8.10"
-    kotlin("plugin.serialization") version "1.8.10"
+    kotlin("multiplatform") version "2.0.0"
+    kotlin("plugin.serialization") version "2.0.0"
     `maven-publish`
 }
 
@@ -21,12 +21,14 @@ kotlin {
             useJUnitPlatform()
         }
 
-        sourceSets {
+
+        this@kotlin.sourceSets {
             val jvmTestIntegration by creating {
-                dependsOn(sourceSets["jvmMain"])
+
+                dependsOn(this@sourceSets["jvmMain"])
             }
             val jvmTools by creating {
-                dependsOn(sourceSets["jvmMain"])
+                dependsOn(this@sourceSets["jvmMain"])
             }
         }
         compilations {
@@ -115,7 +117,7 @@ kotlin {
     }
 }
 
-tasks.getByName<Test>("test") {
+tasks.getByName<Test>("jvmTest") {
     testLogging {
         exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
     }

src/jsMain/kotlin/core/utility/LazyMutable.kt

@@ -1,5 +1,6 @@
 package core.utility
 
+import kotlinx.atomicfu.locks.synchronized
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
@@ -27,4 +28,4 @@ actual class LazyMutable<T> actual constructor(val initializer: () -> T) : ReadW
             prop = value
         }
     }
-}
+}

src/jvmMain/kotlin/core/utility/LazyMutable.kt

@@ -1,6 +1,5 @@
 package core.utility
 
-import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
 
 /*
@@ -27,4 +26,4 @@ actual class LazyMutable<T> actual constructor(val initializer: () -> T) : ReadW
             prop = value
         }
     }
-}
+}

src/jvmMain/kotlin/core/utility/NameSearchableList.kt

@@ -1,5 +1,7 @@
 package core.utility
 
+import java.util.*
+
 actual class NameSearchableList<N : Named> actual constructor() : MutableList<N>, ArrayList<N>() {
     private val proxies = HashMap<String, N>()
 
@@ -229,4 +231,4 @@ actual class NameSearchableList<N : Named> actual constructor() : MutableList<N>
         return super.remove(element)
     }
 
-}
+}