Update logo and conveyor configuration

dist/ci.conveyor.conf → conveyor/ci.conveyor.conf

@@ -11,4 +11,13 @@ app {
         team-id = 6MD7Z8H86K
         apple-id = "you@user.host"
     }
-}
+
+  vcs-url = "github.com/crschnick/pdxu_staging"
+  site {
+    # base-url = "localhost:3000"
+    github {
+      oauth-token = ${env.JRELEASER_GITHUB_TOKEN}
+      pages-branch = "gh-pages"
+    }
+  }
+}

dist/conveyor.conf → conveyor/conveyor.conf

@@ -4,11 +4,11 @@ app {
   fsname = "pdx-unlimiter"
   long-fsname = "pdx-unlimiter"
   vendor = "Pdx-Unlimiter"
-  version = "2.12.4"
+  version = ${env.VERSION}
   license = "GPL-3.0-or-later"
   contact-email = "crschnick@xpipe.io"
   machines = ["windows.amd64"]
-  icons = "../misc/logo.svg"
+  icons = "../misc/logo/logo.svg"
 
   url-schemes = [ pdxu ]
   file-associations = [ .eu4, .ck3, .sav, .v3, .v2, .ck2, .hoi4, .rome ]
@@ -18,14 +18,9 @@ app {
   mac.amd64.inputs = "../build/pdx_unlimiter-mac.zip"
 
   updates = aggressive
-
-  vcs-url = "github.com/crschnick/pdxu_staging"
+
   site {
-    # base-url = "localhost:3000"
-    github {
-      oauth-token = ${env.JRELEASER_GITHUB_TOKEN}
-      pages-branch = "gh-pages"
-    }
+    base-url = "localhost:3000"
   }
 }
 

gradle/build.gradle

@@ -9,6 +9,7 @@ version file('version').text
 def canonicalVersion = file('canonical_version').text
 
 apply from: "$rootDir/gradle/jreleaser.gradle"
+apply from: "$rootDir/gradle/conveyor.gradle"
 apply from: 'gradle/java.gradle'
 apply from: 'gradle/mods.gradle'
 
@@ -96,11 +97,11 @@ jlink {
         imageName = 'Pdx-Unlimiter'
         imageOptions += ['--verbose']
         if (DefaultNativePlatform.currentOperatingSystem.windows) {
-            icon = "misc/logo.ico"
+            icon = "misc/logo/logo.ico"
         } else if (DefaultNativePlatform.currentOperatingSystem.linux) {
-            icon = "misc/logo.png"
+            icon = "misc/logo/logo.png"
         } else {
-            icon = "misc/logo.icns"
+            icon = "misc/logo/logo.icns"
             imageOptions += [
                     '--mac-sign',
                     '--mac-package-signing-prefix', 'com.crschnick.pdxu',

gradle/conveyor.gradle

@@ -0,0 +1,11 @@
+def isCI = System.getenv("CI") != null
+version file('version').text
+def canonicalVersion = file('canonical_version').text
+def changelog = file("changelogs/${canonicalVersion}.txt").exists() ?
+        file("changelogs/${canonicalVersion}.txt").text.replace('\r\n', '\n') : ""
+
+tasks.register('conveyor', Exec) {
+    commandLine 'conveyor', "-f=conveyor/${isCI ? 'ci.conveyor.conf' : 'conveyor.conf'}", '--agree-to-license=1', 'make', '-o=build/conveyor', 'site'
+    environment("CHANGELOG", changelog)
+    environment("VERSION", version)
+}