mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2025-11-07 07:30:28 +00:00
update dependencies
This commit is contained in:
@@ -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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[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"
|
||||||
|
|
||||||
@@ -8,11 +8,13 @@ kotlinx-browser = "0.5.0"
|
|||||||
|
|
||||||
kslog = "1.5.1"
|
kslog = "1.5.1"
|
||||||
|
|
||||||
jb-compose = "1.8.2"
|
jb-compose = "1.9.2"
|
||||||
|
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.50.1.0"
|
||||||
|
|
||||||
korlibs = "5.4.0"
|
korlibs = "5.4.0"
|
||||||
@@ -26,11 +28,11 @@ koin = "4.1.1"
|
|||||||
|
|
||||||
okio = "3.16.2"
|
okio = "3.16.2"
|
||||||
|
|
||||||
ksp = "2.2.20-2.0.3"
|
ksp = "2.3.1"
|
||||||
kotlin-poet = "2.2.0"
|
kotlin-poet = "2.2.0"
|
||||||
|
|
||||||
versions = "0.52.0"
|
versions = "0.52.0"
|
||||||
nmcp = "1.1.0"
|
nmcp = "1.2.0"
|
||||||
|
|
||||||
android-gradle = "8.10.+"
|
android-gradle = "8.10.+"
|
||||||
dexcount = "4.0.0"
|
dexcount = "4.0.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" }
|
||||||
|
|||||||
@@ -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