From 7551d7c2bbacb5d076dd0dbed2dba61b95e82591 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 7 May 2022 01:50:53 +0600 Subject: [PATCH] start migration onto new stack of dependencies versions (plus old changes) --- build.gradle | 2 ++ extensions.gradle | 17 +++++++++++++++- .../features/files/common/FileInfo.kt | 4 ---- .../status/client/StatusFeatureClient.kt | 4 ++-- gradle/libs.versions.toml | 20 +++++++++---------- mppAndroidProject.gradle | 2 ++ mppJavaProject.gradle | 3 +++ mppJsProject.gradle | 2 ++ mppProjectWithSerialization.gradle | 2 ++ 9 files changed, 39 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index e595f185..3f206e5d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { mavenCentral() mavenLocal() maven { url "https://plugins.gradle.org/m2/" } + maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } } dependencies { @@ -21,6 +22,7 @@ allprojects { mavenLocal() mavenCentral() google() + maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } } } diff --git a/extensions.gradle b/extensions.gradle index 9a9b67b9..0dea6ff8 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -13,6 +13,21 @@ allprojects { projectByName(name) } + allTargetsConfiguration = { -> + kotlin { + targets.all { + compilations.all { + kotlinOptions { + freeCompilerArgs += [ + "-P", + "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true" + ] + } + } + } + } + } + mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle" @@ -20,6 +35,6 @@ allprojects { defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" - publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" + publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" } } diff --git a/features/files/common/src/commonMain/kotlin/dev/inmo/postssystem/features/files/common/FileInfo.kt b/features/files/common/src/commonMain/kotlin/dev/inmo/postssystem/features/files/common/FileInfo.kt index ab6c0c16..091c1329 100644 --- a/features/files/common/src/commonMain/kotlin/dev/inmo/postssystem/features/files/common/FileInfo.kt +++ b/features/files/common/src/commonMain/kotlin/dev/inmo/postssystem/features/files/common/FileInfo.kt @@ -12,10 +12,6 @@ import kotlinx.serialization.Serializable sealed interface FileInfo { val name: FileName val mimeType: MimeType - - companion object { - fun serializer(): KSerializer = FileInfoSerializer - } } object FileInfoSerializer : KSerializer by TypedSerializer( diff --git a/features/status/client/src/commonMain/kotlin/dev/inmo/postssystem/features/status/client/StatusFeatureClient.kt b/features/status/client/src/commonMain/kotlin/dev/inmo/postssystem/features/status/client/StatusFeatureClient.kt index 04aad62a..63cabac9 100644 --- a/features/status/client/src/commonMain/kotlin/dev/inmo/postssystem/features/status/client/StatusFeatureClient.kt +++ b/features/status/client/src/commonMain/kotlin/dev/inmo/postssystem/features/status/client/StatusFeatureClient.kt @@ -22,6 +22,6 @@ class StatusFeatureClient( statusAuthorisedPathPart ) - suspend fun checkServerStatus() = client.get(fullStatusUrl).status == HttpStatusCode.OK - suspend fun checkServerStatusWithAuth() = client.get(fullAuthorisedStatusUrl).status == HttpStatusCode.OK + suspend fun checkServerStatus() = client.get(fullStatusUrl).status == HttpStatusCode.OK + suspend fun checkServerStatusWithAuth() = client.get(fullAuthorisedStatusUrl).status == HttpStatusCode.OK } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c4fdc02e..6587156e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,18 +1,18 @@ [versions] -kotlin = "1.6.10" +kotlin = "1.6.21" kotlin-serialization = "1.3.2" -jsuikit = "0.0.48" -compose = "1.1.1" -microutils = "0.9.18" -tgbotapi = "0.38.11" -ktor = "1.6.8" +jsuikit = "0.1.0" +compose = "1.2.0-alpha01-dev679" +microutils = "0.10.1" +tgbotapi = "1.0.0" +ktor = "2.0.1" klock = "2.7.0" -koin = "3.1.5" -exposed = "0.37.3" +koin = "3.1.6" +exposed = "0.38.2" psql = "42.3.0" scrimage = "4.0.31" -dokka = "1.6.10" +dokka = "1.6.20" logback = "1.2.10" uuid = "0.4.0" @@ -21,7 +21,7 @@ android-junit = "4.12" android-test-junit = "1.1.2" android-espresso-core = "3.3.0" -gh-release = "2.2.12" +gh-release = "2.3.7" android-gradle = "7.0.4" dexcount = "3.0.1" diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle index 669e24e4..270d7e20 100644 --- a/mppAndroidProject.gradle +++ b/mppAndroidProject.gradle @@ -28,6 +28,8 @@ kotlin { } } } + + allTargetsConfiguration() } apply from: "$defaultAndroidSettingsPresetPath" diff --git a/mppJavaProject.gradle b/mppJavaProject.gradle index 762212c9..6920ca91 100644 --- a/mppJavaProject.gradle +++ b/mppJavaProject.gradle @@ -25,6 +25,9 @@ kotlin { } } } + + println(this::class) + allTargetsConfiguration() } java { diff --git a/mppJsProject.gradle b/mppJsProject.gradle index cbb2cc45..653e092c 100644 --- a/mppJsProject.gradle +++ b/mppJsProject.gradle @@ -28,4 +28,6 @@ kotlin { } } } + + allTargetsConfiguration() } diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle index 1fc1f408..edc0a07c 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppProjectWithSerialization.gradle @@ -45,6 +45,8 @@ kotlin { } } } + + allTargetsConfiguration() } apply from: "$defaultAndroidSettingsPresetPath"