Add Compose packaging option and update auto-merge workflow build tasks

mbakgun · Nov 15, 2024 · ab7af80 · ab7af80
1 parent 4664c80
commit ab7af80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
@@ -1,4 +1,4 @@
-name: Auto Merge Pull Requests
+name: Auto Merge Pull Requests Checks
 on:
   pull_request:
     branches:
@@ -24,10 +24,10 @@ jobs:
           java-version: '11'
 
       - name: Build Web Application
-        run: ./gradlew :composeApp:wasmJsBrowserDevelopmentRun
+        run: ./gradlew :composeApp:wasmBrowserDevelopmentExecutableDistribution
 
       - name: Build Desktop Application
-        run: ./gradlew :composeApp:run
+        run: ./gradlew :composeApp:packageDistributionForCurrentOS
 
       - name: Automatically Merge Dependabot PRs
         if: success()

diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,7 @@ kotlin.code.style=official
 kotlin.daemon.jvmargs=-Xmx2048M
 
 #Gradle
-org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
+
+#Compose
+compose.desktop.packaging.checkJdkVendor=false