mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2026-01-17 02:38:06 +00:00
Compare commits
13 Commits
6fc96e1ff3
...
renovate/s
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5bb9a6041b | ||
| 52c4867468 | |||
| 92b3fd25e7 | |||
| e0e1da5082 | |||
| 80953f5d09 | |||
| 2849db57f2 | |||
| 0170b92272 | |||
| 7bcb81400b | |||
| 078aedfb68 | |||
| cb56bf9793 | |||
| b152986b4e | |||
| fce47897d5 | |||
| 0b701a3e99 |
29
CHANGELOG.md
29
CHANGELOG.md
@@ -1,5 +1,34 @@
|
|||||||
# Changelog
|
# 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
|
## 0.26.6
|
||||||
|
|
||||||
* `Versions`:
|
* `Versions`:
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ kotlin {
|
|||||||
androidMain {
|
androidMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(":micro_utils.android.smalltextfield")
|
api project(":micro_utils.android.smalltextfield")
|
||||||
|
api libs.jb.compose.icons
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ sealed interface SmartSemaphore {
|
|||||||
acquiredPermits != checkedPermits
|
acquiredPermits != checkedPermits
|
||||||
}
|
}
|
||||||
if (shouldContinue) {
|
if (shouldContinue) {
|
||||||
waitRelease()
|
waitRelease(checkedPermits - acquiredPermits)
|
||||||
}
|
}
|
||||||
} while (shouldContinue && currentCoroutineContext().isActive)
|
} while (shouldContinue && currentCoroutineContext().isActive)
|
||||||
} catch (e: Throwable) {
|
} catch (e: Throwable) {
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
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()
|
||||||
@@ -4,6 +4,7 @@ import kotlinx.coroutines.flow.first
|
|||||||
import kotlinx.coroutines.sync.Mutex
|
import kotlinx.coroutines.sync.Mutex
|
||||||
import kotlinx.coroutines.sync.withLock
|
import kotlinx.coroutines.sync.withLock
|
||||||
import kotlinx.coroutines.test.runTest
|
import kotlinx.coroutines.test.runTest
|
||||||
|
import kotlin.test.BeforeTest
|
||||||
import kotlin.test.Test
|
import kotlin.test.Test
|
||||||
import kotlin.test.assertEquals
|
import kotlin.test.assertEquals
|
||||||
import kotlin.test.assertFails
|
import kotlin.test.assertFails
|
||||||
@@ -13,184 +14,517 @@ import kotlin.time.Duration.Companion.milliseconds
|
|||||||
import kotlin.time.Duration.Companion.seconds
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
|
||||||
class SmartKeyRWLockerTests {
|
class SmartKeyRWLockerTests {
|
||||||
@Test
|
private lateinit var locker: SmartKeyRWLocker<String>
|
||||||
fun writeLockKeyFailedOnGlobalWriteLockTest() = runTest {
|
|
||||||
val locker = SmartKeyRWLocker<String>()
|
|
||||||
val testKey = "test"
|
|
||||||
locker.lockWrite()
|
|
||||||
|
|
||||||
assertTrue { locker.isWriteLocked() }
|
@BeforeTest
|
||||||
|
fun setup() {
|
||||||
assertFails {
|
locker = SmartKeyRWLocker()
|
||||||
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) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==================== Global Read Tests ====================
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun writeLockKeyFailedOnGlobalReadLockTest() = runTest {
|
fun testGlobalReadAllowsMultipleConcurrentReads() = runTest {
|
||||||
val locker = SmartKeyRWLocker<String>()
|
val results = mutableListOf<Boolean>()
|
||||||
val testKey = "test"
|
|
||||||
locker.acquireRead()
|
locker.acquireRead()
|
||||||
|
|
||||||
assertEquals(Int.MAX_VALUE - 1, locker.readSemaphore().freePermits)
|
val jobs = List(5) {
|
||||||
|
launch {
|
||||||
assertFails {
|
locker.acquireRead()
|
||||||
realWithTimeout(1.seconds) {
|
delay(100.milliseconds)
|
||||||
locker.lockWrite(testKey)
|
results.add(true)
|
||||||
|
locker.releaseRead()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
assertFalse { locker.isWriteLocked(testKey) }
|
|
||||||
|
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()
|
locker.releaseRead()
|
||||||
assertEquals(Int.MAX_VALUE, locker.readSemaphore().freePermits)
|
writeJob.join()
|
||||||
|
|
||||||
realWithTimeout(1.seconds) {
|
assertTrue(writeAcquired, "Write should succeed after read released")
|
||||||
locker.lockWrite(testKey)
|
|
||||||
}
|
|
||||||
assertTrue { locker.isWriteLocked(testKey) }
|
|
||||||
assertTrue { locker.unlockWrite(testKey) }
|
|
||||||
assertFalse { locker.isWriteLocked(testKey) }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun readLockFailedOnWriteLockKeyTest() = runTest {
|
fun testGlobalReadBlocksAllKeyWrites() = runTest {
|
||||||
val locker = SmartKeyRWLocker<String>()
|
locker.acquireRead()
|
||||||
val testKey = "test"
|
|
||||||
locker.lockWrite(testKey)
|
|
||||||
|
|
||||||
assertTrue { locker.isWriteLocked(testKey) }
|
val writeFlags = mutableMapOf<String, Boolean>()
|
||||||
|
val keys = listOf("key1", "key2", "key3")
|
||||||
|
|
||||||
assertFails {
|
val jobs = keys.map { key ->
|
||||||
realWithTimeout(1.seconds) {
|
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
|
||||||
|
var keyReadAcquired = false
|
||||||
|
var keyWriteAcquired = false
|
||||||
|
|
||||||
|
val jobs = listOf(
|
||||||
|
launch {
|
||||||
locker.acquireRead()
|
locker.acquireRead()
|
||||||
|
globalReadAcquired = true
|
||||||
|
locker.releaseRead()
|
||||||
|
},
|
||||||
|
launch {
|
||||||
|
locker.acquireRead("key1")
|
||||||
|
keyReadAcquired = true
|
||||||
|
locker.releaseRead("key1")
|
||||||
|
},
|
||||||
|
launch {
|
||||||
|
locker.lockWrite("key2")
|
||||||
|
keyWriteAcquired = true
|
||||||
|
locker.unlockWrite("key2")
|
||||||
}
|
}
|
||||||
}
|
)
|
||||||
assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits)
|
|
||||||
|
|
||||||
locker.unlockWrite(testKey)
|
delay(200.milliseconds)
|
||||||
assertFalse { locker.isWriteLocked(testKey) }
|
assertFalse(globalReadAcquired, "Global read should be blocked")
|
||||||
|
assertFalse(keyReadAcquired, "Key read should be blocked")
|
||||||
|
assertFalse(keyWriteAcquired, "Key write should be blocked")
|
||||||
|
|
||||||
realWithTimeout(1.seconds) {
|
locker.unlockWrite()
|
||||||
locker.acquireRead()
|
jobs.joinAll()
|
||||||
}
|
|
||||||
assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits)
|
assertTrue(globalReadAcquired)
|
||||||
assertTrue { locker.releaseRead() }
|
assertTrue(keyReadAcquired)
|
||||||
assertEquals(locker.readSemaphore().maxPermits, locker.readSemaphore().freePermits)
|
assertTrue(keyWriteAcquired)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun writeLockFailedOnWriteLockKeyTest() = runTest {
|
fun testGlobalWriteIsExclusive() = runTest {
|
||||||
val locker = SmartKeyRWLocker<String>()
|
locker.lockWrite()
|
||||||
val testKey = "test"
|
|
||||||
locker.lockWrite(testKey)
|
|
||||||
|
|
||||||
assertTrue { locker.isWriteLocked(testKey) }
|
var secondWriteAcquired = false
|
||||||
|
val job = launch {
|
||||||
assertFails {
|
|
||||||
realWithTimeout(1.seconds) {
|
|
||||||
locker.lockWrite()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
assertFalse(locker.isWriteLocked())
|
|
||||||
|
|
||||||
locker.unlockWrite(testKey)
|
|
||||||
assertFalse { locker.isWriteLocked(testKey) }
|
|
||||||
|
|
||||||
realWithTimeout(1.seconds) {
|
|
||||||
locker.lockWrite()
|
locker.lockWrite()
|
||||||
|
secondWriteAcquired = true
|
||||||
|
locker.unlockWrite()
|
||||||
}
|
}
|
||||||
assertTrue(locker.isWriteLocked())
|
|
||||||
assertTrue { locker.unlockWrite() }
|
delay(200.milliseconds)
|
||||||
assertFalse(locker.isWriteLocked())
|
assertFalse(secondWriteAcquired, "Second global write should be blocked")
|
||||||
|
|
||||||
|
locker.unlockWrite()
|
||||||
|
job.join()
|
||||||
|
|
||||||
|
assertTrue(secondWriteAcquired)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==================== Key Read Tests ====================
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun readsBlockingGlobalWrite() = runTest {
|
fun testKeyReadAllowsMultipleConcurrentReadsForSameKey() = runTest {
|
||||||
val locker = SmartKeyRWLocker<String>()
|
val key = "testKey"
|
||||||
|
val results = mutableListOf<Boolean>()
|
||||||
|
|
||||||
val testKeys = (0 until 100).map { "test$it" }
|
locker.acquireRead(key)
|
||||||
|
|
||||||
for (i in testKeys.indices) {
|
val jobs = List(5) {
|
||||||
val it = testKeys[i]
|
launch {
|
||||||
locker.acquireRead(it)
|
locker.acquireRead(key)
|
||||||
val previous = testKeys.take(i)
|
delay(50.milliseconds)
|
||||||
val next = testKeys.drop(i + 1)
|
results.add(true)
|
||||||
|
locker.releaseRead(key)
|
||||||
previous.forEach {
|
|
||||||
assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == Int.MAX_VALUE - 1 }
|
|
||||||
}
|
|
||||||
next.forEach {
|
|
||||||
assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == null }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i in testKeys.indices) {
|
jobs.joinAll()
|
||||||
val it = testKeys[i]
|
locker.releaseRead(key)
|
||||||
assertFails {
|
|
||||||
realWithTimeout(13.milliseconds) { locker.lockWrite() }
|
assertEquals(5, results.size)
|
||||||
|
}
|
||||||
|
|
||||||
|
@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)
|
||||||
}
|
}
|
||||||
val readPermitsBeforeLock = locker.readSemaphore().freePermits
|
}
|
||||||
realWithTimeout(1.seconds) { locker.acquireRead() }
|
|
||||||
|
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
|
||||||
locker.releaseRead()
|
locker.releaseRead()
|
||||||
assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits)
|
|
||||||
|
|
||||||
locker.releaseRead(it)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
|
delay(200.milliseconds)
|
||||||
realWithTimeout(1.seconds) { locker.lockWrite() }
|
assertFalse(globalReadAcquired, "Global read should be blocked by key write")
|
||||||
assertFails {
|
|
||||||
realWithTimeout(13.milliseconds) { locker.acquireRead() }
|
locker.unlockWrite("key1")
|
||||||
}
|
job.join()
|
||||||
assertTrue { locker.unlockWrite() }
|
|
||||||
assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
|
assertTrue(globalReadAcquired)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun writesBlockingGlobalWrite() = runTest {
|
fun testKeyWriteIsExclusiveForSameKey() = runTest {
|
||||||
val locker = SmartKeyRWLocker<String>()
|
val key = "testKey"
|
||||||
|
locker.lockWrite(key)
|
||||||
|
|
||||||
val testKeys = (0 until 100).map { "test$it" }
|
var secondWriteAcquired = false
|
||||||
|
val job = launch {
|
||||||
|
locker.lockWrite(key)
|
||||||
|
secondWriteAcquired = true
|
||||||
|
locker.unlockWrite(key)
|
||||||
|
}
|
||||||
|
|
||||||
for (i in testKeys.indices) {
|
delay(200.milliseconds)
|
||||||
val it = testKeys[i]
|
assertFalse(secondWriteAcquired, "Second write for same key should be blocked")
|
||||||
locker.lockWrite(it)
|
|
||||||
val previous = testKeys.take(i)
|
|
||||||
val next = testKeys.drop(i + 1)
|
|
||||||
|
|
||||||
previous.forEach {
|
locker.unlockWrite(key)
|
||||||
assertTrue { locker.writeMutexOrNull(it) ?.isLocked == true }
|
job.join()
|
||||||
|
|
||||||
|
assertTrue(secondWriteAcquired)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testKeyWriteAllowsOperationsOnDifferentKeys() = runTest {
|
||||||
|
locker.lockWrite("key1")
|
||||||
|
|
||||||
|
val results = mutableMapOf<String, Boolean>()
|
||||||
|
|
||||||
|
val jobs = listOf(
|
||||||
|
launch {
|
||||||
|
locker.acquireRead("key2")
|
||||||
|
results["read-key2"] = true
|
||||||
|
locker.releaseRead("key2")
|
||||||
|
},
|
||||||
|
launch {
|
||||||
|
locker.lockWrite("key3")
|
||||||
|
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i in testKeys.indices) {
|
delay(200.milliseconds)
|
||||||
val it = testKeys[i]
|
assertTrue(readerFlags.isEmpty(), "Readers should be blocked by writer")
|
||||||
assertFails { realWithTimeout(13.milliseconds) { locker.lockWrite() } }
|
|
||||||
|
|
||||||
val readPermitsBeforeLock = locker.readSemaphore().freePermits
|
locker.unlockWrite(key)
|
||||||
assertFails { realWithTimeout(13.milliseconds) { locker.acquireRead() } }
|
readers.joinAll()
|
||||||
assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits)
|
|
||||||
|
|
||||||
locker.unlockWrite(it)
|
assertEquals(5, readerFlags.size, "All readers should succeed after writer")
|
||||||
|
}
|
||||||
|
|
||||||
|
@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
|
||||||
}
|
}
|
||||||
|
|
||||||
assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
|
delay(50.milliseconds)
|
||||||
realWithTimeout(1.seconds) { locker.lockWrite() }
|
|
||||||
assertFails {
|
launch {
|
||||||
realWithTimeout(13.milliseconds) { locker.acquireRead() }
|
locker.acquireRead("key2")
|
||||||
|
executed["read-key2"] = true
|
||||||
|
delay(100.milliseconds)
|
||||||
|
locker.releaseRead("key2")
|
||||||
}
|
}
|
||||||
assertTrue { locker.unlockWrite() }
|
|
||||||
assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
|
delay(200.milliseconds)
|
||||||
|
|
||||||
|
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")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ android.useAndroidX=true
|
|||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
|
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
|
# JS NPM
|
||||||
|
|
||||||
@@ -18,5 +18,5 @@ crypto_js_version=4.1.1
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.26.6
|
version=0.26.8
|
||||||
android_code_version=305
|
android_code_version=307
|
||||||
|
|||||||
@@ -1,24 +1,26 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kt = "2.2.20"
|
kt = "2.2.21"
|
||||||
kt-serialization = "1.9.0"
|
kt-serialization = "1.9.0"
|
||||||
kt-coroutines = "1.10.2"
|
kt-coroutines = "1.10.2"
|
||||||
|
|
||||||
kotlinx-browser = "0.5.0"
|
kotlinx-browser = "0.5.0"
|
||||||
|
|
||||||
kslog = "1.5.1"
|
kslog = "1.5.2"
|
||||||
|
|
||||||
jb-compose = "1.8.2"
|
jb-compose = "1.9.3"
|
||||||
|
jb-compose-material3 = "1.9.0"
|
||||||
|
jb-compose-icons = "1.7.8"
|
||||||
jb-exposed = "0.61.0"
|
jb-exposed = "0.61.0"
|
||||||
jb-dokka = "2.1.0"
|
jb-dokka = "2.1.0"
|
||||||
|
|
||||||
# 3.50.3.0 contains bug https://github.com/InsanusMokrassar/MicroUtils/actions/runs/18138301958/job/51629588088
|
# 3.51.0.0 contains bug, checking with ./gradlew :micro_utils.repos.exposed:jvmTest
|
||||||
sqlite = "3.50.1.0"
|
sqlite = "3.51.1.0"
|
||||||
|
|
||||||
korlibs = "5.4.0"
|
korlibs = "5.4.0"
|
||||||
uuid = "0.8.4"
|
uuid = "0.8.4"
|
||||||
|
|
||||||
ktor = "3.3.1"
|
ktor = "3.3.2"
|
||||||
|
|
||||||
gh-release = "2.5.2"
|
gh-release = "2.5.2"
|
||||||
|
|
||||||
@@ -26,13 +28,13 @@ koin = "4.1.1"
|
|||||||
|
|
||||||
okio = "3.16.2"
|
okio = "3.16.2"
|
||||||
|
|
||||||
ksp = "2.2.20-2.0.3"
|
ksp = "2.3.2"
|
||||||
kotlin-poet = "2.2.0"
|
kotlin-poet = "2.2.0"
|
||||||
|
|
||||||
versions = "0.52.0"
|
versions = "0.53.0"
|
||||||
nmcp = "1.1.0"
|
nmcp = "1.2.0"
|
||||||
|
|
||||||
android-gradle = "8.10.+"
|
android-gradle = "8.12.+"
|
||||||
dexcount = "4.0.0"
|
dexcount = "4.0.0"
|
||||||
|
|
||||||
android-coreKtx = "1.17.0"
|
android-coreKtx = "1.17.0"
|
||||||
@@ -89,7 +91,8 @@ jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-
|
|||||||
jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" }
|
jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" }
|
||||||
sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
|
sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
|
||||||
|
|
||||||
jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose" }
|
jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose-material3" }
|
||||||
|
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-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
|
||||||
android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
|
android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
kotlin {
|
kotlin {
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishAllLibraryVariants()
|
publishLibraryVariants(
|
||||||
|
"release",
|
||||||
|
"debug",
|
||||||
|
)
|
||||||
compilations.all {
|
compilations.all {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "17"
|
jvmTarget = "17"
|
||||||
|
|||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,7 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||||
networkTimeout=10000
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
285
gradlew
vendored
285
gradlew
vendored
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright © 2015 the original authors.
|
# Copyright 2015 the original author or authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -15,114 +15,81 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
##
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
## Gradle start up script for UN*X
|
||||||
#
|
##
|
||||||
# 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
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
app_path=$0
|
PRG="$0"
|
||||||
|
# Need this for relative symlinks.
|
||||||
# Need this for daisy-chained symlinks.
|
while [ -h "$PRG" ] ; do
|
||||||
while
|
ls=`ls -ld "$PRG"`
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||||
[ -h "$app_path" ]
|
if expr "$link" : '/.*' > /dev/null; then
|
||||||
do
|
PRG="$link"
|
||||||
ls=$( ls -ld "$app_path" )
|
else
|
||||||
link=${ls#*' -> '}
|
PRG=`dirname "$PRG"`"/$link"
|
||||||
case $link in #(
|
fi
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
done
|
||||||
|
SAVED="`pwd`"
|
||||||
|
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||||
|
APP_HOME="`pwd -P`"
|
||||||
|
cd "$SAVED" >/dev/null
|
||||||
|
|
||||||
# This is normally unused
|
APP_NAME="Gradle"
|
||||||
# shellcheck disable=SC2034
|
APP_BASE_NAME=`basename "$0"`
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD="maximum"
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
} >&2
|
}
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
} >&2
|
}
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "$( uname )" in #(
|
case "`uname`" in
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
CYGWIN* )
|
||||||
Darwin* ) darwin=true ;; #(
|
cygwin=true
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
;;
|
||||||
NONSTOP* ) nonstop=true ;;
|
Darwin* )
|
||||||
|
darwin=true
|
||||||
|
;;
|
||||||
|
MINGW* )
|
||||||
|
msys=true
|
||||||
|
;;
|
||||||
|
NONSTOP* )
|
||||||
|
nonstop=true
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||||
else
|
else
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
JAVACMD="$JAVA_HOME/bin/java"
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -131,118 +98,88 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD="java"
|
||||||
if ! command -v java >/dev/null 2>&1
|
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
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
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
||||||
case $MAX_FD in #(
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
max*)
|
if [ $? -eq 0 ] ; then
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||||
# shellcheck disable=SC2039,SC3045
|
MAX_FD="$MAX_FD_LIMIT"
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
fi
|
||||||
warn "Could not query maximum file descriptor limit"
|
ulimit -n $MAX_FD
|
||||||
esac
|
if [ $? -ne 0 ] ; then
|
||||||
case $MAX_FD in #(
|
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||||
'' | soft) :;; #(
|
fi
|
||||||
*)
|
else
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||||
# shellcheck disable=SC2039,SC3045
|
fi
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
# For Darwin, add options to specify how the application appears in the dock
|
||||||
# * args from the command line
|
if $darwin; then
|
||||||
# * the main class name
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
# * -classpath
|
fi
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
|
||||||
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
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`
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
SEP=""
|
||||||
for arg do
|
for dir in $ROOTDIRSRAW ; do
|
||||||
if
|
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||||
case $arg in #(
|
SEP="|"
|
||||||
-*) 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
|
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
|
fi
|
||||||
|
|
||||||
|
# Escape application args
|
||||||
|
save () {
|
||||||
|
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
||||||
|
echo " "
|
||||||
|
}
|
||||||
|
APP_ARGS=`save "$@"`
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
||||||
|
|
||||||
# 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" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
|
|||||||
57
gradlew.bat
vendored
57
gradlew.bat
vendored
@@ -13,10 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%" == "" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@@ -27,8 +25,7 @@
|
|||||||
if "%OS%"=="Windows_NT" setlocal
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@@ -43,13 +40,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,35 +54,49 @@ goto fail
|
|||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
echo. 1>&2
|
echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation. 1>&2
|
echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
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
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
exit /b 1
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
|
||||||
exit /b %EXIT_CODE%
|
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import com.squareup.kotlinpoet.ksp.toClassName
|
|||||||
import com.squareup.kotlinpoet.ksp.toTypeName
|
import com.squareup.kotlinpoet.ksp.toTypeName
|
||||||
import com.squareup.kotlinpoet.ksp.writeTo
|
import com.squareup.kotlinpoet.ksp.writeTo
|
||||||
import dev.inmo.micro_ksp.generator.safeClassName
|
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.GenerateGenericKoinDefinition
|
||||||
import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition
|
import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition
|
||||||
import org.koin.core.Koin
|
import org.koin.core.Koin
|
||||||
@@ -240,9 +241,14 @@ class Processor(
|
|||||||
ksFile.getAnnotationsByType(GenerateKoinDefinition::class).forEach {
|
ksFile.getAnnotationsByType(GenerateKoinDefinition::class).forEach {
|
||||||
val type = safeClassName { it.type }
|
val type = safeClassName { it.type }
|
||||||
val targetType = runCatching {
|
val targetType = runCatching {
|
||||||
type.parameterizedBy(*(it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type))
|
type.parameterizedBy(
|
||||||
|
*withNoSuchElementWorkaround(emptyArray()) {
|
||||||
|
it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type
|
||||||
|
}
|
||||||
|
)
|
||||||
}.getOrElse { e ->
|
}.getOrElse { e ->
|
||||||
when (e) {
|
when (e) {
|
||||||
|
is IllegalArgumentException if (e.message ?.contains("no type argument") == true) -> return@getOrElse type
|
||||||
is KSTypeNotPresentException -> e.ksType.toClassName()
|
is KSTypeNotPresentException -> e.ksType.toClassName()
|
||||||
}
|
}
|
||||||
if (e is KSTypesNotPresentException) {
|
if (e is KSTypesNotPresentException) {
|
||||||
@@ -251,14 +257,32 @@ class Processor(
|
|||||||
throw e
|
throw e
|
||||||
}
|
}
|
||||||
}.copy(
|
}.copy(
|
||||||
nullable = it.nullable
|
nullable = withNoSuchElementWorkaround(true) { it.nullable }
|
||||||
)
|
)
|
||||||
|
|
||||||
addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory)
|
addCodeForType(
|
||||||
|
targetType,
|
||||||
|
it.name,
|
||||||
|
withNoSuchElementWorkaround(true) {
|
||||||
|
it.nullable
|
||||||
|
},
|
||||||
|
withNoSuchElementWorkaround(true) {
|
||||||
|
it.generateSingle
|
||||||
|
},
|
||||||
|
withNoSuchElementWorkaround(true) {
|
||||||
|
it.generateFactory
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
ksFile.getAnnotationsByType(GenerateGenericKoinDefinition::class).forEach {
|
ksFile.getAnnotationsByType(GenerateGenericKoinDefinition::class).forEach {
|
||||||
val targetType = TypeVariableName("T", Any::class)
|
val targetType = TypeVariableName("T", Any::class)
|
||||||
addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory)
|
addCodeForType(
|
||||||
|
targetType = targetType,
|
||||||
|
name = it.name,
|
||||||
|
nullable = withNoSuchElementWorkaround(true) { it.nullable },
|
||||||
|
generateSingle = withNoSuchElementWorkaround(true) { it.generateSingle },
|
||||||
|
generateFactory = withNoSuchElementWorkaround(true) { it.generateFactory }
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}.build().let {
|
}.build().let {
|
||||||
File(
|
File(
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import com.google.devtools.ksp.processing.SymbolProcessor
|
|||||||
import com.google.devtools.ksp.symbol.*
|
import com.google.devtools.ksp.symbol.*
|
||||||
import com.squareup.kotlinpoet.*
|
import com.squareup.kotlinpoet.*
|
||||||
import com.squareup.kotlinpoet.ksp.toClassName
|
import com.squareup.kotlinpoet.ksp.toClassName
|
||||||
|
import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
|
||||||
import dev.inmo.micro_ksp.generator.writeFile
|
import dev.inmo.micro_ksp.generator.writeFile
|
||||||
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded
|
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded
|
||||||
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded
|
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded
|
||||||
@@ -25,7 +26,11 @@ class Processor(
|
|||||||
) {
|
) {
|
||||||
val rootAnnotation = ksClassDeclaration.getAnnotationsByType(ClassCastsIncluded::class).first()
|
val rootAnnotation = ksClassDeclaration.getAnnotationsByType(ClassCastsIncluded::class).first()
|
||||||
val (includeRegex: Regex?, excludeRegex: Regex?) = rootAnnotation.let {
|
val (includeRegex: Regex?, excludeRegex: Regex?) = rootAnnotation.let {
|
||||||
it.typesRegex.takeIf { it.isNotEmpty() } ?.let(::Regex) to it.excludeRegex.takeIf { it.isNotEmpty() } ?.let(::Regex)
|
withNoSuchElementWorkaround("") {
|
||||||
|
it.typesRegex
|
||||||
|
}.takeIf { it.isNotEmpty() } ?.let(::Regex) to withNoSuchElementWorkaround("") {
|
||||||
|
it.excludeRegex
|
||||||
|
}.takeIf { it.isNotEmpty() } ?.let(::Regex)
|
||||||
}
|
}
|
||||||
val classesSubtypes = mutableMapOf<KSClassDeclaration, MutableSet<KSClassDeclaration>>()
|
val classesSubtypes = mutableMapOf<KSClassDeclaration, MutableSet<KSClassDeclaration>>()
|
||||||
|
|
||||||
@@ -49,7 +54,9 @@ class Processor(
|
|||||||
when {
|
when {
|
||||||
potentialSubtype === ksClassDeclaration -> {}
|
potentialSubtype === ksClassDeclaration -> {}
|
||||||
potentialSubtype.isAnnotationPresent(ClassCastsExcluded::class) -> return@forEach
|
potentialSubtype.isAnnotationPresent(ClassCastsExcluded::class) -> return@forEach
|
||||||
potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(rootAnnotation.levelsToInclude.takeIf { it >= 0 }) -> return@forEach
|
potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(
|
||||||
|
withNoSuchElementWorkaround(-1) { rootAnnotation.levelsToInclude }.takeIf { it >= 0 }
|
||||||
|
) -> return@forEach
|
||||||
excludeRegex ?.matches(simpleName) == true -> return@forEach
|
excludeRegex ?.matches(simpleName) == true -> return@forEach
|
||||||
includeRegex ?.matches(simpleName) == false -> {}
|
includeRegex ?.matches(simpleName) == false -> {}
|
||||||
else -> classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(potentialSubtype)
|
else -> classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(potentialSubtype)
|
||||||
@@ -96,7 +103,9 @@ class Processor(
|
|||||||
@OptIn(KspExperimental::class)
|
@OptIn(KspExperimental::class)
|
||||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||||
(resolver.getSymbolsWithAnnotation(ClassCastsIncluded::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
(resolver.getSymbolsWithAnnotation(ClassCastsIncluded::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||||
val prefix = it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
|
val prefix = withNoSuchElementWorkaround("") {
|
||||||
|
it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
|
||||||
|
}
|
||||||
it.writeFile(prefix = prefix, suffix = "ClassCasts") {
|
it.writeFile(prefix = prefix, suffix = "ClassCasts") {
|
||||||
FileSpec.builder(
|
FileSpec.builder(
|
||||||
it.packageName.asString(),
|
it.packageName.asString(),
|
||||||
|
|||||||
12
ksp/generator/src/main/kotlin/NoSuchElementWorkaround.kt
Normal file
12
ksp/generator/src/main/kotlin/NoSuchElementWorkaround.kt
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,7 @@ import com.squareup.kotlinpoet.ksp.toClassName
|
|||||||
import dev.inmo.micro_ksp.generator.buildSubFileName
|
import dev.inmo.micro_ksp.generator.buildSubFileName
|
||||||
import dev.inmo.micro_ksp.generator.companion
|
import dev.inmo.micro_ksp.generator.companion
|
||||||
import dev.inmo.micro_ksp.generator.findSubClasses
|
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_ksp.generator.writeFile
|
||||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||||
@@ -113,7 +114,7 @@ class Processor(
|
|||||||
val annotation = ksClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
|
val annotation = ksClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
|
||||||
val subClasses = ksClassDeclaration.resolveSubclasses(
|
val subClasses = ksClassDeclaration.resolveSubclasses(
|
||||||
searchIn = resolver.getAllFiles(),
|
searchIn = resolver.getAllFiles(),
|
||||||
allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
|
allowNonSealed = withNoSuchElementWorkaround(null) { annotation ?.includeNonSealedSubTypes } ?: false
|
||||||
).distinct()
|
).distinct()
|
||||||
val subClassesNames = subClasses.filter {
|
val subClassesNames = subClasses.filter {
|
||||||
it.getAnnotationsByType(GenerateSealedTypesWorkaround.Exclude::class).count() == 0
|
it.getAnnotationsByType(GenerateSealedTypesWorkaround.Exclude::class).count() == 0
|
||||||
@@ -164,7 +165,15 @@ class Processor(
|
|||||||
@OptIn(KspExperimental::class)
|
@OptIn(KspExperimental::class)
|
||||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||||
(resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
(resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||||
val prefix = (it.getGenerateSealedWorkaroundAnnotation) ?.prefix ?.takeIf {
|
val prefix = runCatching {
|
||||||
|
(it.getGenerateSealedWorkaroundAnnotation) ?.prefix
|
||||||
|
}.getOrElse {
|
||||||
|
if (it is NoSuchElementException) {
|
||||||
|
""
|
||||||
|
} else {
|
||||||
|
throw it
|
||||||
|
}
|
||||||
|
} ?.takeIf {
|
||||||
it.isNotEmpty()
|
it.isNotEmpty()
|
||||||
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
||||||
it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {
|
it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {
|
||||||
@@ -184,7 +193,9 @@ class Processor(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
(resolver.getSymbolsWithAnnotation(GenerateSealedTypesWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
(resolver.getSymbolsWithAnnotation(GenerateSealedTypesWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||||
val prefix = (it.getGenerateSealedTypesWorkaroundAnnotation) ?.prefix ?.takeIf {
|
val prefix = withNoSuchElementWorkaround("") {
|
||||||
|
(it.getGenerateSealedTypesWorkaroundAnnotation)?.prefix
|
||||||
|
} ?.takeIf {
|
||||||
it.isNotEmpty()
|
it.isNotEmpty()
|
||||||
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
||||||
it.writeFile(prefix = prefix, suffix = "SealedTypesWorkaround") {
|
it.writeFile(prefix = prefix, suffix = "SealedTypesWorkaround") {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import com.squareup.kotlinpoet.ksp.toTypeName
|
|||||||
import dev.inmo.micro_ksp.generator.convertToClassName
|
import dev.inmo.micro_ksp.generator.convertToClassName
|
||||||
import dev.inmo.micro_ksp.generator.convertToClassNames
|
import dev.inmo.micro_ksp.generator.convertToClassNames
|
||||||
import dev.inmo.micro_ksp.generator.findSubClasses
|
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_ksp.generator.writeFile
|
||||||
import dev.inmo.micro_utils.ksp.variations.GenerateVariations
|
import dev.inmo.micro_utils.ksp.variations.GenerateVariations
|
||||||
import dev.inmo.micro_utils.ksp.variations.GenerationVariant
|
import dev.inmo.micro_utils.ksp.variations.GenerationVariant
|
||||||
@@ -218,7 +219,9 @@ class Processor(
|
|||||||
@OptIn(KspExperimental::class)
|
@OptIn(KspExperimental::class)
|
||||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||||
(resolver.getSymbolsWithAnnotation(GenerateVariations::class.qualifiedName!!)).filterIsInstance<KSFunctionDeclaration>().forEach {
|
(resolver.getSymbolsWithAnnotation(GenerateVariations::class.qualifiedName!!)).filterIsInstance<KSFunctionDeclaration>().forEach {
|
||||||
val prefix = (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix ?.takeIf {
|
val prefix = withNoSuchElementWorkaround("") {
|
||||||
|
(it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix
|
||||||
|
} ?.takeIf {
|
||||||
it.isNotEmpty()
|
it.isNotEmpty()
|
||||||
} ?: it.simpleName.asString().replaceFirst(it.simpleName.asString(), "")
|
} ?: it.simpleName.asString().replaceFirst(it.simpleName.asString(), "")
|
||||||
it.writeFile(prefix = prefix, suffix = "GeneratedVariation") {
|
it.writeFile(prefix = prefix, suffix = "GeneratedVariation") {
|
||||||
|
|||||||
Reference in New Issue
Block a user