Move sample desktop app to common sample

sebaslogen · Sep 16, 2024 · bda0f40 · bda0f40
1 parent 1f0591e
commit bda0f40
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 36 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,7 +26,7 @@ apiValidation {
     val ci = System.getenv("CI_FLOW")
     if (ci == null || !ci.contains("Maven")) { // This block is only applicable on build that include the sample app
         println("ApiValidation is being ignored for module $sampleModuleName in local builds")
-        ignoredProjects.addAll(listOf(sampleModuleName, "sampleComposeApp", "sampleDesktopApp"))
+        ignoredProjects.addAll(listOf(sampleModuleName, "sampleComposeApp"))
     }
     @OptIn(kotlinx.validation.ExperimentalBCVApi::class)
     klib {

diff --git a/samplecmp/sampleComposeApp/build.gradle.kts b/samplecmp/sampleComposeApp/build.gradle.kts
@@ -1,3 +1,4 @@
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
@@ -138,6 +139,18 @@ android {
     }
 }
 
+compose.desktop {
+    application {
+        mainClass = "MainKt"
+
+        nativeDistributions {
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            packageName = "ComposeApp"
+            packageVersion = "1.0.0"
+        }
+    }
+}
+
 tasks.withType<AbstractTestTask> {
     // Add test output to gradle console
     afterSuite(KotlinClosure2({ desc: TestDescriptor, result: TestResult ->

diff --git a/...mp/sampleDesktopApp/src/main/java/Main.kt → ...ComposeApp/src/desktopMain/kotlin/main.kt b/...mp/sampleDesktopApp/src/main/java/Main.kt → ...ComposeApp/src/desktopMain/kotlin/main.kt
diff --git a/samplecmp/sampleDesktopApp/build.gradle.kts b/samplecmp/sampleDesktopApp/build.gradle.kts
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -21,7 +21,6 @@ println("Running on CI flow: $ci")
 if (ci == null || !ci.contains("Maven")) { // Remove the sample app from Maven publication builds
     include(":sample")
     include(":samplecmp:sampleComposeApp")
-    include(":samplecmp:sampleDesktopApp")
 }
 
 include(