Compare commits

...

10 Commits

Author SHA1 Message Date
b00e93372d temporarily disable inmo nexus 2026-08-13 13:23:43 +06:00
8f51cd4d60 update kslog 2026-08-13 13:22:55 +06:00
f618ea05f7 fix in generate sealed workaround 2026-08-13 13:18:09 +06:00
2b053dfedb update dependencies 2026-08-13 13:18:09 +06:00
f6ab406ffa start 0.30.1 2026-08-13 13:18:09 +06:00
fe635835a5 update dependencies 2026-08-13 13:17:08 +06:00
795bc4e09e start 0.30.0 2026-08-13 13:17:08 +06:00
d431446da0 fix dokka build :( 2026-08-13 13:17:08 +06:00
362821e4d7 add meta 2026-08-13 13:17:08 +06:00
2045db9cd0 start 0.29.4 2026-08-13 13:17:08 +06:00
13 changed files with 188 additions and 26 deletions

View File

@@ -12,7 +12,7 @@ jobs:
with: with:
java-version: 17 java-version: 17
- name: Build - name: Build
run: ./gradlew build && ./gradlew dokkaHtml run: ./gradlew build && ./gradlew :micro_utils.dokka:dokkaGenerate
- name: Publish KDocs - name: Publish KDocs
uses: peaceiris/actions-gh-pages@v3 uses: peaceiris/actions-gh-pages@v3
with: with:

View File

@@ -1,5 +1,28 @@
# Changelog # Changelog
## 0.30.1
* `Versions`:
* `KSLog`: `1.6.1` -> `1.7.0`
* `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`:
* `Compose`: `1.11.0` -> `1.11.1`
* `KSP`: `2.3.8` -> `2.3.9`
* `Ktor`: `3.5.0` -> `3.5.1`
* `Koin`: `4.2.1` -> `4.2.2`
* `SQLite`: `3.53.1.0` -> `3.53.2.0`
* `AndroidX Core KTX`: `1.18.0` -> `1.19.0`
## 0.29.4
* `Meta`:
* Inited
## 0.29.3 ## 0.29.3
* `Versions`: * `Versions`:

View File

@@ -41,7 +41,7 @@ allprojects {
mavenCentral() mavenCentral()
google() google()
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
maven { url "https://nexus.inmo.dev/repository/maven-releases/" } // maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
mavenLocal() mavenLocal()
} }

View File

@@ -17,7 +17,7 @@ kotlin {
browser() browser()
nodejs() nodejs()
} }
android {} androidTarget {}
sourceSets { sourceSets {
commonMain { commonMain {
@@ -91,7 +91,7 @@ kotlin {
private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) { private List<SourceDirectorySet> findSourcesWithName(String... approximateNames) {
return parent.subprojects return parent.subprojects
.findAll { it != project && it.hasProperty("kotlin") } .findAll { it != project && it.hasProperty("kotlin") && (it.name.contains("dokka") == false) }
.collectMany { it.kotlin.sourceSets } .collectMany { it.kotlin.sourceSets }
.findAll { sourceSet -> .findAll { sourceSet ->
approximateNames.any { nameToFilter -> approximateNames.any { nameToFilter ->
@@ -100,14 +100,14 @@ private List<SourceDirectorySet> findSourcesWithName(String... approximateNames)
}.collect { it.kotlin } }.collect { it.kotlin }
} }
tasks.dokkaHtml { dokka {
dokkaSourceSets { dokkaSourceSets {
configureEach { configureEach {
skipDeprecated.set(true) skipDeprecated.set(true)
sourceLink { sourceLink {
localDirectory.set(file("../")) localDirectory.set(file("../"))
remoteUrl.set(new URL("https://github.com/InsanusMokrassar/MicroUtils/blob/master/")) remoteUrl.set(new URI("https://github.com/InsanusMokrassar/MicroUtils/blob/master/"))
remoteLineSuffix.set("#L") remoteLineSuffix.set("#L")
} }
} }
@@ -130,4 +130,12 @@ tasks.dokkaHtml {
} }
} }
//dependencies {
// project.parent.subprojects.forEach {
// if (it != project) {
// dokka(it)
// }
// }
//}
apply from: "$defaultAndroidSettings" apply from: "$defaultAndroidSettings"

View File

@@ -18,5 +18,5 @@ crypto_js_version=4.1.1
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.29.3 version=0.30.1
android_code_version=313 android_code_version=316

View File

@@ -6,28 +6,28 @@ kt-coroutines = "1.11.0"
kotlinx-browser = "0.5.0" kotlinx-browser = "0.5.0"
kslog = "1.6.1" kslog = "1.7.0"
jb-compose = "1.11.0" jb-compose = "1.11.1"
jb-compose-material3 = "1.11.0-alpha07" jb-compose-material3 = "1.11.0-alpha07"
jb-compose-icons = "1.7.8" jb-compose-icons = "1.7.8"
jb-exposed = "1.3.0" jb-exposed = "1.3.0"
jb-dokka = "2.2.0" jb-dokka = "2.2.0"
sqlite = "3.53.1.0" sqlite = "3.53.2.1"
korlibs = "5.4.0" korlibs = "5.4.0"
uuid = "0.8.4" uuid = "0.8.4"
ktor = "3.5.0" ktor = "3.5.2"
gh-release = "2.5.2" gh-release = "2.5.2"
koin = "4.2.1" koin = "4.2.2"
okio = "3.17.0" okio = "3.18.1"
ksp = "2.3.8" ksp = "2.3.9"
kotlin-poet = "2.3.0" kotlin-poet = "2.3.0"
versions = "0.54.0" versions = "0.54.0"
@@ -36,7 +36,7 @@ nmcp = "1.5.0"
android-gradle = "8.12.+" android-gradle = "8.12.+"
dexcount = "4.0.0" dexcount = "4.0.0"
android-coreKtx = "1.18.0" android-coreKtx = "1.19.0"
android-recyclerView = "1.4.0" android-recyclerView = "1.4.0"
android-appCompat = "1.7.1" android-appCompat = "1.7.1"
android-fragment = "1.8.9" android-fragment = "1.8.9"

View File

@@ -1,6 +1,8 @@
project.version = "$version" project.version = "$version"
project.group = "$group" project.group = "$group"
apply plugin: 'org.jetbrains.dokka'
kotlin { kotlin {
sourceSets { sourceSets {
commonMain { commonMain {

View File

@@ -53,7 +53,7 @@ class Processor(
val annotation = ksClassDeclaration.getGenerateSealedWorkaroundAnnotation val annotation = ksClassDeclaration.getGenerateSealedWorkaroundAnnotation
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 {
when (it.classKind) { when (it.classKind) {
@@ -165,15 +165,7 @@ 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 = runCatching { val prefix = withNoSuchElementWorkaround(null) { (it.getGenerateSealedWorkaroundAnnotation) ?.prefix } ?.takeIf {
(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") {

12
meta/build.gradle Normal file
View File

@@ -0,0 +1,12 @@
plugins {
id "org.jetbrains.kotlin.multiplatform"
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
}
apply from: "$mppJvmJsWasmJsAndroidLinuxMingwLinuxArm64Project"
kotlin {
sourceSets {
}
}

View File

@@ -0,0 +1,94 @@
package dev.inmo.micro_utils.meta
import kotlinx.serialization.Polymorphic
import kotlinx.serialization.Serializable
/**
* A polymorphic container for storing heterogeneous key-value pairs with type-safe retrieval.
* Each key is bound to a specific type, enabling type-safe access to stored values.
*
* @property map The underlying map storing key-value pairs with polymorphic values.
*/
@Serializable
data class MetaContainer(
@MetaContainerRootMapWarning
val map: Map<Key<*>, @Polymorphic Any>
) {
/**
* A marker interface for type-safe keys in [MetaContainer].
*
* @param T The type of value associated with this key.
*/
interface Key<T : Any>
/**
* Retrieves a value from the container by its key.
*
* @param key The type-safe key to look up.
* @return The value associated with the key, or null if not present.
*/
@Suppress("UNCHECKED_CAST", "OPT_IN_USAGE")
operator fun <T : Any> get(key: Key<T>): T? = map[key] as? T?
/**
* Checks whether a value exists for the given key.
*
* @param key The type-safe key to check.
* @return true if the key exists and has a non-null value, false otherwise.
*/
operator fun <T : Any> contains(key: Key<T>): Boolean = get(key) != null
/**
* Builder for constructing [MetaContainer] instances with a fluent API.
*/
class Builder(
@MetaContainerRootMapWarning
private val map: MutableMap<Key<*>, Any> = mutableMapOf<Key<*>, Any>()
) {
/**
* Puts a value associated with the given key into the builder.
*
* @param k The type-safe key.
* @param v The value to store.
*/
fun <T : Any> put(k: Key<T>, v: T) {
map[k] = v
}
/**
* Retrieves a value from the builder by its key.
*
* @param key The type-safe key to look up.
* @return The value associated with the key, or null if not present.
*/
@Suppress("UNCHECKED_CAST")
operator fun <T : Any> get(key: Key<T>): T? = map[key] as T?
/**
* Checks whether a value exists for the given key in the builder.
*
* @param key The type-safe key to check.
* @return true if the key exists and has a non-null value, false otherwise.
*/
operator fun <T : Any> contains(key: Key<T>): Boolean = get(key) != null
/**
* Builds and returns the immutable [MetaContainer] instance.
*
* @return A new [MetaContainer] with the accumulated key-value pairs.
*/
fun build(): MetaContainer = MetaContainer(map.toMap())
}
companion object {
/**
* An empty [MetaContainer] instance with no entries.
*/
val EMPTY = MetaContainer(emptyMap())
}
}

View File

@@ -0,0 +1,17 @@
package dev.inmo.micro_utils.meta
/**
* Marks the direct use of [MetaContainer.map] as requiring explicit opt-in.
*
* This annotation warns against direct manipulation of the internal map without using
* the type-safe accessors, which could break type safety guarantees.
*/
@RequiresOptIn(
"Do not use this directly without any special reason",
RequiresOptIn.Level.WARNING
)
@Target(
AnnotationTarget.FIELD,
)
@Retention(AnnotationRetention.BINARY)
annotation class MetaContainerRootMapWarning

View File

@@ -0,0 +1,13 @@
package dev.inmo.micro_utils.meta
/**
* DSL builder function for creating a [MetaContainer] with a lambda block.
*
* @param block A lambda with receiver ([MetaContainer.Builder]) to configure the container.
* @return A new [MetaContainer] instance built from the DSL block.
*/
fun buildMetaContainer(block: MetaContainer.Builder.() -> Unit): MetaContainer {
val builder = MetaContainer.Builder()
builder.block()
return builder.build()
}

View File

@@ -1,6 +1,7 @@
rootProject.name='micro_utils' rootProject.name='micro_utils'
String[] includes = [ String[] includes = [
":meta",
":common", ":common",
":common:compose", ":common:compose",
":transactions", ":transactions",