From f7a172502984a208230898634aa25255a6828009 Mon Sep 17 00:00:00 2001
From: Christian Basler <christian.basler@bedag.ch>
Date: Mon, 17 Jun 2024 17:01:20 +0200
Subject: [PATCH] Change some versions, fix warnings

---
 .tool-versions              |  1 +
 composeApp/build.gradle.kts | 18 ++++++++++--------
 gradle/libs.versions.toml   |  5 +++--
 3 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 .tool-versions

diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..2063182
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java temurin-17.0.11+9
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 4585680..d2a2369 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -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 {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6eec9fa..7e9f1dd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -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" }
\ No newline at end of file