feat: update to jdk18 and kotlin 1.8

This commit is contained in:
aro 2023-03-17 12:21:08 +01:00
parent c760e15608
commit 4a56148f6e

View file

@ -1,10 +1,10 @@
import org.jetbrains.compose.ExperimentalComposeLibrary
import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
kotlin("jvm") version "1.7.20" kotlin("jvm") version "1.8.10"
id("org.jetbrains.compose") version "1.2.1" id("org.jetbrains.compose") version "1.3.1"
} }
group = "xyz.atnrch" group = "xyz.atnrch"
@ -16,7 +16,6 @@ repositories {
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
} }
@OptIn(ExperimentalComposeLibrary::class)
dependencies { dependencies {
implementation(compose.desktop.currentOs) implementation(compose.desktop.currentOs)
implementation(compose.materialIconsExtended) implementation(compose.materialIconsExtended)
@ -26,7 +25,7 @@ dependencies {
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "16" kotlinOptions.jvmTarget = "18"
} }
compose.desktop { compose.desktop {
@ -37,10 +36,6 @@ compose.desktop {
targetFormats(TargetFormat.AppImage) targetFormats(TargetFormat.AppImage)
packageName = "Wrench" packageName = "Wrench"
packageVersion = "1.0.0" packageVersion = "1.0.0"
linux {
packageName = "Wrench"
//iconFile.set(project.file(""))
}
} }
} }
} }