remove KDI and filemanager

Astra-Interactive · Aug 3, 2024 · 4faf085 · 4faf085
1 parent 751558c
commit 4faf085
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 327 deletions.
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -12,7 +12,6 @@ dependencies {
     // Kotlin
     implementation(libs.bundles.kotlin)
     // AstraLibs
-    implementation(libs.klibs.kdi)
     implementation(libs.klibs.mikro.core)
     implementation(libs.klibs.kstorage)
     // Local

diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts
@@ -6,8 +6,6 @@ plugins {
 dependencies {
     // Kotlin
     compileOnly(libs.bundles.kotlin)
-    // kdi
-    implementation(libs.klibs.kdi)
     implementation(libs.klibs.mikro.core)
     implementation(libs.klibs.kstorage)
     // Spigot dependencies

diff --git a/core-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/economy/EconomyProviderFactory.kt b/core-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/economy/EconomyProviderFactory.kt
@@ -3,9 +3,8 @@ package ru.astrainteractive.astralibs.economy
 import org.bukkit.Bukkit
 import org.bukkit.plugin.Plugin
 import org.bukkit.plugin.java.JavaPlugin
-import ru.astrainteractive.klibs.kdi.Factory
 
-class EconomyProviderFactory(private val rootPlugin: JavaPlugin) : Factory<EconomyProvider> {
+class EconomyProviderFactory(private val rootPlugin: JavaPlugin) {
 
     private fun interface EconomyConstructor {
         fun create(rootPlugin: JavaPlugin, plugin: Plugin): EconomyProvider
@@ -21,7 +20,7 @@ class EconomyProviderFactory(private val rootPlugin: JavaPlugin) : Factory<Econo
             .getOrNull()
     }
 
-    override fun create(): EconomyProvider {
+    fun create(): EconomyProvider {
         val providers = listOfNotNull(
             tryGetEconomyProvider("Vault", ::VaultEconomyProvider),
             tryGetEconomyProvider("Essentials", ::EssentialsEconomyProvider)

diff --git a/core-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/economy/VaultEconomyProvider.kt b/core-bukkit/src/main/kotlin/ru/astrainteractive/astralibs/economy/VaultEconomyProvider.kt
@@ -6,16 +6,15 @@ import org.bukkit.Bukkit
 import org.bukkit.OfflinePlayer
 import org.bukkit.plugin.Plugin
 import org.bukkit.plugin.java.JavaPlugin
-import ru.astrainteractive.klibs.kdi.Factory
 import java.util.UUID
 
 @Suppress("UnusedPrivateProperty")
 class VaultEconomyProvider(plugin: JavaPlugin, vault: Plugin) : EconomyProvider {
-    private val economy = Factory {
+    private val economy by lazy {
         val rsp = plugin.server.servicesManager.getRegistration(Economy::class.java)
         checkNotNull(rsp) { "Could not get economy provider" }
         rsp.provider
-    }.create()
+    }
 
     private fun offlinePlayer(uuid: UUID) = Bukkit.getOfflinePlayer(uuid)
 

diff --git a/.../main/kotlin/ru/astrainteractive/astralibs/filemanager/DefaultFileConfigurationManager.kt b/.../main/kotlin/ru/astrainteractive/astralibs/filemanager/DefaultFileConfigurationManager.kt
diff --git a/...kit/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/FileConfigurationManager.kt b/...kit/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/FileConfigurationManager.kt
diff --git a/...t/src/test/java/ru/astrainteractive/astralibs/filemanager/FileConfigurationManagerTest.kt b/...t/src/test/java/ru/astrainteractive/astralibs/filemanager/FileConfigurationManagerTest.kt
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -7,7 +7,6 @@ dependencies {
     // Kotlin
     compileOnly(libs.bundles.kotlin)
     compileOnly(libs.kotlin.serialization.protobuf)
-    // kdi
     implementation(libs.bundles.klibs)
     compileOnly(libs.kyori.api)
     compileOnly(libs.kyori.gson)

diff --git a/core/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/FileManager.kt b/core/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/FileManager.kt
diff --git a/core/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/ResourceFileManager.kt b/core/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/ResourceFileManager.kt
diff --git a/core/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/impl/JVMFileManager.kt b/core/src/main/kotlin/ru/astrainteractive/astralibs/filemanager/impl/JVMFileManager.kt
diff --git a/.../src/main/kotlin/ru/astrainteractive/astralibs/filemanager/impl/JVMResourceFileManager.kt b/.../src/main/kotlin/ru/astrainteractive/astralibs/filemanager/impl/JVMResourceFileManager.kt
diff --git a/core/src/test/java/ru/astrainteractive/astralibs/filemanager/JVMFileManagerTest.kt b/core/src/test/java/ru/astrainteractive/astralibs/filemanager/JVMFileManagerTest.kt
diff --git a/core/src/test/java/ru/astrainteractive/astralibs/filemanager/JVMResourceFileManagerTest.kt b/core/src/test/java/ru/astrainteractive/astralibs/filemanager/JVMResourceFileManagerTest.kt
diff --git a/gradle.properties b/gradle.properties
@@ -12,7 +12,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraLibs
 makeevrserg.project.group=ru.astrainteractive.astralibs
-makeevrserg.project.version.string=3.11.0
+makeevrserg.project.version.string=3.12.0
 makeevrserg.project.description=Core utilities for spigot development
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://empireprojekt.ru