Update dependencies

This commit is contained in:
Syer10
2022-10-11 15:19:13 -04:00
parent df30a0fd58
commit 7d9829ac7d
5 changed files with 22 additions and 19 deletions

View File

@@ -2,6 +2,7 @@ import Config.migrationCode
import Config.serverCode import Config.serverCode
import Config.tachideskVersion import Config.tachideskVersion
import com.codingfeline.buildkonfig.compiler.FieldSpec.Type import com.codingfeline.buildkonfig.compiler.FieldSpec.Type
import org.jetbrains.compose.ComposeExtension
import org.jetbrains.compose.ComposePlugin import org.jetbrains.compose.ComposePlugin
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
@@ -141,7 +142,9 @@ subprojects {
} }
} }
plugins.withType<ComposePlugin> { plugins.withType<ComposePlugin> {
ext["compose.compiler.version"] = libs.versions.composeCompiler.get() configure<ComposeExtension> {
kotlinCompilerPlugin.set(libs.versions.composeCompiler.get())
}
} }
afterEvaluate { afterEvaluate {
extensions.findByType<KotlinMultiplatformExtension>()?.let { ext -> extensions.findByType<KotlinMultiplatformExtension>()?.let { ext ->

View File

@@ -29,7 +29,7 @@ interface DataComponent {
fun ktorfit(http: Http, serverPreferences: ServerPreferences) = Ktorfit fun ktorfit(http: Http, serverPreferences: ServerPreferences) = Ktorfit
.Builder() .Builder()
.httpClient(http) .httpClient(http)
.requestConverter(FlowIORequestConverter()) .responseConverter(FlowIOResponseConverter())
.baseUrl(serverPreferences.serverUrl().get().toString().addSuffix('/')) .baseUrl(serverPreferences.serverUrl().get().toString().addSuffix('/'))
.build() .build()

View File

@@ -8,7 +8,7 @@ package ca.gosyer.jui.data
import ca.gosyer.jui.core.lang.IO import ca.gosyer.jui.core.lang.IO
import de.jensklingenberg.ktorfit.Ktorfit 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 de.jensklingenberg.ktorfit.internal.TypeData
import io.ktor.client.call.body import io.ktor.client.call.body
import io.ktor.client.statement.HttpResponse import io.ktor.client.statement.HttpResponse
@@ -17,13 +17,13 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.flow import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn import kotlinx.coroutines.flow.flowOn
class FlowIORequestConverter : RequestConverter { class FlowIOResponseConverter : ResponseConverter {
override fun supportedType(typeData: TypeData, isSuspend: Boolean): Boolean { override fun supportedType(typeData: TypeData, isSuspend: Boolean): Boolean {
return typeData.qualifiedName == "kotlinx.coroutines.flow.Flow" return typeData.qualifiedName == "kotlinx.coroutines.flow.Flow"
} }
override fun <RequestType> convertRequest( override fun <RequestType : Any?> wrapResponse(
typeData: TypeData, typeData: TypeData,
requestFunction: suspend () -> Pair<TypeInfo, HttpResponse?>, requestFunction: suspend () -> Pair<TypeInfo, HttpResponse?>,
ktorfit: Ktorfit ktorfit: Ktorfit

View File

@@ -1,48 +1,48 @@
[versions] [versions]
# Kotlin # Kotlin
kotlin = "1.7.10" kotlin = "1.7.20"
coroutines = "1.6.4" coroutines = "1.6.4"
# Serialization # Serialization
json = "1.4.0" json = "1.4.0"
# Compose # Compose
composeGradle = "1.2.0-beta01" composeGradle = "1.2.0-rc02"
composeCompiler = "1.3.0" composeCompiler = "1.3.2"
composeAndroid = "1.2.1" composeAndroid = "1.2.1"
voyager = "1.0.0-beta16" voyager = "1.0.0-beta16"
accompanist = "0.25.2" accompanist = "0.25.2"
googleAccompanist = "0.25.1" googleAccompanist = "0.25.1"
imageloader = "1.1.8" imageloader = "1.2.2.1"
materialDialogs = "0.8.0" materialDialogs = "0.8.0"
# Android # Android
androidGradle = "7.3.0-rc01" androidGradle = "7.3.0"
core = "1.9.0" core = "1.9.0"
appCompat = "1.6.0-rc01" appCompat = "1.6.0-rc01"
activityCompose = "1.5.1" activityCompose = "1.6.0"
work = "2.7.1" work = "2.7.1"
# Android Lifecycle # Android Lifecycle
lifecycle = "2.6.0-alpha02" lifecycle = "2.6.0-alpha02"
# Swing # Swing
darklaf = "3.0.1" darklaf = "3.0.2"
# Ksp # Ksp
ksp = "1.7.10-1.0.6" ksp = "1.7.20-1.0.6"
# Dependency Injection # Dependency Injection
kotlinInject = "0.5.1" kotlinInject = "0.5.1"
# Network # Network
ktor = "2.1.1" ktor = "2.1.2"
ktorfit = "1.0.0-beta14" ktorfit = "1.0.0-beta15"
# Logging # Logging
slf4j = "1.7.36" slf4j = "1.7.36"
slf4jAndroid = "1.7.36-0" slf4jAndroid = "1.7.36-0"
log4j = "2.18.0" log4j = "2.19.0"
kmlogging = "1.2.0" kmlogging = "1.2.0"
# Storage # Storage
@@ -55,7 +55,7 @@ multiplatformSettings = "1.0.0-alpha01"
# Utility # Utility
kroki = "1.23" kroki = "1.23"
desugarJdkLibs = "1.2.2" desugarJdkLibs = "1.2.2"
aboutLibraries = "10.4.0" aboutLibraries = "10.5.0"
dateTime = "0.4.0" dateTime = "0.4.0"
immutableCollections = "0.3.5" immutableCollections = "0.3.5"
@@ -67,7 +67,7 @@ buildconfig = "3.1.0"
buildkonfig = "0.13.3" buildkonfig = "0.13.3"
# Linter # Linter
kotlinter = "3.11.1" kotlinter = "3.12.0"
# Version updates # Version updates
versions = "0.42.0" versions = "0.42.0"

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.4.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists