Updated Kotlin version 1.9.x

This commit is contained in:
dankito 2024-10-01 20:42:24 +02:00
parent 96e8f4f986
commit 91ca36ce00
4 changed files with 439 additions and 643 deletions

View File

@ -4,81 +4,60 @@ plugins {
kotlin { kotlin {
jvmToolchain(8)
jvm { jvm {
compilations.all {
kotlinOptions.jvmTarget = "1.8"
}
withJava() withJava()
testRuns["test"].executionTask.configure { testRuns["test"].executionTask.configure {
useJUnitPlatform() useJUnitPlatform()
} }
} }
ios {
binaries {
framework {
baseName = "EpcQrCode"
}
}
}
js(IR) { js(IR) {
browser { browser {
testTask { testTask {
useKarma { useKarma {
useChromeHeadless() useChromeHeadless()
useFirefoxHeadless() useFirefoxHeadless()
webpackConfig.cssSupport.enabled = true
} }
} }
} }
nodejs { nodejs {
testTask {
useMocha {
timeout = "20s" // Mocha times out after 2 s, which is too short for some tests
}
}
} }
} }
val hostOs = System.getProperty("os.name") // wasmJs() // not supported by korim
val isMingwX64 = hostOs.startsWith("Windows")
val nativeTarget = when {
hostOs == "Mac OS X" -> macosX64("native") linuxX64()
hostOs == "Linux" -> linuxX64("native") mingwX64()
isMingwX64 -> mingwX64("native")
else -> throw GradleException("Host OS is not supported in Kotlin/Native.") iosX64()
} iosArm64()
iosSimulatorArm64()
macosX64()
macosArm64()
watchosArm64()
watchosSimulatorArm64()
tvosArm64()
tvosSimulatorArm64()
applyDefaultHierarchyTemplate()
sourceSets { sourceSets {
val commonMain by getting { commonMain.dependencies {
dependencies { api("com.soywiz.korlibs.korim:korim:3.4.0")
api("com.soywiz.korlibs.korim:korim:2.7.0")
} }
} commonTest.dependencies {
val commonTest by getting {
dependencies {
implementation(kotlin("test")) implementation(kotlin("test"))
} }
}
val jvmMain by getting {
dependencies {
}
}
val jvmTest by getting {
dependencies {
}
}
val iosMain by getting
val iosTest by getting
val jsMain by getting
val jsTest by getting
val nativeMain by getting
val nativeTest by getting
} }
} }

View File

@ -5,8 +5,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
classpath("com.android.tools.build:gradle:4.0.2") classpath("com.android.tools.build:gradle:4.2.2")
} }
} }

View File

@ -5,9 +5,9 @@ xcodeproj=./EpcQrCodeiOSApp
org.gradle.jvmargs=-Xmx3072m org.gradle.jvmargs=-Xmx3072m
kotlinVersion=1.8.20 kotlinVersion=1.9.25
coroutinesVersion=1.6.0 coroutinesVersion=1.8.1
quarkusVersion=3.5.0 quarkusVersion=3.5.0

File diff suppressed because it is too large Load Diff