Merge #194

194: Improve dependency organization r=msfjarvis a=msfjarvis

Also flesh out desktop packaging configuration

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

app/build.gradle.kts

@@ -26,8 +26,6 @@ dependencies {
   implementation(project(":database"))
   implementation(compose.foundation)
   implementation(compose.material)
-  implementation(compose.runtime)
-  implementation(compose.ui)
   implementation(Dependencies.AndroidX.appCompat)
   implementation(Dependencies.AndroidX.browser)
   implementation(Dependencies.AndroidX.datastore)

common/build.gradle.kts

@@ -24,24 +24,24 @@ kotlin {
   android()
 
   sourceSets {
-    val androidMain by getting {
+    named("androidMain") {
       dependencies {
         implementation(Dependencies.AndroidX.browser)
       }
     }
 
-    val commonMain by getting {
+    named("commonMain") {
       dependencies {
-        implementation(compose.runtime)
-        implementation(compose.ui)
+        api(compose.runtime)
+        api(compose.ui)
       }
     }
 
-    val androidTest by getting { dependencies { implementation(kotlin("test-junit")) } }
+    named("androidTest") { dependencies { implementation(kotlin("test-junit")) } }
 
-    val jvmTest by getting { dependencies { implementation(kotlin("test-junit")) } }
+    named("jvmTest") { dependencies { implementation(kotlin("test-junit")) } }
 
-    val commonTest by getting {
+    named("commonTest") {
       dependencies {
         implementation(kotlin("test-common"))
         implementation(kotlin("test-annotations-common"))

desktop/build.gradle.kts

@@ -1,23 +1,41 @@
 import org.jetbrains.compose.compose
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
-  kotlin("jvm")
+  kotlin("multiplatform")
   id("org.jetbrains.compose") version Dependencies.JB_COMPOSE_VERSION
   `lobsters-plugin`
 }
 
 repositories { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") }
 
-dependencies {
-  implementation(project(":api"))
-  implementation(project(":common"))
-  implementation(project(":database"))
-  implementation(compose.desktop.currentOs)
-  implementation(compose.runtime)
-  implementation(compose.material)
-  implementation(Dependencies.Kotlin.Coroutines.jvmCore)
-  implementation(Dependencies.ThirdParty.kamel)
-  implementation(Dependencies.ThirdParty.Retrofit.moshi)
+kotlin {
+  jvm {
+    withJava()
+  }
+  sourceSets {
+    named("jvmMain") {
+      dependencies {
+        implementation(compose.desktop.currentOs)
+        implementation(project(":api"))
+        implementation(project(":common"))
+        implementation(project(":database"))
+        implementation(compose.material)
+        implementation(Dependencies.Kotlin.Coroutines.jvmCore)
+        implementation(Dependencies.ThirdParty.kamel)
+        implementation(Dependencies.ThirdParty.Retrofit.moshi)
+      }
+    }
+  }
 }
 
-compose.desktop { application { mainClass = "dev.msfjarvis.lobsters.ui.Main" } }
+compose.desktop {
+  application {
+    mainClass = "dev.msfjarvis.lobsters.ui.Main"
+    nativeDistributions {
+      targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+      packageName = "Claw"
+      packageVersion = "1.0.0"
+    }
+  }
+}