Start setup release automation for desktop

.github/workflows/release.yaml → .github/workflows/android-alpha-release.yaml

@@ -1,9 +1,9 @@
-name: Deploy Alpha Version
+name: Android Alpha Release
 
 on:
   push:
     tags:
-      - '*'
+      - '*-android'
 
 jobs:
   deploy:

androidApp/build.gradle.kts

@@ -97,8 +97,10 @@ fun getVersionCode(): Int {
 fun getVersionName(): String {
     val outputStream = org.apache.commons.io.output.ByteArrayOutputStream()
     project.exec {
-        commandLine = "git describe --tags --abbrev=0".split(" ")
+        commandLine = listOf("git", "describe", "--tags", "--abbrev=0", "--match", "*-android")
         standardOutput = outputStream
     }
-    return outputStream.toString().trim()
-}
+    return outputStream.toString()
+        .trim()
+        .replace("-android", "")
+}

desktopApp/build.gradle.kts

@@ -1,4 +1,3 @@
-import org.jetbrains.compose.compose
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 
 plugins {
@@ -39,7 +38,6 @@ kotlin {
 compose.desktop {
     application {
         mainClass = "com.prof18.feedflow.MainKt"
-        javaHome = "/Library/Java/JavaVirtualMachines/zulu-18.jdk/Contents/Home"
 
 //        buildTypes.release.proguard {
 //            obfuscate.set(true)
@@ -51,11 +49,13 @@ compose.desktop {
 
         nativeDistributions {
 
+            outputBaseDir.set(project.buildDir.resolve("release"))
+
             modules("java.instrument", "java.sql", "jdk.unsupported")
 
             targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
             packageName = "FeedFlow"
-            packageVersion = "1.0.0"
+            packageVersion = getVersionName()
 
             description = "FeedFlow - Read RSS Feed"
             copyright = "© 2023 Marco Gomiero. All rights reserved."
@@ -65,9 +65,10 @@ compose.desktop {
             macOS {
                 iconFile.set(iconsRoot.resolve("icon.icns"))
 
+                packageName = "FeedFlow"
                 bundleID = "com.prof18.feedflow"
 
-                entitlementsFile.set(project.file("default.entitlements")) // <----------- this line
+                entitlementsFile.set(project.file("default.entitlements"))
 
                 signing {
                     sign.set(true)
@@ -89,3 +90,23 @@ compose.desktop {
         }
     }
 }
+
+fun getVersionCode(): Int {
+    val outputStream = org.apache.commons.io.output.ByteArrayOutputStream()
+    project.exec {
+        commandLine = "git rev-list HEAD --first-parent --count".split(" ")
+        standardOutput = outputStream
+    }
+    return outputStream.toString().trim().toInt()
+}
+
+fun getVersionName(): String {
+    val outputStream = org.apache.commons.io.output.ByteArrayOutputStream()
+    project.exec {
+        commandLine = listOf("git", "describe", "--tags", "--abbrev=0", "--match", "*-desktop")
+        standardOutput = outputStream
+    }
+    return outputStream.toString()
+        .trim()
+        .replace("-desktop", "")
+}

release.sh

@@ -0,0 +1,14 @@
+./gradlew desktopTest
+
+# ./gradlew packageDmg
+
+tag=$(git describe --tags --abbrev=0 --match *-desktop)
+version=$(echo "$tag" | sed 's/-desktop$//')
+name="FeedFlow-${version}.dmg"
+
+path="desktopApp/build/release/main/dmg/${name}"
+
+#xcrun notarytool submit ${path} --apple-id mgp.dev.studio@gmail.com --password @keychain:NOTARIZATION_PASSWORD  --wait
+
+#xcrun stapler staple $path
+gh release create $tag $path