Directly upload Mac / Windows executables.

.github/workflows/build.yml

@@ -34,18 +34,14 @@ jobs:
           ORG_GRADLE_PROJECT_commit: ${{ github.sha }}
         run: ./gradlew --no-daemon jpackage
 
-      - name: Zip binaries
-        uses: thedoctor0/zip-release@master
-        with:
-          type: 'zip'
-          filename: '${{runner.os}}.zip'
-          directory: 'build/releases/'
-
-      - name: Upload zipballs
+      - name: Upload binaries
         uses: actions/upload-artifact@v2
         with:
           name: releases
-          path: build/releases/*.zip
+          path: |
+            build/releases/*.deb
+            build/releases/*.exe
+            build/releases/*.dmg
 
   jar:
     if: github.repository == 'kolmafia/kolmafia'
@@ -104,7 +100,9 @@ jobs:
         with:
           files: |
             dist/*.jar
-            releases/*.zip
+            releases/*.deb
+            releases/*.exe
+            releases/*.dmg
           tag_name: r${{ env.KOLMAFIA_VERSION }}
           name: ${{ env.KOLMAFIA_VERSION }}
         env:

build.gradle

@@ -9,7 +9,7 @@ plugins {
 	id 'com.github.johnrengelman.shadow' version '6.0.0'
 	id 'net.nemerosa.versioning' version '2.8.2'
 	id 'org.ajoberstar.grgit' version '4.1.0'
-	id "org.panteleyev.jpackageplugin" version "1.3.1"
+	id 'org.panteleyev.jpackageplugin' version '1.3.1'
 }
 mainClassName = 'net.sourceforge.kolmafia.KoLmafia'
 
@@ -178,7 +178,7 @@ jar {
 	}
 	duplicatesStrategy = 'exclude'
 	destinationDirectory = file('dist/')
-	archiveBaseName.set("KoLmafia")
+	archiveBaseName.set('KoLmafia')
 	archiveClassifier.set("${versioning.info.dirty ? 'M' : ''}")
 }
 
@@ -192,7 +192,7 @@ task getRevision() {
 	onlyIf {
 		file('.git').exists()
 	}
-	def commit = findProperty("commit") ?: 'origin/main'
+	def commit = findProperty('commit') ?: 'origin/main'
 	inputs.dir('.git')
 	inputs.property('commit', commit)
 	outputs.files file('build/revision.txt')
@@ -217,15 +217,15 @@ task gitUpdate() {
 			remote = remote
 		}
 		if (grgit.resolve.toCommit(remote) == latestHead) {
-			println "Already up-to-date, nothing to do."
+			println 'Already up-to-date, nothing to do.'
 			return
 		}
 		def dirty = versioning.info.dirty
 		if (dirty) {
 			// This pollutes the reflog, but there's no stash functionality in
 			// grgit...
 			grgit.commit {
-				message = "temporary stash commit"
+				message = 'temporary stash commit'
 				all = true
 			}
 		}
@@ -262,20 +262,52 @@ tasks.jpackage {
 	input = 'dist'
 	destination = 'build/releases'
 	mainClass = mainClassName
-	appVersion = new Date().format("yy.MM")
+	appVersion = new Date().format('yy.MM')
 	linux {
-		type = 'APP_IMAGE'
+		icon = 'util/linux/KoLmafia.ico'
 	}
 	mac {
-		type = 'pkg'
+		type = 'dmg'
 		icon = 'util/macosx/limeglass.icns'
+
 	}
 	windows{
 		type = 'exe'
-		icon = 'util/windows/KoLmelion.ico'
+		icon = 'util/windows/KoLmafia.ico'
+		winShortcut = 'true'
+		winDirChooser = 'true'
+		javaOptions = ["-DuseCWDasROOT=true"]
 	}
 	doFirst {
 		mainJar = tasks.shadowJar.archiveFileName.get()
+		appVersion += '.' + version
+		appName = 'KoLmafia-r' + version + "${versioning.info.dirty ? 'M' : ''}"
+		println 'Packaging app ' + appName + '...'
+		if (System.properties['os.name'] != 'Linux') {
+			return
+		}
+		def hasDeb = exec {
+			ignoreExitValue = true
+			errorOutput = OutputStream.nullOutputStream()
+			executable 'bash'
+			args '-c', 'which dpkg-deb'
+		}
+		def hasRpm = exec {
+			ignoreExitValue = true
+			errorOutput = OutputStream.nullOutputStream()
+			executable 'bash'
+			args '-c', 'which rpmbuild'
+		}
+		if (hasDeb.getExitValue() == 0) {
+			println 'Targeting deb for jpackage...'
+			linux { type = 'deb' }
+		} else if (hasRpm.getExitValue() == 0) {
+			println 'Targeting rpm for jpackage...'
+			linux { type = 'rpm' }
+		} else {
+			println 'Bundling all files for jpackage.'
+			linux { type = 'app-image' }
+		}
 	}
 }
 
@@ -290,7 +322,7 @@ jacocoTestReport.dependsOn test
 
 def lastRevision() {
 	def revisionFile = file('build/revision.txt')
-	return revisionFile.exists() ? revisionFile.text.trim() : "0"
+	return revisionFile.exists() ? revisionFile.text.trim() : '0'
 }
 
 // Set version from last build/revision.txt if up-to-date

gradle.properties

@@ -6,5 +6,5 @@ org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAME
   --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 
-javaSourceCompatibility=9
-javaTargetCompatibility=9
+javaSourceCompatibility=11
+javaTargetCompatibility=11