Bump dependency versions

- Split module so that composeResources can be used

Author: bog-walk

LICENSE.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Chantal Loncle
+Copyright (c) 2024 Chantal Loncle
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -27,19 +27,15 @@ the size of the game grid and the amount of mines.
 
 Clone the repository then pick an option:
 
-- Open the project in IntelliJ IDEA and run `Main.kt`
-
-- `./gradlew run` from an open terminal in the root of the project
-
-- Open the Gradle toolbar and select `minesweeper/Tasks/compose desktop/run`
+- Open the project in IntelliJ IDEA and run `desktop/src/jvmMain/Main.kt` using gutter icon
 
 ## :microscope: Run tests
 
 Clone the repository then pick an option:
 
-- Open the project in IntelliJ IDEA then choose specific tests using gutter icons or right-click the `src/test` folder and
-  select `Run 'Tests in 'minesweeper.test''`
+- Open the project in IntelliJ IDEA then choose specific tests using gutter icons or right-click the `desktop/src/jvmTest` folder and
+  select `Run 'Tests in 'minesweeper.desktop.jvmTest''`
 
-- `./gradlew test` from an open terminal in the root of the project
+- `./gradlew desktop:jvmTest` from an open terminal in the root of the project
 
-- Open the Gradle toolbar and select `minesweeper/Tasks/verification/test`
+- Open the Gradle toolbar and select `minesweeper/Tasks/verification/jvmTest`

build.gradle.kts

@@ -1,39 +1,16 @@
-import org.jetbrains.compose.compose
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("org.jetbrains.compose") version "1.4.0"
+    kotlin("multiplatform") apply false
+    id("org.jetbrains.compose") apply false
+    id("org.jetbrains.kotlin.plugin.compose") apply false
 }
 
 group = "dev.bogwalk"
 version = "1.0"
 
-repositories {
-    google()
-    mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-}
-
-dependencies {
-    implementation(compose.desktop.currentOs)
-    implementation(compose.material3)
-    testImplementation(kotlin("test"))
-    testImplementation(compose("org.jetbrains.compose.ui:ui-test-junit4"))
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
-}
-
-compose.desktop {
-    application {
-        mainClass = "MainKt"
-        nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
-            packageName = "minesweeper"
-            packageVersion = "1.0.0"
-        }
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     }
 }

common/build.gradle.kts

@@ -0,0 +1,30 @@
+plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
+}
+
+group = "dev.bogwalk"
+version = "1.0"
+
+kotlin {
+    jvm("desktop") {
+        compilations.all {
+            kotlinOptions.jvmTarget = "17"
+        }
+    }
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation(compose.runtime)
+                implementation(compose.components.resources)
+                implementation(compose.material3)
+            }
+        }
+        val desktopMain by getting {
+            dependencies {
+                implementation(compose.desktop.common)
+            }
+        }
+    }
+}