diff --git a/CHANGELOG.md b/CHANGELOG.md index 38b74d2428..686a1be35a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## 0.17.0 +* Kotlin version `1.3.31` -> `1.3.41` +* Kotlin Coroutines version `1.2.1` -> `1.2.2` +* Kotlin Serialization version `0.11.0` -> `0.11.1` +* Joda Time version `2.10.1` -> `2.10.3` +* Ktor version `1.1.4` -> `1.2.2` + ## 0.16.0 Bot API 4.3 * `LoginURL` and `LoginURLInlineKeyboardButton` has been added diff --git a/gradle.properties b/gradle.properties index e5002968b7..65e5f9842d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ kotlin.code.style=official -kotlin_version=1.3.31 -kotlin_coroutines_version=1.2.1 -kotlin_serialisation_runtime_version=0.11.0 -joda_time_version=2.10.1 -ktor_version=1.1.4 +kotlin_version=1.3.41 +kotlin_coroutines_version=1.2.2 +kotlin_serialisation_runtime_version=0.11.1 +joda_time_version=2.10.3 +ktor_version=1.2.2 gradle_bintray_plugin_version=1.8.4 diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt index c90ba16e95..aa5aad04ad 100644 --- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt +++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/bot/Ktor/base/MultipartRequestCallFactory.kt @@ -3,8 +3,7 @@ package com.github.insanusmokrassar.TelegramBotAPI.bot.Ktor.base import com.github.insanusmokrassar.TelegramBotAPI.requests.abstracts.* import com.github.insanusmokrassar.TelegramBotAPI.utils.mapWithCommonValues import io.ktor.client.HttpClient -import io.ktor.client.request.forms.MultiPartFormDataContent -import io.ktor.client.request.forms.formData +import io.ktor.client.request.forms.* import io.ktor.http.Headers import io.ktor.http.HttpHeaders @@ -22,7 +21,9 @@ class MultipartRequestCallFactory : AbstractRequestCallFactory() { when (value) { is MultipartFile -> append( key, - value.file.asInput(), + InputProvider { + value.file.asInput() + }, Headers.build { append(HttpHeaders.ContentType, value.mimeType) append(HttpHeaders.ContentDisposition, "filename=${value.fileId}")