start migration onto new stack of dependencies versions (plus old changes)
This commit is contained in:
parent
b41a18a01e
commit
7551d7c2bb
@ -4,6 +4,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
maven { url "https://plugins.gradle.org/m2/" }
|
maven { url "https://plugins.gradle.org/m2/" }
|
||||||
|
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@ -21,6 +22,7 @@ allprojects {
|
|||||||
mavenLocal()
|
mavenLocal()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
google()
|
google()
|
||||||
|
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,6 +13,21 @@ allprojects {
|
|||||||
projectByName(name)
|
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"
|
mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
|
||||||
mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
|
mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
|
||||||
mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
|
mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
|
||||||
|
@ -12,10 +12,6 @@ import kotlinx.serialization.Serializable
|
|||||||
sealed interface FileInfo {
|
sealed interface FileInfo {
|
||||||
val name: FileName
|
val name: FileName
|
||||||
val mimeType: MimeType
|
val mimeType: MimeType
|
||||||
|
|
||||||
companion object {
|
|
||||||
fun serializer(): KSerializer<FileInfo> = FileInfoSerializer
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
object FileInfoSerializer : KSerializer<FileInfo> by TypedSerializer(
|
object FileInfoSerializer : KSerializer<FileInfo> by TypedSerializer(
|
||||||
|
@ -22,6 +22,6 @@ class StatusFeatureClient(
|
|||||||
statusAuthorisedPathPart
|
statusAuthorisedPathPart
|
||||||
)
|
)
|
||||||
|
|
||||||
suspend fun checkServerStatus() = client.get<HttpResponse>(fullStatusUrl).status == HttpStatusCode.OK
|
suspend fun checkServerStatus() = client.get(fullStatusUrl).status == HttpStatusCode.OK
|
||||||
suspend fun checkServerStatusWithAuth() = client.get<HttpResponse>(fullAuthorisedStatusUrl).status == HttpStatusCode.OK
|
suspend fun checkServerStatusWithAuth() = client.get(fullAuthorisedStatusUrl).status == HttpStatusCode.OK
|
||||||
}
|
}
|
||||||
|
@ -1,18 +1,18 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kotlin = "1.6.10"
|
kotlin = "1.6.21"
|
||||||
kotlin-serialization = "1.3.2"
|
kotlin-serialization = "1.3.2"
|
||||||
jsuikit = "0.0.48"
|
jsuikit = "0.1.0"
|
||||||
compose = "1.1.1"
|
compose = "1.2.0-alpha01-dev679"
|
||||||
microutils = "0.9.18"
|
microutils = "0.10.1"
|
||||||
tgbotapi = "0.38.11"
|
tgbotapi = "1.0.0"
|
||||||
ktor = "1.6.8"
|
ktor = "2.0.1"
|
||||||
klock = "2.7.0"
|
klock = "2.7.0"
|
||||||
koin = "3.1.5"
|
koin = "3.1.6"
|
||||||
exposed = "0.37.3"
|
exposed = "0.38.2"
|
||||||
psql = "42.3.0"
|
psql = "42.3.0"
|
||||||
scrimage = "4.0.31"
|
scrimage = "4.0.31"
|
||||||
dokka = "1.6.10"
|
dokka = "1.6.20"
|
||||||
logback = "1.2.10"
|
logback = "1.2.10"
|
||||||
uuid = "0.4.0"
|
uuid = "0.4.0"
|
||||||
|
|
||||||
@ -21,7 +21,7 @@ android-junit = "4.12"
|
|||||||
android-test-junit = "1.1.2"
|
android-test-junit = "1.1.2"
|
||||||
android-espresso-core = "3.3.0"
|
android-espresso-core = "3.3.0"
|
||||||
|
|
||||||
gh-release = "2.2.12"
|
gh-release = "2.3.7"
|
||||||
|
|
||||||
android-gradle = "7.0.4"
|
android-gradle = "7.0.4"
|
||||||
dexcount = "3.0.1"
|
dexcount = "3.0.1"
|
||||||
|
@ -28,6 +28,8 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
allTargetsConfiguration()
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$defaultAndroidSettingsPresetPath"
|
apply from: "$defaultAndroidSettingsPresetPath"
|
||||||
|
@ -25,6 +25,9 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
println(this::class)
|
||||||
|
allTargetsConfiguration()
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
|
@ -28,4 +28,6 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
allTargetsConfiguration()
|
||||||
}
|
}
|
||||||
|
@ -45,6 +45,8 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
allTargetsConfiguration()
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$defaultAndroidSettingsPresetPath"
|
apply from: "$defaultAndroidSettingsPresetPath"
|
||||||
|
Loading…
Reference in New Issue
Block a user