Merge pull request #33 from Astra-Interactive/update-krates

Update krates

benchmarks/build.gradle.kts

@@ -12,9 +12,9 @@ dependencies {
     // Kotlin
     implementation(libs.bundles.kotlin)
     // AstraLibs
-    implementation(klibs.klibs.kdi)
-    implementation(klibs.klibs.mikro.core)
-    implementation(klibs.klibs.kstorage)
+    implementation(libs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
+    implementation(libs.klibs.kstorage)
     // Local
     implementation(projects.core)
 }

build.gradle.kts

@@ -3,17 +3,17 @@ plugins {
     alias(libs.plugins.kotlin.serialization) apply false
 
     // klibs - core
-    alias(klibs.plugins.klibs.gradle.detekt) apply false
-    alias(klibs.plugins.klibs.gradle.detekt.compose) apply false
-    alias(klibs.plugins.klibs.gradle.dokka.root) apply false
-    alias(klibs.plugins.klibs.gradle.dokka.module) apply false
-    alias(klibs.plugins.klibs.gradle.java.core) apply false
-    alias(klibs.plugins.klibs.gradle.stub.javadoc) apply false
-    alias(klibs.plugins.klibs.gradle.publication) apply false
-    alias(klibs.plugins.klibs.gradle.rootinfo) apply false
+    alias(libs.plugins.klibs.gradle.detekt) apply false
+    alias(libs.plugins.klibs.gradle.detekt.compose) apply false
+    alias(libs.plugins.klibs.gradle.dokka.root) apply false
+    alias(libs.plugins.klibs.gradle.dokka.module) apply false
+    alias(libs.plugins.klibs.gradle.java.core) apply false
+    alias(libs.plugins.klibs.gradle.stub.javadoc) apply false
+    alias(libs.plugins.klibs.gradle.publication) apply false
+    alias(libs.plugins.klibs.gradle.rootinfo) apply false
     // klibs - minecraft
-    alias(klibs.plugins.klibs.gradle.minecraft.empty) apply false
-    alias(klibs.plugins.klibs.gradle.minecraft.multiplatform) apply false
+    alias(libs.plugins.klibs.gradle.minecraft.empty) apply false
+    alias(libs.plugins.klibs.gradle.minecraft.multiplatform) apply false
 }
 
 apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")

core-bukkit/build.gradle.kts

@@ -7,9 +7,9 @@ dependencies {
     // Kotlin
     compileOnly(libs.bundles.kotlin)
     // kdi
-    implementation(klibs.klibs.kdi)
-    implementation(klibs.klibs.mikro.core)
-    implementation(klibs.klibs.kstorage)
+    implementation(libs.klibs.kdi)
+    implementation(libs.klibs.mikro.core)
+    implementation(libs.klibs.kstorage)
     // Spigot dependencies
     compileOnly(libs.bundles.minecraft.bukkit)
     compileOnly(libs.minecraft.essentialsx)

core-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/configuration/BukkitMutableStorageValue.kt

@@ -1,16 +1,16 @@
 package ru.astrainteractive.astralibs.configuration
 
 import org.bukkit.configuration.file.FileConfiguration
-import ru.astrainteractive.klibs.kstorage.MutableStorageValue
-import ru.astrainteractive.klibs.kstorage.StateFlowMutableStorageValue
-import ru.astrainteractive.klibs.kstorage.api.MutableStorageValue
-import ru.astrainteractive.klibs.kstorage.api.StateFlowMutableStorageValue
+import ru.astrainteractive.klibs.kstorage.api.MutableKrate
+import ru.astrainteractive.klibs.kstorage.api.StateFlowMutableKrate
+import ru.astrainteractive.klibs.kstorage.api.impl.DefaultMutableKrate
+import ru.astrainteractive.klibs.kstorage.api.impl.DefaultStateFlowMutableKrate
 
 object BukkitMutableStorageValue {
     inline fun <reified T> FileConfiguration.anyStateFlowMutableStorageValue(
         path: String
-    ): StateFlowMutableStorageValue<T?> {
-        return StateFlowMutableStorageValue(
+    ): StateFlowMutableKrate<T?> {
+        return DefaultStateFlowMutableKrate(
             factory = { null },
             saver = { set(path, it) },
             loader = { getObject(path, T::class.java).takeIf { contains(path) } }
@@ -19,8 +19,8 @@ object BukkitMutableStorageValue {
 
     inline fun <reified T> FileConfiguration.anyMutableStorageValue(
         path: String
-    ): MutableStorageValue<T?> {
-        return MutableStorageValue(
+    ): MutableKrate<T?> {
+        return DefaultMutableKrate(
             factory = { null },
             saver = { set(path, it) },
             loader = { getObject(path, T::class.java).takeIf { contains(path) } }

core-bukkit/src/test/java/ru/astrainteractive/astralibs/configuration/MutableStorageValueTest.kt

@@ -3,7 +3,7 @@ package ru.astrainteractive.astralibs.configuration
 import org.bukkit.configuration.file.YamlConfiguration
 import org.junit.Test
 import ru.astrainteractive.astralibs.configuration.BukkitMutableStorageValue.anyMutableStorageValue
-import ru.astrainteractive.klibs.kstorage.withDefault
+import ru.astrainteractive.klibs.kstorage.util.KrateDefaultExt.withDefault
 import java.io.File
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
@@ -16,15 +16,15 @@ class MutableStorageValueTest {
         val configuration = YamlConfiguration.loadConfiguration(file)
         configuration.anyMutableStorageValue<T?>(name).let { storageValue ->
             // Test initial is null
-            assertNull(storageValue.load())
+            assertNull(storageValue.loadAndGet())
             // Test after save value is as expected
             storageValue.save(expectedValue)
-            assertEquals(expectedValue, storageValue.load())
+            assertEquals(expectedValue, storageValue.loadAndGet())
             // Test after reset value is null
             storageValue.reset()
-            assertNull(storageValue.load())
+            assertNull(storageValue.loadAndGet())
             // Test withDefault value is as expected
-            assertEquals(expectedValue, storageValue.withDefault { expectedValue }.load())
+            assertEquals(expectedValue, storageValue.withDefault { expectedValue }.loadAndGet())
         }
     }
 

core/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compileOnly(libs.bundles.kotlin)
     compileOnly(libs.kotlin.serialization.protobuf)
     // kdi
-    implementation(klibs.bundles.klibs)
+    implementation(libs.bundles.klibs)
     compileOnly(libs.kyori.api)
     compileOnly(libs.kyori.gson)
     compileOnly(libs.kyori.legacy)

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/BinaryFormatKrate.kt

@@ -2,7 +2,7 @@ package ru.astrainteractive.astralibs.krate.core
 
 import kotlinx.serialization.BinaryFormat
 import kotlinx.serialization.KSerializer
-import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
+import ru.astrainteractive.klibs.kstorage.api.provider.ValueFactory
 import java.io.File
 
 class BinaryFormatKrate<T>(

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/FileKrate.kt

@@ -1,16 +1,16 @@
 package ru.astrainteractive.astralibs.krate.core
 
-import ru.astrainteractive.klibs.kstorage.MutableStorageValue
-import ru.astrainteractive.klibs.kstorage.api.MutableStorageValue
-import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
+import ru.astrainteractive.klibs.kstorage.api.MutableKrate
+import ru.astrainteractive.klibs.kstorage.api.impl.DefaultMutableKrate
+import ru.astrainteractive.klibs.kstorage.api.provider.ValueFactory
 import java.io.File
 
 /**
  * [FileKrate] is a holder for a file.
  *
  * With this you can easily create serialized file holders
  */
-interface FileKrate<T> : MutableStorageValue<T> {
+interface FileKrate<T> : MutableKrate<T> {
     val fileName: String
     val folder: File
 
@@ -21,7 +21,7 @@ interface FileKrate<T> : MutableStorageValue<T> {
         save: (file: File, value: T) -> Unit,
         load: (file: File) -> T
     ) : FileKrate<T>,
-        MutableStorageValue<T> by MutableStorageValue(
+        MutableKrate<T> by DefaultMutableKrate(
             factory = factory,
             saver = saver@{ value ->
                 val file = File(folder, fileName)

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/JBinaryKrate.kt

@@ -2,7 +2,7 @@ package ru.astrainteractive.astralibs.krate.core
 
 import ru.astrainteractive.astralibs.encoding.encoder.ObjectEncoder
 import ru.astrainteractive.astralibs.encoding.model.EncodedObject
-import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
+import ru.astrainteractive.klibs.kstorage.api.provider.ValueFactory
 import java.io.File
 import java.io.Serializable
 

core/src/main/kotlin/ru/astrainteractive/astralibs/krate/core/StringFormatKrate.kt

@@ -4,7 +4,7 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.StringFormat
 import ru.astrainteractive.astralibs.serialization.StringFormatExt.parse
 import ru.astrainteractive.astralibs.serialization.StringFormatExt.writeIntoFile
-import ru.astrainteractive.klibs.kstorage.api.value.ValueFactory
+import ru.astrainteractive.klibs.kstorage.api.provider.ValueFactory
 import java.io.File
 
 class StringFormatKrate<T>(

core/src/test/java/ru/astrainteractive/astralibs/krate/TextKrateTest.kt

@@ -5,7 +5,7 @@ import org.junit.Test
 import ru.astrainteractive.astralibs.krate.core.StringFormatKrate
 import ru.astrainteractive.astralibs.krate.util.KrateExt.delete
 import ru.astrainteractive.astralibs.serialization.YamlStringFormat
-import ru.astrainteractive.klibs.kstorage.update
+import ru.astrainteractive.klibs.kstorage.util.KrateExt.update
 import java.io.File
 import java.util.UUID
 import kotlin.random.Random
@@ -42,12 +42,12 @@ class TextKrateTest {
             folder = folder
         )
         storage.delete()
-        assertEquals(initial, storage.value)
-        storage.load()
-        assertEquals(initial, storage.value)
-        val newValue = storage.value.copy(age = Random.nextInt())
+        assertEquals(initial, storage.cachedValue)
+        storage.loadAndGet()
+        assertEquals(initial, storage.cachedValue)
+        val newValue = storage.cachedValue.copy(age = Random.nextInt())
         storage.update { newValue }
-        assertEquals(newValue, storage.value)
+        assertEquals(newValue, storage.cachedValue)
     }
 
     @Test
@@ -60,11 +60,11 @@ class TextKrateTest {
             fileName = "yaml_test_file.yaml",
             folder = folder
         )
-        assertEquals(initial, storage.value)
-        storage.load()
-        assertEquals(initial, storage.value)
-        val newValue = storage.value.copy(age = Random.nextInt())
+        assertEquals(initial, storage.cachedValue)
+        storage.loadAndGet()
+        assertEquals(initial, storage.cachedValue)
+        val newValue = storage.cachedValue.copy(age = Random.nextInt())
         storage.update { newValue }
-        assertEquals(newValue, storage.value)
+        assertEquals(newValue, storage.cachedValue)
     }
 }

gradle.properties

@@ -7,7 +7,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraLibs
 makeevrserg.project.group=ru.astrainteractive.astralibs
-makeevrserg.project.version.string=3.7.2
+makeevrserg.project.version.string=3.8.0
 makeevrserg.project.description=Core utilities for spigot development
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

gradle/libs.versions.toml

@@ -28,6 +28,12 @@ tests-junit-bom = "5.10.2"
 # Kyori-adventure-text
 kyori = "4.17.0" # https://github.com/KyoriPowered/adventure-platform
 
+# klibs
+klibs-gradleplugin = "1.3.3" # https://github.com/makeevrserg/gradle-plugin
+klibs-kstorage = "2.1.0" # https://github.com/makeevrserg/klibs.kstorage
+klibs-mikro = "1.8.4" # https://github.com/makeevrserg/klibs.mikro
+klibs-kdi = "1.4.5" # https://github.com/makeevrserg/klibs.kdi
+
 [libraries]
 
 # Kotlin
@@ -69,7 +75,14 @@ kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.
 kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "kyori" }
 kyori-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "kyori" }
 
+# klibs - mikro
+klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" }
+# klibs - kdi
+klibs-kdi = { module = "ru.astrainteractive.klibs:kdi", version.ref = "klibs-kdi" }
+klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" }
+
 [bundles]
+klibs = ["klibs-kdi", "klibs-kstorage", "klibs-mikro-core"]
 minecraft-bukkit = ["minecraft-paper-api", "minecraft-spigot-api", "minecraft-vaultapi", "minecraft-papi"]
 testing-kotlin = ["tests-junit-jupiter-api", "kotlin-coroutines-core", "kotlin-coroutines-coreJvm", "driver-jdbc", "driver-mysql", "kotlin-serialization", "kotlin-serializationJson"]
 kotlin = ["kotlin-coroutines-core", "kotlin-coroutines-coreJvm", "kotlin-serialization", "kotlin-serializationJson", "kotlin-serializationKaml", "kotlin-gradle"]
@@ -81,3 +94,21 @@ kotlin-gradle = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" }
 kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" }
 kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin-version" }
+# klibs - core
+klibs-gradle-detekt = { id = "ru.astrainteractive.gradleplugin.detekt", version.ref = "klibs-gradleplugin" }
+klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.compose", version.ref = "klibs-gradleplugin" }
+klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" }
+klibs-gradle-dokka-module = { id = "ru.astrainteractive.gradleplugin.dokka.module", version.ref = "klibs-gradleplugin" }
+klibs-gradle-java-core = { id = "ru.astrainteractive.gradleplugin.java.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" }
+klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }
+klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" }
+# klibs - android
+klibs-gradle-android-core = { id = "ru.astrainteractive.gradleplugin.android.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-compose = { id = "ru.astrainteractive.gradleplugin.android.compose", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-apk-sign = { id = "ru.astrainteractive.gradleplugin.android.apk.sign", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-apk-name = { id = "ru.astrainteractive.gradleplugin.android.apk.name", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-publication = { id = "ru.astrainteractive.gradleplugin.android.publication", version.ref = "klibs-gradleplugin" }
+# klibs - minecraft
+klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" }
+klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" }

menu-bukkit/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     // Kotlin
     compileOnly(libs.bundles.kotlin)
     // kdi
-    compileOnly(klibs.klibs.kdi)
+    compileOnly(libs.klibs.kdi)
     // Spigot dependencies
     compileOnly(libs.bundles.minecraft.bukkit)
     // Test-Core

orm/build.gradle.kts

@@ -6,7 +6,7 @@ dependencies {
     // Kotlin
     compileOnly(libs.bundles.kotlin)
     // klibs
-    implementation(klibs.klibs.mikro.core)
+    implementation(libs.klibs.mikro.core)
     // Test
     testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)

settings.gradle.kts

@@ -37,7 +37,6 @@ dependencyResolutionManagement {
         maven("https://maven.playpro.com")
         maven("https://jitpack.io")
     }
-    versionCatalogs { create("klibs") { from(files("./gradle/klibs.versions.toml")) } }
 }
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 rootProject.name = "AstraLibs"