InsanusMokrassar/PlaguBot
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/PlaguBot.git synced 2024-11-22 07:33:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24 from InsanusMokrassar/0.5.0

Browse Source 
0.5.0
This commit is contained in:
InsanusMokrassar 2022-01-04 17:41:05 +06:00 committed by GitHub
commit e6765b6c25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,5 +1,15 @@
# Changelog # Changelog
## 0.5.0
* `Versions`
* `kotlin`: `1.6.10`
* `coroutines`: `1.6.0`
* `serialization`: `1.3.2`
* `exposed`: `0.37.2`
* `tgbotapi`: `0.38.0`
* `microutils`: `0.9.0`
## 0.4.1 ## 0.4.1
Temporal update for compatibility with java 1.8 Temporal update for compatibility with java 1.8

12
bot/src/main/kotlin/dev/inmo/plagubot/config/PluginsConfiguration.kt
View File

@ -63,7 +63,7 @@ internal class InternalPluginSerializer(
) : KSerializer<Plugin> { ) : KSerializer<Plugin> {
override val descriptor: SerialDescriptor = PluginSerializer.descriptor override val descriptor: SerialDescriptor = PluginSerializer.descriptor
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun deserialize(decoder: Decoder): Plugin { override fun deserialize(decoder: Decoder): Plugin {
val asJson = JsonElement.serializer().deserialize(decoder) val asJson = JsonElement.serializer().deserialize(decoder)
@ -75,7 +75,7 @@ internal class InternalPluginSerializer(
} }
} }
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun serialize(encoder: Encoder, value: Plugin) { override fun serialize(encoder: Encoder, value: Plugin) {
params.keys.firstOrNull { params[it] === value } ?.also { params.keys.firstOrNull { params[it] === value } ?.also {
encoder.encodeString(it) encoder.encodeString(it)
@ -90,7 +90,7 @@ internal class InternalModuleSerializer(
) : KSerializer<Module> { ) : KSerializer<Module> {
override val descriptor: SerialDescriptor = PluginSerializer.descriptor override val descriptor: SerialDescriptor = PluginSerializer.descriptor
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun deserialize(decoder: Decoder): Module { override fun deserialize(decoder: Decoder): Module {
val asJson = JsonElement.serializer().deserialize(decoder) val asJson = JsonElement.serializer().deserialize(decoder)
@ -101,7 +101,7 @@ internal class InternalModuleSerializer(
} }
} }
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun serialize(encoder: Encoder, value: Module) = DefaultModuleSerializer.serialize(encoder, value) override fun serialize(encoder: Encoder, value: Module) = DefaultModuleSerializer.serialize(encoder, value)
} }
@ -119,7 +119,7 @@ internal object PluginsConfigurationSerializer : KSerializer<PluginsConfiguratio
private val moduleSerializer = ModuleSerializer() private val moduleSerializer = ModuleSerializer()
override val descriptor: SerialDescriptor = jsonSerializer.descriptor override val descriptor: SerialDescriptor = jsonSerializer.descriptor
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun deserialize(decoder: Decoder): PluginsConfiguration { override fun deserialize(decoder: Decoder): PluginsConfiguration {
val json = jsonSerializer.deserialize(decoder) val json = jsonSerializer.deserialize(decoder)
val jsonFormat = (decoder as? JsonDecoder) ?.json ?: configAndPluginsConfigJsonFormat val jsonFormat = (decoder as? JsonDecoder) ?.json ?: configAndPluginsConfigJsonFormat
@ -154,7 +154,7 @@ internal object PluginsConfigurationSerializer : KSerializer<PluginsConfiguratio
} }
} }
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun serialize(encoder: Encoder, value: PluginsConfiguration) { override fun serialize(encoder: Encoder, value: PluginsConfiguration) {
val params = value.params val params = value.params
val serializer = when (value) { val serializer = when (value) {

14
gradle.properties
View File

@ -4,14 +4,14 @@ org.gradle.parallel=true
kotlin.js.generate.externals=true kotlin.js.generate.externals=true
kotlin.incremental=true kotlin.incremental=true
kotlin_version=1.5.31 kotlin_version=1.6.10
kotlin_coroutines_version=1.5.2 kotlin_coroutines_version=1.6.0
kotlin_serialisation_runtime_version=1.3.1 kotlin_serialisation_runtime_version=1.3.2
kotlin_exposed_version=0.36.1 kotlin_exposed_version=0.37.2
sdi_version=0.6.0 sdi_version=0.6.0
tgbotapi_version=0.37.0 tgbotapi_version=0.38.0
microutils_version=0.8.2 microutils_version=0.9.0
klassindex_version=4.1.0-rc.1 klassindex_version=4.1.0-rc.1
sqlite_version=3.36.0.3 sqlite_version=3.36.0.3
@ -19,4 +19,4 @@ sqlite_version=3.36.0.3
github_release_plugin_version=2.2.12 github_release_plugin_version=2.2.12
group=dev.inmo group=dev.inmo
version=0.4.1 version=0.5.0

6
plugin/src/main/kotlin/dev/inmo/plagubot/PluginSerializer.kt
View File

@ -15,7 +15,7 @@ object PluginSerializer : KSerializer<Plugin> {
private val polymorphic = PolymorphicSerializer(Plugin::class) private val polymorphic = PolymorphicSerializer(Plugin::class)
override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor override val descriptor: SerialDescriptor = JsonObject.serializer().descriptor
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun deserialize(decoder: Decoder): Plugin { override fun deserialize(decoder: Decoder): Plugin {
val format = (decoder as? JsonDecoder) ?.json ?: defaultJson val format = (decoder as? JsonDecoder) ?.json ?: defaultJson
val asJson = JsonElement.serializer().deserialize(decoder) val asJson = JsonElement.serializer().deserialize(decoder)
@ -45,9 +45,9 @@ object PluginSerializer : KSerializer<Plugin> {
} }
} }
@InternalSerializationApi @OptIn(InternalSerializationApi::class)
override fun serialize(encoder: Encoder, value: Plugin) { override fun serialize(encoder: Encoder, value: Plugin) {
val serializer = (value::class.serializerOrNull() ?: polymorphic) as KSerializer<Plugin> val serializer = (value::class.serializerOrNull() ?: polymorphic) as KSerializer<Plugin>
serializer.serialize(encoder, value) serializer.serialize(encoder, value)
} }
} }