From 69eb2802057f220d72cf3cd580da452b5b18931a Mon Sep 17 00:00:00 2001
From: John O'Reilly <oreillyj@gmail.com>
Date: Sun, 3 Mar 2024 15:27:24 +0000
Subject: [PATCH] dependency updates

---
 buildSrc/src/main/java/Dependencies.kt |  2 +-
 compose-desktop/build.gradle.kts       |  7 ---
 shared/build.gradle.kts                | 62 ++++++++------------------
 3 files changed, 20 insertions(+), 51 deletions(-)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index 8781512..36dfda8 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -5,7 +5,7 @@ object Versions {
 
     const val compose = "1.5.4"
     const val composeCompiler = "1.5.5-dev-k2.0.0-Beta1-06b8ae672a4"
-    const val composeDesktopWeb = "1.6.0-alpha01"
+    const val composeDesktopWeb = "1.6.0"
     const val navCompose = "2.5.2"
     const val accompanist = "0.26.2-beta"
     const val okio = "3.0.0"
diff --git a/compose-desktop/build.gradle.kts b/compose-desktop/build.gradle.kts
index f7c9780..f370b0f 100644
--- a/compose-desktop/build.gradle.kts
+++ b/compose-desktop/build.gradle.kts
@@ -1,6 +1,3 @@
-import org.jetbrains.compose.compose
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     kotlin("jvm")
     id("org.jetbrains.compose") version Versions.composeDesktopWeb
@@ -20,10 +17,6 @@ dependencies {
     implementation(project(":shared"))
 }
 
-//tasks.withType<KotlinCompile> {
-//    kotlinOptions.jvmTarget = "1.8"
-//}
-
 application {
     mainClass.set("MainKt")
 }
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 62f83df..1f4a9a9 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -6,61 +6,37 @@ plugins {
 }
 
 kotlin {
-    android()
+    androidTarget()
     jvm()
 
-    val iosArm64 = iosArm64()
-    val iosX64 = iosX64()
-    val iosSimulatorArm64 = iosSimulatorArm64()
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "shared"
+        }
+    }
 
     sourceSets {
-        val commonMain by getting {
-            dependencies {
-                api(Kotlinx.coroutinesCore)
-                implementation(Square.okio)
-            }
+        commonMain.dependencies {
+            api(Kotlinx.coroutinesCore)
+            implementation(Square.okio)
         }
 
-        val commonTest by getting {
-            dependencies {
-                implementation(Kotlinx.coroutinesTest)
-                implementation(kotlin("test-common"))
-                implementation(kotlin("test-annotations-common"))
-            }
-        }
-        val androidMain by getting {
-            dependencies {
-            }
-        }
+//        commonTest.dependencies {
+//            implementation(Kotlinx.coroutinesTest)
+//            implementation(kotlin("test-common"))
+//            implementation(kotlin("test-annotations-common"))
+//        }
+
         val androidUnitTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
             }
         }
-        val appleMain by creating {
-            dependsOn(commonMain)
-        }
-        val appleTest by creating {
-            dependsOn(commonTest)
-        }
-
-        val jvmMain by getting
-
-        listOf(
-            iosArm64, iosX64, iosSimulatorArm64
-        ).forEach {
-            it.binaries.framework {
-                baseName = "shared"
-            }
-            getByName("${it.targetName}Main") {
-                dependsOn(appleMain)
-            }
-            getByName("${it.targetName}Test") {
-                dependsOn(appleTest)
-            }
-        }
-
     }
 }