From 24d11d2c2ba8ce687224149676f1bcbe828381ce Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Tue, 3 Dec 2019 09:47:53 +0600 Subject: [PATCH] replace joda-time dependency by soywiz klock --- build.gradle | 2 +- gradle.properties | 2 +- .../insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt | 6 +++--- .../TelegramBotAPI/types/message/ChannelEventMessage.kt | 2 +- .../types/message/ChannelMediaGroupMessage.kt | 2 +- .../TelegramBotAPI/types/message/ChannelMessage.kt | 2 +- .../TelegramBotAPI/types/message/CommonMediaGroupMessage.kt | 2 +- .../TelegramBotAPI/types/message/CommonMessageImpl.kt | 2 +- .../TelegramBotAPI/types/message/GroupEventMessage.kt | 2 +- .../TelegramBotAPI/types/message/SupergroupEventMessage.kt | 2 +- .../types/message/abstracts/AbleToBeEditedMessage.kt | 2 +- .../TelegramBotAPI/types/message/abstracts/Message.kt | 2 +- .../TelegramBotAPI/types/TelegramDateTests.kt | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index c29d199dcb..ff43b71fbd 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" api "org.jetbrains.kotlinx:kotlinx-serialization-runtime:$kotlin_serialisation_runtime_version" - api "joda-time:joda-time:$joda_time_version" + api "com.soywiz.korlibs.klock:klock:$klock_version" api "io.ktor:ktor-client:$ktor_version" api "io.ktor:ktor-client-cio:$ktor_version" diff --git a/gradle.properties b/gradle.properties index 7a43a40eb0..2313f49f91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ kotlin.code.style=official kotlin_version=1.3.61 kotlin_coroutines_version=1.3.2 kotlin_serialisation_runtime_version=0.14.0 -joda_time_version=2.10.5 +klock_version=1.8.0 ktor_version=1.2.6 gradle_bintray_plugin_version=1.8.4 diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt index ff71a73f73..1f300e8d8b 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDate.kt @@ -1,7 +1,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.types import kotlinx.serialization.* -import org.joda.time.DateTime +import com.soywiz.klock.DateTime import java.util.concurrent.TimeUnit @Serializable(TelegramDateSerializer::class) @@ -12,7 +12,7 @@ data class TelegramDate( private val date: Long ) { constructor(dateTime: DateTime) : this( - TimeUnit.MILLISECONDS.toSeconds(dateTime.millis) + TimeUnit.MILLISECONDS.toSeconds(dateTime.unixMillisLong) ) @Transient @@ -27,7 +27,7 @@ fun DateTime.toTelegramDate(): TelegramDate = TelegramDate(this) internal object TelegramDateSerializer : KSerializer { override fun serialize(encoder: Encoder, obj: TelegramDate) { encoder.encodeLong( - TimeUnit.MILLISECONDS.toSeconds(obj.asDate.millis) + TimeUnit.MILLISECONDS.toSeconds(obj.asDate.unixMillisLong) ) } diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt index 9631d8183c..a9598b5f48 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelEventMessage.kt @@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.ChannelChat import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.ChannelEvent import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class ChannelEventMessage( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt index d66f9fca72..b6f84d2a02 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMediaGroupMessage.kt @@ -7,7 +7,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.MediaGroupMessage import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class ChannelMediaGroupMessage( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt index 1a2b11168b..4129da66fc 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/ChannelMessage.kt @@ -7,7 +7,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.CommonMessage import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.Message import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class ChannelMessage( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt index 6095cc3daf..026469d707 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMediaGroupMessage.kt @@ -5,7 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.buttons.InlineKeyboardMa import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.* import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MediaGroupContent -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class CommonMediaGroupMessage( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt index e64ac56cea..e58b5f6852 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/CommonMessageImpl.kt @@ -7,7 +7,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.* import com.github.insanusmokrassar.TelegramBotAPI.types.message.content.abstracts.MessageContent import com.github.insanusmokrassar.TelegramBotAPI.types.message.payments.abstracts.PaymentInfo -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class CommonMessageImpl( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/GroupEventMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/GroupEventMessage.kt index d97146deca..c3b4340c52 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/GroupEventMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/GroupEventMessage.kt @@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.GroupChat import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.GroupEvent import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class GroupEventMessage( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/SupergroupEventMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/SupergroupEventMessage.kt index cd5c34cdfc..89229f1a5d 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/SupergroupEventMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/SupergroupEventMessage.kt @@ -4,7 +4,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.MessageIdentifier import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.SupergroupChat import com.github.insanusmokrassar.TelegramBotAPI.types.message.ChatEvents.abstracts.SupergroupEvent import com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts.ChatEventMessage -import org.joda.time.DateTime +import com.soywiz.klock.DateTime data class SupergroupEventMessage( override val messageId: MessageIdentifier, diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/AbleToBeEditedMessage.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/AbleToBeEditedMessage.kt index c3213ef9f4..1c94dd56ae 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/AbleToBeEditedMessage.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/AbleToBeEditedMessage.kt @@ -1,6 +1,6 @@ package com.github.insanusmokrassar.TelegramBotAPI.types.message.abstracts -import org.joda.time.DateTime +import com.soywiz.klock.DateTime interface AbleToBeEditedMessage : Message { val editDate: DateTime? diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt index 60d0e60dbc..2f40a44617 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/message/abstracts/Message.kt @@ -5,7 +5,7 @@ import com.github.insanusmokrassar.TelegramBotAPI.types.chat.abstracts.Chat import com.github.insanusmokrassar.TelegramBotAPI.types.message.RawMessage import kotlinx.serialization.* import kotlinx.serialization.internal.StringDescriptor -import org.joda.time.DateTime +import com.soywiz.klock.DateTime interface Message { val messageId: MessageIdentifier diff --git a/src/test/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt b/src/test/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt index ee9fd95ead..648965a44c 100644 --- a/src/test/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt +++ b/src/test/kotlin/com/github/insanusmokrassar/TelegramBotAPI/types/TelegramDateTests.kt @@ -1,9 +1,9 @@ package com.github.insanusmokrassar.TelegramBotAPI.types +import com.soywiz.klock.DateTime import kotlinx.serialization.ImplicitReflectionSerializer import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json -import org.joda.time.DateTime import java.util.concurrent.TimeUnit import kotlin.test.Test import kotlin.test.assertEquals