diff --git a/CHANGELOG.md b/CHANGELOG.md index 243eca1eba5..a6b056e14ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 30.1.0 + +* `Versions`: + * `SQLite`: `3.53.2.0` -> `3.53.2.1` + * `Ktor`: `3.5.1` -> `3.5.2` + * `Okio`: `3.17.0` -> `3.18.1` + ## 0.30.0 * `Versions`: diff --git a/gradle.properties b/gradle.properties index e34079d4d49..56e1bd53cab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,5 @@ crypto_js_version=4.1.1 # Project data group=dev.inmo -version=0.30.0 -android_code_version=315 +version=30.1.0 +android_code_version=316 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5ce1fc54575..504c0361ecd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,18 +14,18 @@ jb-compose-icons = "1.7.8" jb-exposed = "1.3.0" jb-dokka = "2.2.0" -sqlite = "3.53.2.0" +sqlite = "3.53.2.1" korlibs = "5.4.0" uuid = "0.8.4" -ktor = "3.5.1" +ktor = "3.5.2" gh-release = "2.5.2" koin = "4.2.2" -okio = "3.17.0" +okio = "3.18.1" ksp = "2.3.9" kotlin-poet = "2.3.0" diff --git a/ksp/sealed/generator/src/main/kotlin/Processor.kt b/ksp/sealed/generator/src/main/kotlin/Processor.kt index f46ae51775e..95a2d2cf236 100644 --- a/ksp/sealed/generator/src/main/kotlin/Processor.kt +++ b/ksp/sealed/generator/src/main/kotlin/Processor.kt @@ -53,7 +53,7 @@ class Processor( val annotation = ksClassDeclaration.getGenerateSealedWorkaroundAnnotation val subClasses = ksClassDeclaration.resolveSubclasses( searchIn = resolver.getAllFiles(), - allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false + allowNonSealed = withNoSuchElementWorkaround(null) { annotation ?.includeNonSealedSubTypes } ?: false ).distinct() val subClassesNames = subClasses.filter { when (it.classKind) { @@ -165,15 +165,7 @@ class Processor( @OptIn(KspExperimental::class) override fun process(resolver: Resolver): List { (resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance().forEach { - val prefix = runCatching { - (it.getGenerateSealedWorkaroundAnnotation) ?.prefix - }.getOrElse { - if (it is NoSuchElementException) { - "" - } else { - throw it - } - } ?.takeIf { + val prefix = withNoSuchElementWorkaround(null) { (it.getGenerateSealedWorkaroundAnnotation) ?.prefix } ?.takeIf { it.isNotEmpty() } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "") it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {