Jeet

.github/workflows/build.yml

@@ -48,7 +48,7 @@ jobs:
         ]
         os: [ubuntu-22.04]
     runs-on: ${{ matrix.os }}
-    name: Build on ${{ matrix.os }} (DEB)
+    name: Build on ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -78,7 +78,7 @@ jobs:
         ]
         os: [macOS-11]
     runs-on: ${{ matrix.os }}
-    name: Build on ${{ matrix.os }} (APP)
+    name: Build on ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -108,7 +108,7 @@ jobs:
         ]
         os: [windows-2022]
     runs-on: ${{ matrix.os }}
-    name: Build on ${{ matrix.os }} (EXE)
+    name: Build on ${{ matrix.os }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -127,7 +127,7 @@ jobs:
         with:
           name: Bubble Blaster Windows Build ${{ github.run_number }} (EXE)
           path: desktop-merge/build/dist
-  build-linux-alt:
+  build-linux-appimage:
     strategy:
       matrix:
         # Use these Java versions
@@ -157,7 +157,7 @@ jobs:
         with:
           name: Bubble Blaster Linux Build ${{ github.run_number }} (PORTABLE)
           path: desktop-merge/build/dist
-  build-macos-alt:
+  build-macos-appimage:
     strategy:
       matrix:
         # Use these Java versions
@@ -166,7 +166,7 @@ jobs:
         ]
         os: [macOS-11]
     runs-on: ${{ matrix.os }}
-    name: Build on ${{ matrix.os }} (PKG)
+    name: Build on ${{ matrix.os }} (PORTABLE)
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -187,7 +187,7 @@ jobs:
         with:
           name: Bubble Blaster MacOS Build ${{ github.run_number }} (PKG)
           path: desktop-merge/build/dist
-  build-windows-msi:
+  build-windows-appimage:
     strategy:
       matrix:
         # Use these Java versions
@@ -196,7 +196,7 @@ jobs:
         ]
         os: [windows-2022]
     runs-on: ${{ matrix.os }}
-    name: Build on ${{ matrix.os }} (MSI)
+    name: Build on ${{ matrix.os }} (PORTABLE)
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2

build.gradle

@@ -3,6 +3,7 @@
 
 import dev.ultreon.gameutils.GameUtilsExt
 import org.jetbrains.gradle.ext.Application
+import org.mini2Dx.butler.task.PushTask
 
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -30,6 +31,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath group: 'org.mini2Dx', name: 'butler', version: '2.1.0'
     }
 }
 
@@ -44,6 +46,7 @@ plugins {
 //    id 'com.github.johnrengelman.shadow' version '7.+'
 }
 apply plugin: "org.jetbrains.gradle.plugin.idea-ext"
+apply plugin: "org.mini2Dx.butler"
 apply plugin: "gameutils"
 
 //apply plugin: 'maven-publish'
@@ -340,4 +343,33 @@ publishing {
             }
         }
     }
-}
+}
+
+butler {
+    user = "xypercode"
+    game = "bubble-blaster"
+    updateButler = true
+    allChannelsPostfix = "-beta"
+}
+
+tasks.register('butlerPushWindows', PushTask) {
+    dependsOn build, ":desktop-merge:jpackage"
+    binDirectory = file("$projectDir/desktop-merge/build/bin/windows")
+    channel = "windows"
+}
+
+tasks.register('butlerPushLinux', PushTask) {
+    dependsOn build, ":desktop-merge:jpackage"
+    binDirectory = file("$projectDir/desktop-merge/build/bin/linux")
+    channel = "linux"
+}
+
+tasks.register('butlerPushMac', PushTask) {
+    dependsOn build, ":desktop-merge:jpackage"
+    binDirectory = file("$projectDir/desktop-merge/build/bin/mac")
+    channel = "mac"
+}
+
+tasks.register('butlerPushAll') {
+    dependsOn butlerPushWindows, butlerPushLinux, butlerPushMac
+}

desktop-merge/build.gradle

@@ -311,6 +311,7 @@ jpackage {
         winConsole = false
         javaOptions = javaOptions + ["-Dbubbles.packageFormat=exe"]
         appVersion = (project.version).toString().replaceAll("-cb\\.\\d+", "").replace("+", ".")
+        type = ImageType.MSI
     }
 }
 
@@ -333,45 +334,31 @@ tasks.register('jpackageAlt', JPackageTask) {
 
     destination = "$buildDir/dist"
 
-    licenseFile = "$rootProject.projectDir/package/LICENSE.txt"
-
     javaOptions = vmArgs
     arguments = ["--packaged"]
 
-    aboutUrl = "https://github.com/Ultreon/bubble-blaster"
-
     mac {
         icon = "$rootProject.projectDir/icons/icon.icns"
         macPackageIdentifier = project_id
         macPackageName = project_name
         appVersion = packageVersion
-        javaOptions = javaOptions + ["-XstartOnFirstThread", "-Dbubbles.packageFormat=pkg"]
-        type = ImageType.PKG
+        javaOptions = javaOptions + ["-XstartOnFirstThread", "-Dbubbles.packageFormat=appimage"]
+        type = ImageType.APP_IMAGE
     }
 
     linux {
         icon = "$rootProject.projectDir/icons/icon.png"
-        aboutUrl = null
-        licenseFile = null
         appVersion = project.version.toString()
         javaOptions = javaOptions + ["-Dbubbles.packageFormat=appimage"]
         type = ImageType.APP_IMAGE
     }
 
     windows {
         icon = "$rootProject.projectDir/icons/icon.ico"
-        winMenu = true
-        winDirChooser = true
-        winConsole = false
-        winPerUserInstall = true
-        winShortcutPrompt = true
-        winShortcut = false
-        winUpgradeUuid = "a539b496-ae50-4df2-9a1b-8a089e44f7ce"
-        winMenuGroup = "Ultreon Team"
         winConsole = false
         appVersion = (project.version).toString().replaceAll("-cb\\.\\d+", "").replace("+", ".")
-        javaOptions = javaOptions + ["-Dbubbles.packageFormat=msi"]
-        type = ImageType.MSI
+        javaOptions = javaOptions + ["-Dbubbles.packageFormat=appimage"]
+        type = ImageType.APP_IMAGE
     }
 }
 
@@ -394,4 +381,4 @@ publishing {
             }
         }
     }
-}
+}