From 7d9829ac7de7ff8eea6e34bea56b63a616c1ca98 Mon Sep 17 00:00:00 2001
From: Syer10 <syer10@users.noreply.github.com>
Date: Tue, 11 Oct 2022 15:19:13 -0400
Subject: [PATCH] Update dependencies

---
 build.gradle.kts                              |  5 +++-
 .../ca/gosyer/jui/data/DataComponent.kt       |  2 +-
 ...onverter.kt => FlowIOResponseConverter.kt} |  6 ++---
 gradle/libs.versions.toml                     | 26 +++++++++----------
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 5 files changed, 22 insertions(+), 19 deletions(-)
 rename data/src/commonMain/kotlin/ca/gosyer/jui/data/{FlowIORequestConverter.kt => FlowIOResponseConverter.kt} (88%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2914ad8c..070ae89d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,6 +2,7 @@ import Config.migrationCode
 import Config.serverCode
 import Config.tachideskVersion
 import com.codingfeline.buildkonfig.compiler.FieldSpec.Type
+import org.jetbrains.compose.ComposeExtension
 import org.jetbrains.compose.ComposePlugin
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
@@ -141,7 +142,9 @@ subprojects {
         }
     }
     plugins.withType<ComposePlugin> {
-        ext["compose.compiler.version"] = libs.versions.composeCompiler.get()
+        configure<ComposeExtension> {
+            kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
+        }
     }
     afterEvaluate {
         extensions.findByType<KotlinMultiplatformExtension>()?.let { ext ->
diff --git a/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt
index 85637a6a..c9f6d545 100644
--- a/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt
+++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/DataComponent.kt
@@ -29,7 +29,7 @@ interface DataComponent {
     fun ktorfit(http: Http, serverPreferences: ServerPreferences) = Ktorfit
         .Builder()
         .httpClient(http)
-        .requestConverter(FlowIORequestConverter())
+        .responseConverter(FlowIOResponseConverter())
         .baseUrl(serverPreferences.serverUrl().get().toString().addSuffix('/'))
         .build()
 
diff --git a/data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIORequestConverter.kt b/data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIOResponseConverter.kt
similarity index 88%
rename from data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIORequestConverter.kt
rename to data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIOResponseConverter.kt
index 3ad94877..61cabac2 100644
--- a/data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIORequestConverter.kt
+++ b/data/src/commonMain/kotlin/ca/gosyer/jui/data/FlowIOResponseConverter.kt
@@ -8,7 +8,7 @@ package ca.gosyer.jui.data
 
 import ca.gosyer.jui.core.lang.IO
 import de.jensklingenberg.ktorfit.Ktorfit
-import de.jensklingenberg.ktorfit.converter.request.RequestConverter
+import de.jensklingenberg.ktorfit.converter.request.ResponseConverter
 import de.jensklingenberg.ktorfit.internal.TypeData
 import io.ktor.client.call.body
 import io.ktor.client.statement.HttpResponse
@@ -17,13 +17,13 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 
-class FlowIORequestConverter : RequestConverter {
+class FlowIOResponseConverter : ResponseConverter {
 
     override fun supportedType(typeData: TypeData, isSuspend: Boolean): Boolean {
         return typeData.qualifiedName == "kotlinx.coroutines.flow.Flow"
     }
 
-    override fun <RequestType> convertRequest(
+    override fun <RequestType : Any?> wrapResponse(
         typeData: TypeData,
         requestFunction: suspend () -> Pair<TypeInfo, HttpResponse?>,
         ktorfit: Ktorfit
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd6a6809..927b7aa0 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,48 +1,48 @@
 [versions]
 # Kotlin
-kotlin = "1.7.10"
+kotlin = "1.7.20"
 coroutines = "1.6.4"
 
 # Serialization
 json = "1.4.0"
 
 # Compose
-composeGradle = "1.2.0-beta01"
-composeCompiler = "1.3.0"
+composeGradle = "1.2.0-rc02"
+composeCompiler = "1.3.2"
 composeAndroid = "1.2.1"
 voyager = "1.0.0-beta16"
 accompanist = "0.25.2"
 googleAccompanist = "0.25.1"
-imageloader = "1.1.8"
+imageloader = "1.2.2.1"
 materialDialogs = "0.8.0"
 
 # Android
-androidGradle = "7.3.0-rc01"
+androidGradle = "7.3.0"
 core = "1.9.0"
 appCompat = "1.6.0-rc01"
-activityCompose = "1.5.1"
+activityCompose = "1.6.0"
 work = "2.7.1"
 
 # Android Lifecycle
 lifecycle = "2.6.0-alpha02"
 
 # Swing
-darklaf = "3.0.1"
+darklaf = "3.0.2"
 
 # Ksp
-ksp = "1.7.10-1.0.6"
+ksp = "1.7.20-1.0.6"
 
 # Dependency Injection
 kotlinInject = "0.5.1"
 
 # Network
-ktor = "2.1.1"
-ktorfit = "1.0.0-beta14"
+ktor = "2.1.2"
+ktorfit = "1.0.0-beta15"
 
 # Logging
 slf4j = "1.7.36"
 slf4jAndroid = "1.7.36-0"
-log4j = "2.18.0"
+log4j = "2.19.0"
 kmlogging = "1.2.0"
 
 # Storage
@@ -55,7 +55,7 @@ multiplatformSettings = "1.0.0-alpha01"
 # Utility
 kroki = "1.23"
 desugarJdkLibs = "1.2.2"
-aboutLibraries = "10.4.0"
+aboutLibraries = "10.5.0"
 dateTime = "0.4.0"
 immutableCollections = "0.3.5"
 
@@ -67,7 +67,7 @@ buildconfig = "3.1.0"
 buildkonfig = "0.13.3"
 
 # Linter
-kotlinter = "3.11.1"
+kotlinter = "3.12.0"
 
 # Version updates
 versions = "0.42.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aa991fce..ae04661e 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.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists