updates

.github/workflows/nightly.yml

@@ -66,25 +66,25 @@ jobs:
         run:  type -a java;java -version
 
       - name: build package
-        run:  id;pwd;ls -al;./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 packageDistributionForCurrentOS
+        run:  id;pwd;ls -al;./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 packageReleaseDistributionForCurrentOS
       - name: build jar
-        run:  id;pwd;ls -al;./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 packageUberJarForCurrentOS
+        run:  id;pwd;ls -al;./gradlew -Dorg.gradle.java.home=/usr/lib/jvm/java-17-openjdk-amd64 packageReleaseUberJarForCurrentOS
 
       - name: check jar
         run:  id;pwd;ls -hal ./build/compose/jars/trifa_material-linux-x64-*.jar
 
       - name: check deb
-        run:  id;pwd;ls -hal ./build/compose/binaries/main/deb/trifa-material_*-1_amd64.deb
+        run:  id;pwd;ls -hal ./build/compose/binaries/main*/deb/trifa-material_*-1_amd64.deb
 
       - name: check rpm
-        run:  id;pwd;ls -hal ./build/compose/binaries/main/rpm/trifa_material-*.x86_64.rpm
+        run:  id;pwd;ls -hal ./build/compose/binaries/main*/rpm/trifa_material-*.x86_64.rpm
 
 
       - name: Rename artifact for nightly upload
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         run: |
-          cp -v ./build/compose/binaries/main/deb/trifa-material_*_amd64.deb trifa-material_nightly.deb
-          cp -v ./build/compose/binaries/main/rpm/trifa_material-*.x86_64.rpm trifa-material_nightly.rpm
+          cp -v ./build/compose/binaries/main*/deb/trifa-material_*_amd64.deb trifa-material_nightly.deb
+          cp -v ./build/compose/binaries/main*/rpm/trifa_material-*.x86_64.rpm trifa-material_nightly.rpm
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -99,8 +99,8 @@ jobs:
       - name: Rename artifact for release upload
         if: contains(github.ref, 'refs/tags/v')
         run: |
-          cp -v ./build/compose/binaries/main/deb/trifa-material_*_amd64.deb trifa-material.deb
-          cp -v ./build/compose/binaries/main/rpm/trifa_material-*.x86_64.rpm trifa-material.rpm
+          cp -v ./build/compose/binaries/main*/deb/trifa-material_*_amd64.deb trifa-material.deb
+          cp -v ./build/compose/binaries/main*/rpm/trifa_material-*.x86_64.rpm trifa-material.rpm
       - name: Upload to versioned release
         if: contains(github.ref, 'refs/tags/v')
         uses: ncipollo/release-action@v1
@@ -246,11 +246,11 @@ jobs:
           ls -al
           id
           pwd
-          ./gradlew packageDistributionForCurrentOS || cat /Users/runner/work/trifa_material/trifa_material/build/compose/logs/createDistributable/codesign-2*txt
+          ./gradlew packageReleaseDistributionForCurrentOS || cat /Users/runner/work/trifa_material/trifa_material/build/compose/logs/createDistributable/codesign-2*txt
       - name: Rename artifact for nightly upload
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         run: |
-          cp -v /Users/runner/work/trifa_material/trifa_material/build/compose/binaries/main/dmg/trifa_material-*.dmg trifa-material_nightly.dmg
+          cp -v /Users/runner/work/trifa_material/trifa_material/build/compose/binaries/main*/dmg/trifa_material-*.dmg trifa-material_nightly.dmg
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -260,7 +260,7 @@ jobs:
       - name: Rename artifact for release upload
         if: contains(github.ref, 'refs/tags/v')
         run: |
-          cp -v /Users/runner/work/trifa_material/trifa_material/build/compose/binaries/main/dmg/trifa_material-*.dmg trifa-material.dmg
+          cp -v /Users/runner/work/trifa_material/trifa_material/build/compose/binaries/main*/dmg/trifa_material-*.dmg trifa-material.dmg
       - name: Upload to versioned release
         if: contains(github.ref, 'refs/tags/v')
         uses: ncipollo/release-action@v1
@@ -313,13 +313,13 @@ jobs:
           ls -al || echo "_"
           id || echo "_"
           pwd || echo "_"
-          ./gradlew packageDistributionForCurrentOS
+          ./gradlew packageReleaseDistributionForCurrentOS
 
       - name: Rename artifact for nightly upload
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'
         run: |
-          cp -v ./build/compose/binaries/main/msi/trifa*material*.msi trifa-material_nightly.msi
-          cp -v ./build/compose/binaries/main/exe/trifa_material-*.exe trifa-material_nightly.exe
+          cp -v ./build/compose/binaries/main*/msi/trifa*material*.msi trifa-material_nightly.msi
+          cp -v ./build/compose/binaries/main*/exe/trifa_material-*.exe trifa-material_nightly.exe
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
@@ -334,7 +334,7 @@ jobs:
       - name: Rename artifact for nightly upload for tags
         if: contains(github.ref, 'refs/tags/v')
         run: |
-          cp -v ./build/compose/binaries/main/msi/trifa*material*.msi trifa-material_nightly.msi
+          cp -v ./build/compose/binaries/main*/msi/trifa*material*.msi trifa-material_nightly.msi
       - name: Upload artifact for tags
         uses: actions/upload-artifact@v3
         with:
@@ -344,8 +344,8 @@ jobs:
       - name: Rename artifact for release upload
         if: contains(github.ref, 'refs/tags/v')
         run: |
-          cp -v ./build/compose/binaries/main/msi/trifa*material*.msi trifa-material.msi
-          cp -v ./build/compose/binaries/main/exe/trifa_material-*.exe trifa-material.exe
+          cp -v ./build/compose/binaries/main*/msi/trifa*material*.msi trifa-material.msi
+          cp -v ./build/compose/binaries/main*/exe/trifa_material-*.exe trifa-material.exe
       - name: Upload to versioned release
         if: contains(github.ref, 'refs/tags/v')
         uses: ncipollo/release-action@v1

build.gradle.kts

@@ -1,3 +1,4 @@
+import org.gradle.initialization.Environment
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.de.undercouch.gradle.tasks.download.Download
 import java.time.format.DateTimeFormatter
@@ -149,9 +150,14 @@ compose.desktop {
                 println("iconFile=" + iconsRoot.resolve("icon-linux.png"))
             }
 
+            println("targetFormats=" + targetFormats)
+
+            // jvmArgs += "-splash:resources/splash_screen.png"
+            // jvmArgs += "-splash:${'$'}APPDIR/app/resources/splash_screen.png"
             jvmArgs += "-splash:" + iconsRoot.resolve("splash_screen.png")
             println("jvmArgs=" + jvmArgs)
-            println("targetFormats=" + targetFormats)
+            // val ENV = System.getenv()
+            // println("ENV_all=" + ENV.keys)
         }
     }
 }
@@ -161,6 +167,12 @@ val linuxAppDir = project.file("build/compose/binaries/main/app")
 val desktopFile = project.file("resources/trifa_material.desktop")
 val linuxIconFile = project.file("resources/icon-linux.png")
 
+tasks.withType<org.gradle.jvm.tasks.Jar> {
+    manifest {
+        attributes["SplashScreen-Image"] = "splash_screen.png"
+    }
+}
+
 tasks {
     val downloadAppImageBuilder by registering(Download::class) {
         src("https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage")

gradle.properties

@@ -6,6 +6,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 android.defaults.buildfeatures.buildconfig=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-compose.version=1.6.0-dev1383
+compose.version=1.5.12
 kotlin.version=1.9.22
 multiplatform.version=1.9.22