Change some versions, fix warnings
This commit is contained in:
1
.tool-versions
Normal file
1
.tool-versions
Normal file
@@ -0,0 +1 @@
|
||||
java temurin-17.0.11+9
|
||||
@@ -1,20 +1,22 @@
|
||||
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
|
||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||
import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
|
||||
|
||||
plugins {
|
||||
alias(libs.plugins.kotlinMultiplatform)
|
||||
alias(libs.plugins.androidApplication)
|
||||
alias(libs.plugins.jetbrainsCompose)
|
||||
alias(libs.plugins.jetbrainsKotlinCompose)
|
||||
}
|
||||
|
||||
tasks.withType<KotlinJvmCompile>().configureEach {
|
||||
compilerOptions {
|
||||
jvmTarget.set(JvmTarget.JVM_11)
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
androidTarget {
|
||||
compilations.all {
|
||||
kotlinOptions {
|
||||
jvmTarget = "11"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
androidTarget()
|
||||
jvm("desktop")
|
||||
|
||||
sourceSets {
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
[versions]
|
||||
agp = "8.4.2"
|
||||
agp = "8.3.2"
|
||||
android-compileSdk = "34"
|
||||
android-minSdk = "24"
|
||||
android-targetSdk = "34"
|
||||
androidx-activityCompose = "1.9.0"
|
||||
compose = "1.6.8"
|
||||
compose-plugin = "1.6.11"
|
||||
kotlin = "1.9.24"
|
||||
kotlin = "2.0.0"
|
||||
|
||||
[libraries]
|
||||
atrium = { module = "ch.tutteli.atrium:atrium-fluent", version = "1.2.0" }
|
||||
@@ -18,6 +18,7 @@ compose-ui-text-googlefonts = { module = "androidx.compose.ui:ui-text-google-fon
|
||||
[plugins]
|
||||
androidApplication = { id = "com.android.application", version.ref = "agp" }
|
||||
androidLibrary = { id = "com.android.library", version.ref = "agp" }
|
||||
jetbrainsKotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
|
||||
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
|
||||
jetbrainsKotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
|
||||
Reference in New Issue
Block a user