Merge branch 'master' into dependabot/gradle/kotlinx-coroutines-1.10.0

buildSrc/build.gradle.kts

@@ -7,10 +7,8 @@ dependencies {
     api(libs.kotlin.gradle.plugin)
     api(libs.kotlin.serialization.plugin)
     api(libs.kotlin.serialization.plugin)
-    api(libs.kotlin.power.assert.plugin)
     api(libs.ktlint.gradle)
     api(libs.dokka.gradle.plugin)
     api(libs.android.gradle.plugin)
     api(libs.nexus.publish.plugin)
-    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }

gradle/libs.versions.toml

@@ -27,7 +27,6 @@ h2 = { module = "com.h2database:h2", version.ref = "h2" }
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
-kotlin-power-assert-plugin = { module = "org.jetbrains.kotlin:kotlin-power-assert", version.ref = "kotlin" }
 kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }

settings.gradle.kts

@@ -24,14 +24,14 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 include(
     ":core",
-    ":tests",
-    ":stores:mvstore",
+    ":samples:js-http-client",
+    ":samples:kmp-app",
+    ":samples:ktor-server",
     ":stores:browser",
     ":stores:leveldb",
+    ":stores:mvstore",
+    ":tests",
     ":version-catalog",
-    ":samples:js-http-client",
-    ":samples:ktor-server",
-    ":samples:kmp-app",
 )
 
 val levelDbPath: Path = file("../kotlin-leveldb").toPath()

stores/leveldb/src/androidNativeTest/kotlin/com/github/lamba92/kotlin/document/store/tests/stores/leveldb/LeveldbTests.androidNative.kt

@@ -1,16 +1,6 @@
 package com.github.lamba92.kotlin.document.store.tests.stores.leveldb
 
-import kotlinx.io.files.Path
-
 actual val DB_PATH: String
     get() = error()
 
-actual fun Path.createDirectories(): Path {
-    error()
-}
-
 private fun error(): Nothing = error("Kotlin/Native has no tests suite for Android Native")
-
-actual fun Path.resolve(path: String): Path {
-    error()
-}

stores/leveldb/src/commonTest/kotlin/com/github/lamba92/kotlin/document/store/tests/stores/leveldb/LeveldbTests.kt

@@ -17,6 +17,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.withContext
 import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
 
 class LevelDBDeleteTests : AbstractDeleteTests(LevelDBStoreProvider)
 
@@ -37,7 +38,7 @@ object LevelDBStoreProvider : DataStoreProvider {
 
     override suspend fun deleteDatabase(testName: String) =
         withContext(Dispatchers.IO) {
-            deleteFolderRecursively(getDbPath(testName).toString())
+            getDbPath(testName).deleteRecursively()
         }
 
     override fun provide(testName: String): DataStore =
@@ -50,10 +51,32 @@ object LevelDBStoreProvider : DataStoreProvider {
         )
 }
 
-expect fun Path.resolve(path: String): Path
+fun Path.resolve(vararg other: String): Path = Path(this, *other)
 
-expect fun Path.createDirectories(): Path
-
-expect fun deleteFolderRecursively(path: String)
+fun Path.createDirectories(): Path {
+    SystemFileSystem.createDirectories(this, false)
+    return this
+}
 
 expect val DB_PATH: String
+
+val Path.isFile: Boolean
+    get() = SystemFileSystem.metadataOrNull(this)?.isRegularFile == true
+
+val Path.isDirectory
+    get() = SystemFileSystem.metadataOrNull(this)?.isDirectory == true
+
+fun Path.delete() = SystemFileSystem.delete(this, false)
+
+fun Path.deleteRecursively() {
+    if (isDirectory) {
+        SystemFileSystem.list(this@deleteRecursively)
+            .forEach {
+                when {
+                    it.isFile -> it.delete()
+                    it.isDirectory -> it.deleteRecursively()
+                }
+            }
+    }
+    delete()
+}