Updated to new versions

This commit is contained in:
dankito 2023-07-06 13:49:55 +02:00
parent 5e1d045ab9
commit da212106a8
6 changed files with 28 additions and 42 deletions

View File

@ -8,9 +8,8 @@ dependencies {
implementation project(":fints4k")
implementation "org.jetbrains.kotlin-wrappers:kotlin-react:17.0.2-pre.293-kotlin-$kotlinVersion"
implementation "org.jetbrains.kotlin-wrappers:kotlin-react-dom:17.0.2-pre.293-kotlin-$kotlinVersion"
implementation "org.jetbrains.kotlin-wrappers:kotlin-styled:5.3.3-pre.293-kotlin-$kotlinVersion"
implementation "org.jetbrains.kotlin-wrappers:kotlin-react:18.2.0-pre.585"
implementation "org.jetbrains.kotlin-wrappers:kotlin-react-dom:18.2.0-pre.585"
testImplementation "org.jetbrains.kotlin:kotlin-test-js"
}
@ -18,18 +17,9 @@ dependencies {
kotlin {
js(IR) {
browser {
webpackTask {
cssSupport.enabled = true
}
runTask {
cssSupport.enabled = true
}
testTask {
useKarma {
useChromeHeadless()
webpackConfig.cssSupport.enabled = true
}
}
}

View File

@ -29,7 +29,7 @@ buildscript {
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20"
classpath "com.android.tools.build:gradle:7.0.0"
}

View File

@ -5,17 +5,6 @@ plugins {
}
allprojects {
configurations.all {
resolutionStrategy {
// otherwise Kotlin throws an exception even though it is on the classpath:
// "Ktor native HttpClient requires kotlinx.coroutines version with `native-mt` suffix (like `1.3.9-native-mt`)"
force("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}-native-mt")
}
}
}
kotlin {
jvm {
compilations.all {
@ -30,9 +19,6 @@ kotlin {
js(IR) {
binaries.executable()
browser {
commonWebpackConfig {
cssSupport.enabled = true
}
testTask {
useKarma {
// we cannot assume that Chrome and Firefox are installed on all systems
@ -76,7 +62,7 @@ kotlin {
dependencies {
api project(":multiplatform-utils")
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2"
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
@ -144,9 +130,6 @@ kotlin {
iosMain {
dependencies {
// ktor Native needs "-native-mt" coroutines version. Export it so that referencing applications don't need to import it on their own
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion-native-mt")
implementation "io.ktor:ktor-client-ios:$ktorVersion"
}
}
@ -154,9 +137,6 @@ kotlin {
nativeMain {
dependencies {
// ktor Native needs "-native-mt" coroutines version. Export it so that referencing applications don't need to import it on their own
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutinesVersion}-native-mt"
// requires cURL to be installed on your system
implementation "io.ktor:ktor-client-curl:$ktorVersion"

View File

@ -5,10 +5,11 @@ kotlin.code.style=official
org.gradle.jvmargs=-Xmx3072m
kotlinVersion=1.6.10
kotlinVersion=1.8.20
coroutinesVersion=1.6.0
ktorVersion=2.0.0-beta-1
coroutinesVersion=1.7.2
ktorVersion=2.3.2
kotlinxDateTimeVersion=0.4.0
android.useAndroidX=true
android.enableJetifier=true

View File

@ -1,5 +1,5 @@
#Wed Oct 02 19:51:14 CEST 2019
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists

View File

@ -21,9 +21,6 @@ kotlin {
js(IR) {
binaries.executable()
browser {
commonWebpackConfig {
cssSupport.enabled = true
}
testTask {
useKarma {
// we cannot assume that Chrome and Firefox are installed on all systems
@ -65,7 +62,7 @@ kotlin {
sourceSets {
commonMain {
dependencies {
api "org.jetbrains.kotlinx:kotlinx-datetime:0.3.2"
api "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinxDateTimeVersion"
}
}
@ -79,6 +76,8 @@ kotlin {
jvmMain {
dependencies {
// TODO: why does for kotlinx-datetime also the platform specific dependency has to be imported?
api("org.jetbrains.kotlinx:kotlinx-datetime-jvm:$kotlinxDateTimeVersion")
compileOnly "org.slf4j:slf4j-api:$slf4jVersion"
@ -101,6 +100,8 @@ kotlin {
jsMain {
dependencies {
// TODO: why does for kotlinx-datetime also the platform specific dependency has to be imported?
api("org.jetbrains.kotlinx:kotlinx-datetime-js:$kotlinxDateTimeVersion")
implementation npm("@js-joda/timezone", "2.3.0")
}
}
@ -118,5 +119,19 @@ kotlin {
}
}
linuxX64Main {
dependencies {
// TODO: why does for kotlinx-datetime also the platform specific dependency has to be imported?
api("org.jetbrains.kotlinx:kotlinx-datetime-linuxx64:$kotlinxDateTimeVersion")
}
}
mingwX64Main {
dependencies {
// TODO: why does for kotlinx-datetime also the platform specific dependency has to be imported?
api("org.jetbrains.kotlinx:kotlinx-datetime-mingwx64:$kotlinxDateTimeVersion")
}
}
}
}