updates for releases.

desktop/build-app-store.sh

@@ -1,15 +1,15 @@
-/Library/Java/JavaVirtualMachines/jdk1.8.0_112.jdk/Contents/Home/bin/javapackager -deploy \
+/Library/Java/JavaVirtualMachines/jdk-10.0.1.jdk/Contents/Home/bin/javapackager -deploy \
 -native  \
 -name "Tick's Tales" \
 -outdir "./target/appstore/" -outfile "Tick's Tales" \
--srcdir . \
+-srcdir ./target \
--srcfiles target/advent-standalone.jar \
+-srcfiles advent-standalone.jar \
 -appclass advent.core.desktop_launcher \
--BappVersion=1.1.`cat last-release` \
+-BappVersion=2.0.`cat last-release` \
 -Bicon=./icons.icns \
 -BclassPath=advent-standalone.jar \
 -BjvmOptions=-Dapp-store=true \
--BmainJar=./target/advent-standalone.jar \
+-BmainJar=advent-standalone.jar \
 -Bmac.category=public.app-category.games \
 -Bmac.CFBundleIdentifier=com.tickstales.upallknight \
 -Bmac.CFBundleName="Tick's Tales" \

desktop/build-linux-64.json

@@ -1,10 +1,11 @@
 {
     "platform": "linux64",
-    "jdk": "/Users/brycecovert/dev/jvms/openjdk-1.7.0-u80-unofficial-linux-amd64-image.zip",
+    "vmargs": ["-Dui_scale=1.0"],
+    "jdk": "./jvms/jdk-8u232-ojdkbuild-linux-x64.zip",
     "executable": "Tick's Tales", 
-    "appjar": "target/advent-standalone.jar",
+    "classpath": ["target/advent-standalone.jar"],
-    "mainclass": "advent/core/desktop_launcher",
+    "mainclass": "advent.core.desktop_launcher",
-    "resources": ["resources/icon", "steam_appid.txt" ],
+    "resources": ["steam_appid.txt"],
     "minimizejre": "soft",
-    "outdir": "target/linux/amd64"
+    "output": "target/linux/amd64"
 }

desktop/build-osx-mobilesim.json

@@ -1,12 +0,0 @@
-{
-    "platform": "mac",
-    "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_112.jre/Contents/jre.zip",
-    "executable": "Tick's Tales", 
-    "vmargs": ["-Dui_scale=1.5"],
-    "classpath": ["target/advent-standalone.jar"],
-    "mainclass": "advent.core.desktop_launcher",
-    "resources": ["resources/icon", "steam_appid.txt"],
-    "minimizejre": "oraclejre8",
-    "output": "target/osx-mobilesim/Tick's Tales.app",
-    "bundleidentifier": "com.tickstales.upallknight"
-}

desktop/build-windows-mobilesim.json

@@ -1,11 +0,0 @@
-{
-    "platform": "windows64",
-    "jdk": "/Users/brycecovert/Downloads/openjdk-1.7.0-u80-unofficial-windows-amd64-image.zip",
-    "executable": "TicksTales",
-    "classpath": ["target/advent-standalone.jar"],
-    "vmargs": ["-Dui_scale=1.5"],
-    "mainclass": "advent.core.desktop_launcher",
-    "resources": ["steam_appid.txt"],
-    "minimizejre": "soft",
-    "output": "target/windows-mobilesim/"
-}

desktop/build-windows.json

@@ -1,7 +1,7 @@
 {
     "platform": "windows64",
     "vmargs": ["-Dui_scale=1.0"],
-    "jdk": "/Users/brycecovert/Downloads/openjdk-1.7.0-u80-unofficial-windows-amd64-image.zip",
+    "jdk": "./jvms/java-1.8.0-openjdk-1.8.0.111-3.b15.ojdkbuild.windows.x86_64.zip",
     "executable": "TicksTales",
     "mainclass": "advent.core.desktop_launcher",
     "resources": ["steam_appid.txt"],

desktop/build-zip.sh

@@ -2,19 +2,13 @@
 
 pushd .
 cd target
-# cp -r "/Users/brycecovert/Music/Tick's Tales OST" linux/OST
+cp -r "../OST" linux/OST
-# cp -r "/Users/brycecovert/Music/Tick's Tales OST" osx/OST
+cp -r "../OST" osx/OST
-# cp -r "/Users/brycecovert/Music/Tick's Tales OST" windows/OST
+cp -r "../OST" windows/OST
 mv osx "Tick's Tales - OS X"
-mv osx-mobilesim "Tick's Tales - OS X - Mobile Sim"
 mv linux "Tick's Tales - Linux"
 mv windows "Tick's Tales - Windows"
-mv windows-mobilesim "Tick's Tales - Windows - Mobile Sim"
 zip -r linux-2.0.`cat ../last-release`.zip  "Tick's Tales - Linux"
 zip -r osx-2.0.`cat ../last-release`.zip "Tick's Tales - OS X"
-zip -r osx-mobilesim-2.0.`cat ../last-release`.zip "Tick's Tales - OS X - Mobile Sim"
 zip -r windows-2.0.`cat ../last-release`.zip  "Tick's Tales - Windows"
-zip -r windows-mobilesim-2.0.`cat ../last-release`.zip  "Tick's Tales - Windows - Mobile Sim"
 popd
-rm ~/Dropbox/TicksTalesBuilds/*.zip
-cp target/*.zip ~/Dropbox/TicksTalesBuilds/

desktop/last-release

@@ -1 +1 @@
-11
+16

desktop/project.clj

@@ -1,4 +1,4 @@
-(def version (str "2.0." (clojure.string/trim-newline (slurp "last-release")) "-snapshot"))
+(def version (str "2.0." (clojure.string/trim-newline (slurp "last-release"))))
 (def packs (into ["do"]
                  (mapcat (fn [directory]
                            ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")])
@@ -11,7 +11,7 @@
 ;; cat-tree/           ending-castle/      inside-antique/     inside-house/       left.pxa/           outside-jail/       safe-song.pxa/      space/
 
 
-(defproject advent "2.0.5-SNAPSHOT"
+(defproject advent version
   :description "FIXME: write description"
   :manifest {"Implementation-Version" ~version}
 

desktop/release-non-steam.sh

@@ -1,11 +1,7 @@
 #!/bin/bash
-lein do clean, compile, uberjar
+LEIN_SNAPSHOTS_IN_RELEASE=true lein do clean, compile, uberjar
 java -jar packr.jar build-windows.json
-java -jar packr.jar build-windows-mobilesim.json
 java -jar packr.jar build-osx.json
-java -jar packr.jar build-osx-mobilesim.json
+java -jar packr.jar build-linux-64.json
-# java -jar packr.jar build-linux-32.json
-# java -jar packr.jar build-linux-64.json
 cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/
-cp icons.icns target/osx-mobilesim/Tick\'s\ Tales.app/Contents/Resources/
 

desktop/release.sh

@@ -1,10 +1,9 @@
 #!/bin/bash
-#gawk -i inplace '  { print $1+1; } ' last-release
+gawk -i inplace '  { print $1+1; } ' last-release
-#git tag -a v1.2.`cat last-release` -m "tagging version 1.2.`cat last-release`"
+git tag -a v2.0.`cat last-release` -m "tagging version 2.0.`cat last-release`"
 lein with-profile steam do clean, compile, uberjar
 java -jar packr.jar build-windows.json
 java -jar packr.jar build-osx.json
-java -jar packr.jar build-linux-32.json
 java -jar packr.jar build-linux-64.json
 cp icons.icns target/osx/Tick\'s\ Tales.app/Contents/Resources/
 read -p "Steam pass: " STEAM_PASS

desktop/setup.md

@@ -0,0 +1,12 @@
+ln -s ~/dev/jvms jvms
+
+
+# Determine which keys you can sign with
+You may need to request new keys here:
+https://appstoreconnect.apple.com/WebObjects/iTunesConnect.woa/ra/ng/app/1112657898
+
+```
+security find-identity -v -p codesigning
+```
+
+