From d8cf3c672640482ec4666a15218b28167fe98865 Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Mon, 27 Feb 2023 16:56:39 +0600
Subject: [PATCH] update dependencies and at least it is buildable

---
 gradle/libs.versions.toml                     | 22 +++++++++----------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 ktor/client/build.gradle                      |  4 ----
 .../ktor/client/ActualUniUpload.kt            |  5 +++--
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0d61310cebd..5abc906d056 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 
-kt = "1.7.20"
-kt-serialization = "1.4.1"
+kt = "1.8.0"
+kt-serialization = "1.5.0"
 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-dokka = "1.7.20"
 
 klock = "3.4.0"
-uuid = "0.6.0"
+uuid = "0.7.0"
 
 ktor = "2.2.3"
 
@@ -19,18 +19,18 @@ gh-release = "2.4.1"
 
 koin = "3.3.2"
 
-ksp = "1.7.20-1.0.8"
+ksp = "1.8.0-1.0.8"
 kotlin-poet = "1.12.0"
 
-android-gradle = "7.3.0"
-dexcount = "3.1.0"
+android-gradle = "7.3.1"
+dexcount = "4.0.0"
 
 android-coreKtx = "1.9.0"
 android-recyclerView = "1.2.1"
-android-appCompat = "1.6.0"
+android-appCompat = "1.6.1"
 android-fragment = "1.5.5"
-android-espresso = "3.4.0"
-android-test = "1.1.3"
+android-espresso = "3.5.1"
+android-test = "1.1.5"
 
 android-props-minSdk = "21"
 android-props-compileSdk = "33"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb702f09..774fae87671 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 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
 zipStorePath=wrapper/dists
diff --git a/ktor/client/build.gradle b/ktor/client/build.gradle
index f3ac97bea11..19c17926dfe 100644
--- a/ktor/client/build.gradle
+++ b/ktor/client/build.gradle
@@ -15,9 +15,5 @@ kotlin {
                 api libs.ktor.client
             }
         }
-
-        androidMain {
-            dependsOn jvmMain
-        }
     }
 }
diff --git a/ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt b/ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt
index 8031c347565..085e59f179a 100644
--- a/ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt
+++ b/ktor/client/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/client/ActualUniUpload.kt
@@ -44,7 +44,8 @@ actual suspend fun <T> HttpClient.uniUpload(
     val withBinary = data.values.any { it is File || it is UniUploadFileInfo }
 
     val formData = formData {
-        data.forEach { (k, v) ->
+        for (k in data.keys) {
+            val v = data[k] ?: continue
             when (v) {
                 is File -> append(
                     k,
@@ -89,7 +90,7 @@ actual suspend fun <T> HttpClient.uniUpload(
         submitForm(
             url,
             Parameters.build {
-                formData.forEach {
+                for (it in formData) {
                     val formItem = (it as PartData.FormItem)
                     append(it.name!!, it.value)
                 }