InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-11-20 07:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

update dependencies and at least it is buildable

Browse Source
This commit is contained in:
InsanusMokrassar 2023-02-27 16:56:39 +06:00
parent 15dee238b5
commit d8cf3c6726
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gradle/libs.versions.toml
View File

@ -1,17 +1,17 @@
[versions] [versions]
kt = "1.7.20" kt = "1.8.0"
kt-serialization = "1.4.1" kt-serialization = "1.5.0"
kt-coroutines = "1.6.4" kt-coroutines = "1.6.4"
kslog = "0.5.4" kslog = "1.0.0"
jb-compose = "1.2.2" jb-compose = "1.3.1-rc01"
jb-exposed = "0.41.1" jb-exposed = "0.41.1"
jb-dokka = "1.7.20" jb-dokka = "1.7.20"
klock = "3.4.0" klock = "3.4.0"
uuid = "0.6.0" uuid = "0.7.0"
ktor = "2.2.3" ktor = "2.2.3"
@ -19,18 +19,18 @@ gh-release = "2.4.1"
koin = "3.3.2" koin = "3.3.2"
ksp = "1.7.20-1.0.8" ksp = "1.8.0-1.0.8"
kotlin-poet = "1.12.0" kotlin-poet = "1.12.0"
android-gradle = "7.3.0" android-gradle = "7.3.1"
dexcount = "3.1.0" dexcount = "4.0.0"
android-coreKtx = "1.9.0" android-coreKtx = "1.9.0"
android-recyclerView = "1.2.1" android-recyclerView = "1.2.1"
android-appCompat = "1.6.0" android-appCompat = "1.6.1"
android-fragment = "1.5.5" android-fragment = "1.5.5"
android-espresso = "3.4.0" android-espresso = "3.5.1"
android-test = "1.1.3" android-test = "1.1.5"
android-props-minSdk = "21" android-props-minSdk = "21"
android-props-compileSdk = "33" android-props-compileSdk = "33"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

4
ktor/client/build.gradle
View File

@ -15,9 +15,5 @@ kotlin {
api libs.ktor.client api libs.ktor.client
} }
} }
androidMain {
dependsOn jvmMain
}
} }
} }

5
ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt
View File

@ -44,7 +44,8 @@ actual suspend fun <T> HttpClient.uniUpload(
val withBinary = data.values.any { it is File || it is UniUploadFileInfo } val withBinary = data.values.any { it is File || it is UniUploadFileInfo }
val formData = formData { val formData = formData {
data.forEach { (k, v) -> for (k in data.keys) {
val v = data[k] ?: continue
when (v) { when (v) {
is File -> append( is File -> append(
k, k,
@ -89,7 +90,7 @@ actual suspend fun <T> HttpClient.uniUpload(
submitForm( submitForm(
url, url,
Parameters.build { Parameters.build {
formData.forEach { for (it in formData) {
val formItem = (it as PartData.FormItem) val formItem = (it as PartData.FormItem)
append(it.name!!, it.value) append(it.name!!, it.value)
} }