Update Gradle to v9

CHANGELOG.md

@@ -1,34 +1,5 @@
 # Changelog
 
-## 0.26.8
-
-* `Versions`:
-  * `KSLog`: `1.5.1` -> `1.5.2`
-  * `Compose`: `1.9.2` -> `1.9.3`
-  * `Ktor`: `3.3.1` -> `3.3.2`
-* `Coroutines`:
-  * Add simple suspend function `suspendPoint` which will ensure that current coroutine is active to let it be
-  destroyable even in case it have non-suspendable nature
-
-## 0.26.7
-
-* `Versions`:
-  * `Kotlin`: `2.2.20` -> `2.2.21`
-  * `Compose`: `1.8.2` -> `1.9.2`
-  * `KSP`: `2.2.20-2.0.3` -> `2.3.1`
-* `Coroutines`:
-  * Fix `SmartSemaphore.waitRelease` to wait for the exact number of permits
-  * Improve `SmartKeyRWLocker` tests
-* `KSP`:
-  * `Sealed`/`ClassCasts`/`Variations`:
-    * Add workaround for `NoSuchElementException` to improve processors stability on new `KSP`
-* `Koin`:
-  * `Generator`:
-    * Handle missing annotation values safely (`NoSuchElementException` workaround)
-* `Android`:
-  * `Pickers`:
-    * Add dependency `androidx.compose.material:material-icons-extended`
-
 ## 0.26.6
 
 * `Versions`:

android/pickers/build.gradle

@@ -13,7 +13,6 @@ kotlin {
         androidMain {
             dependencies {
                 api project(":micro_utils.android.smalltextfield")
-                api libs.jb.compose.icons
             }
         }
     }

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SmartSemaphore.kt

@@ -72,7 +72,7 @@ sealed interface SmartSemaphore {
                         acquiredPermits != checkedPermits
                     }
                     if (shouldContinue) {
-                        waitRelease(checkedPermits - acquiredPermits)
+                        waitRelease()
                     }
                 } while (shouldContinue && currentCoroutineContext().isActive)
             } catch (e: Throwable) {

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SuspendPoint.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.coroutines
-
-import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.ensureActive
-
-/**
- * Ensures that the current coroutine context is still active and throws a [kotlinx.coroutines.CancellationException]
- * if the coroutine has been canceled.
- *
- * This function provides a convenient way to check the active status of a coroutine, which is useful
- * to identify cancellation points in long-running or suspendable operations.
- *
- * @throws kotlinx.coroutines.CancellationException if the coroutine context is no longer active.
- */
-suspend fun suspendPoint() = currentCoroutineContext().ensureActive()

coroutines/src/commonTest/kotlin/SmartKeyRWLockerTests.kt

@@ -4,7 +4,6 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.test.runTest
-import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -14,517 +13,184 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class SmartKeyRWLockerTests {
-    private lateinit var locker: SmartKeyRWLocker<String>
-
-    @BeforeTest
-    fun setup() {
-        locker = SmartKeyRWLocker()
-    }
-
-    // ==================== Global Read Tests ====================
-
     @Test
-    fun testGlobalReadAllowsMultipleConcurrentReads() = runTest {
+    fun writeLockKeyFailedOnGlobalWriteLockTest() = runTest {
-        val results = mutableListOf<Boolean>()
+        val locker = SmartKeyRWLocker<String>()
-
+        val testKey = "test"
-        locker.acquireRead()
-
-        val jobs = List(5) {
-            launch {
-                locker.acquireRead()
-                delay(100.milliseconds)
-                results.add(true)
-                locker.releaseRead()
-            }
-        }
-
-        jobs.joinAll()
-        locker.releaseRead()
-
-        assertEquals(5, results.size)
-    }
-
-    @Test
-    fun testGlobalReadBlocksGlobalWrite() = runTest {
-        locker.acquireRead()
-
-        var writeAcquired = false
-        val writeJob = launch {
-            locker.lockWrite()
-            writeAcquired = true
-            locker.unlockWrite()
-        }
-
-        delay(200.milliseconds)
-        assertFalse(writeAcquired, "Write should be blocked by global read")
-
-        locker.releaseRead()
-        writeJob.join()
-
-        assertTrue(writeAcquired, "Write should succeed after read released")
-    }
-
-    @Test
-    fun testGlobalReadBlocksAllKeyWrites() = runTest {
-        locker.acquireRead()
-
-        val writeFlags = mutableMapOf<String, Boolean>()
-        val keys = listOf("key1", "key2", "key3")
-
-        val jobs = keys.map { key ->
-            launch {
-                locker.lockWrite(key)
-                writeFlags[key] = true
-                locker.unlockWrite(key)
-            }
-        }
-
-        delay(200.milliseconds)
-        assertTrue(writeFlags.isEmpty(), "No writes should succeed while global read active")
-
-        locker.releaseRead()
-        jobs.joinAll()
-
-        assertEquals(keys.size, writeFlags.size, "All writes should succeed after global read released")
-    }
-
-    // ==================== Global Write Tests ====================
-
-    @Test
-    fun testGlobalWriteBlocksAllOperations() = runTest {
         locker.lockWrite()
 
-        var globalReadAcquired = false
+        assertTrue { locker.isWriteLocked() }
-        var keyReadAcquired = false
-        var keyWriteAcquired = false
 
-        val jobs = listOf(
+        assertFails {
-            launch {
+            realWithTimeout(1.seconds) {
+                locker.lockWrite(testKey)
+            }
+        }
+        assertFalse { locker.isWriteLocked(testKey) }
+
+        locker.unlockWrite()
+        assertFalse { locker.isWriteLocked() }
+
+        realWithTimeout(1.seconds) {
+            locker.lockWrite(testKey)
+        }
+        assertTrue { locker.isWriteLocked(testKey) }
+        assertTrue { locker.unlockWrite(testKey) }
+        assertFalse { locker.isWriteLocked(testKey) }
+    }
+    @Test
+    fun writeLockKeyFailedOnGlobalReadLockTest() = runTest {
+        val locker = SmartKeyRWLocker<String>()
+        val testKey = "test"
+        locker.acquireRead()
+
+        assertEquals(Int.MAX_VALUE - 1, locker.readSemaphore().freePermits)
+
+        assertFails {
+            realWithTimeout(1.seconds) {
+                locker.lockWrite(testKey)
+            }
+        }
+        assertFalse { locker.isWriteLocked(testKey) }
+
+        locker.releaseRead()
+        assertEquals(Int.MAX_VALUE, locker.readSemaphore().freePermits)
+
+        realWithTimeout(1.seconds) {
+            locker.lockWrite(testKey)
+        }
+        assertTrue { locker.isWriteLocked(testKey) }
+        assertTrue { locker.unlockWrite(testKey) }
+        assertFalse { locker.isWriteLocked(testKey) }
+    }
+    @Test
+    fun readLockFailedOnWriteLockKeyTest() = runTest {
+        val locker = SmartKeyRWLocker<String>()
+        val testKey = "test"
+        locker.lockWrite(testKey)
+
+        assertTrue { locker.isWriteLocked(testKey) }
+
+        assertFails {
+            realWithTimeout(1.seconds) {
                 locker.acquireRead()
-                globalReadAcquired = true
-                locker.releaseRead()
-            },
-            launch {
-                locker.acquireRead("key1")
-                keyReadAcquired = true
-                locker.releaseRead("key1")
-            },
-            launch {
-                locker.lockWrite("key2")
-                keyWriteAcquired = true
-                locker.unlockWrite("key2")
-            }
-        )
-
-        delay(200.milliseconds)
-        assertFalse(globalReadAcquired, "Global read should be blocked")
-        assertFalse(keyReadAcquired, "Key read should be blocked")
-        assertFalse(keyWriteAcquired, "Key write should be blocked")
-
-        locker.unlockWrite()
-        jobs.joinAll()
-
-        assertTrue(globalReadAcquired)
-        assertTrue(keyReadAcquired)
-        assertTrue(keyWriteAcquired)
-    }
-
-    @Test
-    fun testGlobalWriteIsExclusive() = runTest {
-        locker.lockWrite()
-
-        var secondWriteAcquired = false
-        val job = launch {
-            locker.lockWrite()
-            secondWriteAcquired = true
-            locker.unlockWrite()
-        }
-
-        delay(200.milliseconds)
-        assertFalse(secondWriteAcquired, "Second global write should be blocked")
-
-        locker.unlockWrite()
-        job.join()
-
-        assertTrue(secondWriteAcquired)
-    }
-
-    // ==================== Key Read Tests ====================
-
-    @Test
-    fun testKeyReadAllowsMultipleConcurrentReadsForSameKey() = runTest {
-        val key = "testKey"
-        val results = mutableListOf<Boolean>()
-
-        locker.acquireRead(key)
-
-        val jobs = List(5) {
-            launch {
-                locker.acquireRead(key)
-                delay(50.milliseconds)
-                results.add(true)
-                locker.releaseRead(key)
             }
         }
+        assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits)
 
-        jobs.joinAll()
+        locker.unlockWrite(testKey)
-        locker.releaseRead(key)
+        assertFalse { locker.isWriteLocked(testKey) }
 
-        assertEquals(5, results.size)
+        realWithTimeout(1.seconds) {
-    }
-
-    @Test
-    fun testKeyReadAllowsReadsForDifferentKeys() = runTest {
-        val results = mutableMapOf<String, Boolean>()
-
-        locker.acquireRead("key1")
-
-        val jobs = listOf("key2", "key3", "key4").map { key ->
-            launch {
-                locker.acquireRead(key)
-                delay(50.milliseconds)
-                results[key] = true
-                locker.releaseRead(key)
-            }
-        }
-
-        jobs.joinAll()
-        locker.releaseRead("key1")
-
-        assertEquals(3, results.size)
-    }
-
-    @Test
-    fun testKeyReadBlocksWriteForSameKey() = runTest {
-        val key = "testKey"
-        locker.acquireRead(key)
-
-        var writeAcquired = false
-        val job = launch {
-            locker.lockWrite(key)
-            writeAcquired = true
-            locker.unlockWrite(key)
-        }
-
-        delay(200.milliseconds)
-        assertFalse(writeAcquired, "Write for same key should be blocked")
-
-        locker.releaseRead(key)
-        job.join()
-
-        assertTrue(writeAcquired)
-    }
-
-    @Test
-    fun testKeyReadBlocksGlobalWrite() = runTest {
-        locker.acquireRead("key1")
-
-        var globalWriteAcquired = false
-        val job = launch {
-            locker.lockWrite()
-            globalWriteAcquired = true
-            locker.unlockWrite()
-        }
-
-        delay(200.milliseconds)
-        assertFalse(globalWriteAcquired, "Global write should be blocked by key read")
-
-        locker.releaseRead("key1")
-        job.join()
-
-        assertTrue(globalWriteAcquired)
-    }
-
-    @Test
-    fun testKeyReadAllowsWriteForDifferentKey() = runTest {
-        locker.acquireRead("key1")
-
-        var writeAcquired = false
-        val job = launch {
-            locker.lockWrite("key2")
-            writeAcquired = true
-            locker.unlockWrite("key2")
-        }
-
-        job.join()
-        assertTrue(writeAcquired, "Write for different key should succeed")
-
-        locker.releaseRead("key1")
-    }
-
-    // ==================== Key Write Tests ====================
-
-    @Test
-    fun testKeyWriteBlocksReadForSameKey() = runTest {
-        val key = "testKey"
-        locker.lockWrite(key)
-
-        var readAcquired = false
-        val job = launch {
-            locker.acquireRead(key)
-            readAcquired = true
-            locker.releaseRead(key)
-        }
-
-        delay(200.milliseconds)
-        assertFalse(readAcquired, "Read for same key should be blocked")
-
-        locker.unlockWrite(key)
-        job.join()
-
-        assertTrue(readAcquired)
-    }
-
-    @Test
-    fun testKeyWriteBlocksGlobalRead() = runTest {
-        locker.lockWrite("key1")
-
-        var globalReadAcquired = false
-        val job = launch {
             locker.acquireRead()
-            globalReadAcquired = true
+        }
+        assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits)
+        assertTrue { locker.releaseRead() }
+        assertEquals(locker.readSemaphore().maxPermits, locker.readSemaphore().freePermits)
+    }
+    @Test
+    fun writeLockFailedOnWriteLockKeyTest() = runTest {
+        val locker = SmartKeyRWLocker<String>()
+        val testKey = "test"
+        locker.lockWrite(testKey)
+
+        assertTrue { locker.isWriteLocked(testKey) }
+
+        assertFails {
+            realWithTimeout(1.seconds) {
+                locker.lockWrite()
+            }
+        }
+        assertFalse(locker.isWriteLocked())
+
+        locker.unlockWrite(testKey)
+        assertFalse { locker.isWriteLocked(testKey) }
+
+        realWithTimeout(1.seconds) {
+            locker.lockWrite()
+        }
+        assertTrue(locker.isWriteLocked())
+        assertTrue { locker.unlockWrite() }
+        assertFalse(locker.isWriteLocked())
+    }
+    @Test
+    fun readsBlockingGlobalWrite() = runTest {
+        val locker = SmartKeyRWLocker<String>()
+
+        val testKeys = (0 until 100).map { "test$it" }
+
+        for (i in testKeys.indices) {
+            val it = testKeys[i]
+            locker.acquireRead(it)
+            val previous = testKeys.take(i)
+            val next = testKeys.drop(i + 1)
+
+            previous.forEach {
+                assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == Int.MAX_VALUE - 1 }
+            }
+            next.forEach {
+                assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == null }
+            }
+        }
+
+        for (i in testKeys.indices) {
+            val it = testKeys[i]
+            assertFails {
+                realWithTimeout(13.milliseconds) { locker.lockWrite() }
+            }
+            val readPermitsBeforeLock = locker.readSemaphore().freePermits
+            realWithTimeout(1.seconds) { locker.acquireRead() }
             locker.releaseRead()
+            assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits)
+
+            locker.releaseRead(it)
         }
 
-        delay(200.milliseconds)
+        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
-        assertFalse(globalReadAcquired, "Global read should be blocked by key write")
+        realWithTimeout(1.seconds) { locker.lockWrite() }
-
+        assertFails {
-        locker.unlockWrite("key1")
+            realWithTimeout(13.milliseconds) { locker.acquireRead() }
-        job.join()
-
-        assertTrue(globalReadAcquired)
-    }
-
-    @Test
-    fun testKeyWriteIsExclusiveForSameKey() = runTest {
-        val key = "testKey"
-        locker.lockWrite(key)
-
-        var secondWriteAcquired = false
-        val job = launch {
-            locker.lockWrite(key)
-            secondWriteAcquired = true
-            locker.unlockWrite(key)
         }
-
+        assertTrue { locker.unlockWrite() }
-        delay(200.milliseconds)
+        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
-        assertFalse(secondWriteAcquired, "Second write for same key should be blocked")
-
-        locker.unlockWrite(key)
-        job.join()
-
-        assertTrue(secondWriteAcquired)
     }
-
     @Test
-    fun testKeyWriteAllowsOperationsOnDifferentKeys() = runTest {
+    fun writesBlockingGlobalWrite() = runTest {
-        locker.lockWrite("key1")
+        val locker = SmartKeyRWLocker<String>()
 
-        val results = mutableMapOf<String, Boolean>()
+        val testKeys = (0 until 100).map { "test$it" }
 
-        val jobs = listOf(
+        for (i in testKeys.indices) {
-            launch {
+            val it = testKeys[i]
-                locker.acquireRead("key2")
+            locker.lockWrite(it)
-                results["read-key2"] = true
+            val previous = testKeys.take(i)
-                locker.releaseRead("key2")
+            val next = testKeys.drop(i + 1)
-            },
+
-            launch {
+            previous.forEach {
-                locker.lockWrite("key3")
+                assertTrue { locker.writeMutexOrNull(it) ?.isLocked == true }
-                results["write-key3"] = true
-                locker.unlockWrite("key3")
             }
-        )
+            next.forEach {
-
+                assertTrue { locker.writeMutexOrNull(it) ?.isLocked != true }
-        jobs.joinAll()
-        assertEquals(2, results.size, "Operations on different keys should succeed")
-
-        locker.unlockWrite("key1")
-    }
-
-    // ==================== Complex Scenarios ====================
-
-    @Test
-    fun testMultipleReadersThenWriter() = runTest {
-        val key = "testKey"
-        val readCount = 5
-        val readers = mutableListOf<Job>()
-
-        repeat(readCount) {
-            readers.add(launch {
-                locker.acquireRead(key)
-                delay(100.milliseconds)
-                locker.releaseRead(key)
-            })
-        }
-
-        delay(50.milliseconds) // Let readers acquire
-
-        var writerExecuted = false
-        val writer = launch {
-            locker.lockWrite(key)
-            writerExecuted = true
-            locker.unlockWrite(key)
-        }
-
-        delay(50.milliseconds)
-        assertFalse(writerExecuted, "Writer should wait for all readers")
-
-        readers.joinAll()
-        writer.join()
-
-        assertTrue(writerExecuted, "Writer should execute after all readers done")
-    }
-
-    @Test
-    fun testWriterThenMultipleReaders() = runTest {
-        val key = "testKey"
-
-        locker.lockWrite(key)
-
-        val readerFlags = mutableListOf<Boolean>()
-        val readers = List(5) {
-            launch {
-                locker.acquireRead(key)
-                readerFlags.add(true)
-                locker.releaseRead(key)
             }
         }
 
-        delay(200.milliseconds)
+        for (i in testKeys.indices) {
-        assertTrue(readerFlags.isEmpty(), "Readers should be blocked by writer")
+            val it = testKeys[i]
+            assertFails { realWithTimeout(13.milliseconds) { locker.lockWrite() } }
 
-        locker.unlockWrite(key)
+            val readPermitsBeforeLock = locker.readSemaphore().freePermits
-        readers.joinAll()
+            assertFails { realWithTimeout(13.milliseconds) { locker.acquireRead() } }
+            assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits)
 
-        assertEquals(5, readerFlags.size, "All readers should succeed after writer")
+            locker.unlockWrite(it)
-    }
-
-    @Test
-    fun testCascadingLocksWithDifferentKeys() = runTest {
-        val executed = mutableMapOf<String, Boolean>()
-
-        launch {
-            locker.lockWrite("key1")
-            executed["write-key1-start"] = true
-            delay(100.milliseconds)
-            locker.unlockWrite("key1")
-            executed["write-key1-end"] = true
         }
 
-        delay(50.milliseconds)
+        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
-
+        realWithTimeout(1.seconds) { locker.lockWrite() }
-        launch {
+        assertFails {
-            locker.acquireRead("key2")
+            realWithTimeout(13.milliseconds) { locker.acquireRead() }
-            executed["read-key2"] = true
-            delay(100.milliseconds)
-            locker.releaseRead("key2")
         }
-
+        assertTrue { locker.unlockWrite() }
-        delay(200.milliseconds)
+        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
-
-        assertTrue(executed["write-key1-start"] == true)
-        assertTrue(executed["read-key2"] == true)
-        assertTrue(executed["write-key1-end"] == true)
-    }
-
-    @Test
-    fun testReleaseWithoutAcquireReturnsFalse() = runTest {
-        assertFalse(locker.releaseRead(), "Release without acquire should return false")
-        assertFalse(locker.releaseRead("key1"), "Release without acquire should return false")
-    }
-
-    @Test
-    fun testUnlockWithoutLockReturnsFalse() = runTest {
-        assertFalse(locker.unlockWrite(), "Unlock without lock should return false")
-        assertFalse(locker.unlockWrite("key1"), "Unlock without lock should return false")
-    }
-
-    @Test
-    fun testProperReleaseReturnsTrue() = runTest {
-        locker.acquireRead()
-        assertTrue(locker.releaseRead(), "Release after acquire should return true")
-
-        locker.acquireRead("key1")
-        assertTrue(locker.releaseRead("key1"), "Release after acquire should return true")
-    }
-
-    @Test
-    fun testProperUnlockReturnsTrue() = runTest {
-        locker.lockWrite()
-        assertTrue(locker.unlockWrite(), "Unlock after lock should return true")
-
-        locker.lockWrite("key1")
-        assertTrue(locker.unlockWrite("key1"), "Unlock after lock should return true")
-    }
-
-    // ==================== Stress Tests ====================
-
-    @Test
-    fun stressTestWithMixedOperations() = runTest(timeout = 10.seconds) {
-        val operations = 100
-        val keys = listOf("key1", "key2", "key3", "key4", "key5")
-        val jobs = mutableListOf<Job>()
-
-        repeat(operations) { i ->
-            val key = keys[i % keys.size]
-
-            when (i % 4) {
-                0 -> jobs.add(launch {
-                    locker.acquireRead(key)
-                    delay(10.milliseconds)
-                    locker.releaseRead(key)
-                })
-                1 -> jobs.add(launch {
-                    locker.lockWrite(key)
-                    delay(10.milliseconds)
-                    locker.unlockWrite(key)
-                })
-                2 -> jobs.add(launch {
-                    locker.acquireRead()
-                    delay(10.milliseconds)
-                    locker.releaseRead()
-                })
-                3 -> jobs.add(launch {
-                    locker.lockWrite()
-                    delay(10.milliseconds)
-                    locker.unlockWrite()
-                })
-            }
-        }
-
-        jobs.joinAll()
-        // If we reach here without deadlock or exceptions, test passes
-    }
-
-    @Test
-    fun testFairnessReadersDontStarveWriters() = runTest(timeout = 5.seconds) {
-        val key = "testKey"
-        var writerExecuted = false
-
-        // Start continuous readers
-        val readers = List(10) {
-            launch {
-                repeat(5) {
-                    locker.acquireRead(key)
-                    delay(50.milliseconds)
-                    locker.releaseRead(key)
-                    delay(10.milliseconds)
-                }
-            }
-        }
-
-        delay(100.milliseconds)
-
-        // Try to acquire write lock
-        val writer = launch {
-            locker.lockWrite(key)
-            writerExecuted = true
-            locker.unlockWrite(key)
-        }
-
-        readers.joinAll()
-        writer.join()
-
-        assertTrue(writerExecuted, "Writer should eventually execute")
     }
 }

gradle.properties

@@ -8,8 +8,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
 
-## https://github.com/google/ksp/issues/2491
+# https://github.com/google/ksp/issues/2491
-#ksp.useKSP2=false
+ksp.useKSP2=false
 
 # JS NPM
 
@@ -18,5 +18,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.26.8
+version=0.26.6
-android_code_version=307
+android_code_version=305

gradle/libs.versions.toml

@@ -1,26 +1,24 @@
 [versions]
 
-kt = "2.2.21"
+kt = "2.2.20"
 kt-serialization = "1.9.0"
 kt-coroutines = "1.10.2"
 
 kotlinx-browser = "0.5.0"
 
-kslog = "1.5.2"
+kslog = "1.5.1"
 
-jb-compose = "1.9.3"
+jb-compose = "1.8.2"
-jb-compose-material3 = "1.9.0"
-jb-compose-icons = "1.7.8"
 jb-exposed = "0.61.0"
 jb-dokka = "2.1.0"
 
-# 3.51.0.0 contains bug, checking with ./gradlew :micro_utils.repos.exposed:jvmTest
+# 3.50.3.0 contains bug https://github.com/InsanusMokrassar/MicroUtils/actions/runs/18138301958/job/51629588088
 sqlite = "3.50.1.0"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
 
-ktor = "3.3.2"
+ktor = "3.3.1"
 
 gh-release = "2.5.2"
 
@@ -28,13 +26,13 @@ koin = "4.1.1"
 
 okio = "3.16.2"
 
-ksp = "2.3.2"
+ksp = "2.2.20-2.0.3"
 kotlin-poet = "2.2.0"
 
-versions = "0.53.0"
+versions = "0.52.0"
-nmcp = "1.3.0"
+nmcp = "1.1.0"
 
-android-gradle = "8.12.+"
+android-gradle = "8.10.+"
 dexcount = "4.0.0"
 
 android-coreKtx = "1.17.0"
@@ -91,8 +89,7 @@ jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-
 jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" }
 sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
 
-jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose-material3" }
+jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose" }
-jb-compose-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "jb-compose-icons" }
 
 android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
 android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }

gradle/templates/enableMPPAndroid.gradle

@@ -1,9 +1,6 @@
 kotlin {
     androidTarget {
-        publishLibraryVariants(
+        publishAllLibraryVariants()
-                "release",
-                "debug",
-        )
         compilations.all {
             kotlinOptions {
                 jvmTarget = "17"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,81 +15,114 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
+# This is normally unused
-APP_BASE_NAME=`basename "$0"`
+# shellcheck disable=SC2034
-
+APP_BASE_NAME=${0##*/}
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-            MAX_FD="$MAX_FD_LIMIT"
+        # shellcheck disable=SC2039,SC3045
-        fi
+        MAX_FD=$( ulimit -H -n ) ||
-        ulimit -n $MAX_FD
+            warn "Could not query maximum file descriptor limit"
-        if [ $? -ne 0 ] ; then
+    esac
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+    case $MAX_FD in  #(
-        fi
+      '' | soft) :;; #(
-    else
+      *)
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-    fi
+        # shellcheck disable=SC2039,SC3045
-fi
+        ulimit -n "$MAX_FD" ||
-
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=`save "$@"`
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -54,49 +57,35 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
-echo.
+echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo.
+echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation.
+echo location of your Java installation. 1>&2
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

koin/generator/src/main/kotlin/Processor.kt

@@ -27,7 +27,6 @@ import com.squareup.kotlinpoet.ksp.toClassName
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
 import dev.inmo.micro_ksp.generator.safeClassName
-import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_utils.koin.annotations.GenerateGenericKoinDefinition
 import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition
 import org.koin.core.Koin
@@ -241,14 +240,9 @@ class Processor(
                 ksFile.getAnnotationsByType(GenerateKoinDefinition::class).forEach {
                     val type = safeClassName { it.type }
                     val targetType = runCatching {
-                        type.parameterizedBy(
+                        type.parameterizedBy(*(it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type))
-                            *withNoSuchElementWorkaround(emptyArray()) {
-                                it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type
-                            }
-                        )
                     }.getOrElse { e ->
                         when (e) {
-                            is IllegalArgumentException if (e.message ?.contains("no type argument") == true) -> return@getOrElse type
                             is KSTypeNotPresentException -> e.ksType.toClassName()
                         }
                         if (e is KSTypesNotPresentException) {
@@ -257,32 +251,14 @@ class Processor(
                             throw e
                         }
                     }.copy(
-                        nullable = withNoSuchElementWorkaround(true) { it.nullable }
+                        nullable = it.nullable
                     )
 
-                    addCodeForType(
+                    addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory)
-                        targetType,
-                        it.name,
-                        withNoSuchElementWorkaround(true) {
-                            it.nullable
-                        },
-                        withNoSuchElementWorkaround(true) {
-                            it.generateSingle
-                        },
-                        withNoSuchElementWorkaround(true) {
-                            it.generateFactory
-                        }
-                    )
                 }
                 ksFile.getAnnotationsByType(GenerateGenericKoinDefinition::class).forEach {
                     val targetType = TypeVariableName("T", Any::class)
-                    addCodeForType(
+                    addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory)
-                        targetType = targetType,
-                        name = it.name,
-                        nullable = withNoSuchElementWorkaround(true) { it.nullable },
-                        generateSingle = withNoSuchElementWorkaround(true) { it.generateSingle },
-                        generateFactory = withNoSuchElementWorkaround(true) { it.generateFactory }
-                    )
                 }
             }.build().let {
                 File(

ksp/classcasts/generator/src/main/kotlin/Processor.kt

@@ -10,7 +10,6 @@ import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.symbol.*
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ksp.toClassName
-import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_ksp.generator.writeFile
 import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded
 import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded
@@ -26,11 +25,7 @@ class Processor(
     ) {
         val rootAnnotation = ksClassDeclaration.getAnnotationsByType(ClassCastsIncluded::class).first()
         val (includeRegex: Regex?, excludeRegex: Regex?) = rootAnnotation.let {
-            withNoSuchElementWorkaround("") {
+            it.typesRegex.takeIf { it.isNotEmpty() } ?.let(::Regex) to it.excludeRegex.takeIf { it.isNotEmpty() } ?.let(::Regex)
-                it.typesRegex
-            }.takeIf { it.isNotEmpty() } ?.let(::Regex) to withNoSuchElementWorkaround("") {
-                it.excludeRegex
-            }.takeIf { it.isNotEmpty() } ?.let(::Regex)
         }
         val classesSubtypes = mutableMapOf<KSClassDeclaration, MutableSet<KSClassDeclaration>>()
 
@@ -54,9 +49,7 @@ class Processor(
                 when {
                     potentialSubtype === ksClassDeclaration -> {}
                     potentialSubtype.isAnnotationPresent(ClassCastsExcluded::class) -> return@forEach
-                    potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(
+                    potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(rootAnnotation.levelsToInclude.takeIf { it >= 0 }) -> return@forEach
-                        withNoSuchElementWorkaround(-1) { rootAnnotation.levelsToInclude }.takeIf { it >= 0 }
-                    ) -> return@forEach
                     excludeRegex ?.matches(simpleName) == true -> return@forEach
                     includeRegex ?.matches(simpleName) == false -> {}
                     else -> classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(potentialSubtype)
@@ -103,9 +96,7 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(ClassCastsIncluded::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = withNoSuchElementWorkaround("") {
+            val prefix = it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
-                it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
-            }
             it.writeFile(prefix = prefix, suffix = "ClassCasts") {
                 FileSpec.builder(
                     it.packageName.asString(),

ksp/generator/src/main/kotlin/NoSuchElementWorkaround.kt

@@ -1,12 +0,0 @@
-package dev.inmo.micro_ksp.generator
-
-inline fun <T> withNoSuchElementWorkaround(
-    default: T,
-    block: () -> T
-): T = runCatching(block).getOrElse {
-    if (it is NoSuchElementException) {
-        default
-    } else {
-        throw it
-    }
-}

ksp/sealed/generator/src/main/kotlin/Processor.kt

@@ -12,7 +12,6 @@ import com.squareup.kotlinpoet.ksp.toClassName
 import dev.inmo.micro_ksp.generator.buildSubFileName
 import dev.inmo.micro_ksp.generator.companion
 import dev.inmo.micro_ksp.generator.findSubClasses
-import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_ksp.generator.writeFile
 import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
 import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
@@ -114,7 +113,7 @@ class Processor(
         val annotation = ksClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
         val subClasses = ksClassDeclaration.resolveSubclasses(
             searchIn = resolver.getAllFiles(),
-            allowNonSealed = withNoSuchElementWorkaround(null) { annotation ?.includeNonSealedSubTypes } ?: false
+            allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
         ).distinct()
         val subClassesNames = subClasses.filter {
             it.getAnnotationsByType(GenerateSealedTypesWorkaround.Exclude::class).count() == 0
@@ -165,15 +164,7 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = runCatching {
+            val prefix = (it.getGenerateSealedWorkaroundAnnotation) ?.prefix ?.takeIf {
-                (it.getGenerateSealedWorkaroundAnnotation) ?.prefix
-            }.getOrElse {
-                if (it is NoSuchElementException) {
-                    ""
-                } else {
-                    throw it
-                }
-            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {
@@ -193,9 +184,7 @@ class Processor(
             }
         }
         (resolver.getSymbolsWithAnnotation(GenerateSealedTypesWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = withNoSuchElementWorkaround("") {
+            val prefix = (it.getGenerateSealedTypesWorkaroundAnnotation) ?.prefix ?.takeIf {
-                (it.getGenerateSealedTypesWorkaroundAnnotation)?.prefix
-            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "SealedTypesWorkaround") {

ksp/variations/generator/src/main/kotlin/Processor.kt

@@ -16,7 +16,6 @@ import com.squareup.kotlinpoet.ksp.toTypeName
 import dev.inmo.micro_ksp.generator.convertToClassName
 import dev.inmo.micro_ksp.generator.convertToClassNames
 import dev.inmo.micro_ksp.generator.findSubClasses
-import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_ksp.generator.writeFile
 import dev.inmo.micro_utils.ksp.variations.GenerateVariations
 import dev.inmo.micro_utils.ksp.variations.GenerationVariant
@@ -219,9 +218,7 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(GenerateVariations::class.qualifiedName!!)).filterIsInstance<KSFunctionDeclaration>().forEach {
-            val prefix = withNoSuchElementWorkaround("") {
+            val prefix = (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix ?.takeIf {
-                (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix
-            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.simpleName.asString().replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "GeneratedVariation") {