diff --git a/android/AndroidManifest.template.xml b/android/AndroidManifest.template.xml index 35e2998e..e742633f 100644 --- a/android/AndroidManifest.template.xml +++ b/android/AndroidManifest.template.xml @@ -1,6 +1,6 @@ diff --git a/android/project.clj b/android/project.clj index ce7ec6db..09eceac6 100644 --- a/android/project.clj +++ b/android/project.clj @@ -1,5 +1,5 @@ (def version (str "2.0." (clojure.string/trim-newline (slurp "../desktop/last-release")) "-snapshot")) -(defproject tickstales version +(defproject advent.core version :description "FIXME: write description" :manifest {"Implementation-Version" version} @@ -7,7 +7,6 @@ [com.badlogicgames.gdx/gdx-backend-lwjgl "1.9.4"] [com.badlogicgames.gdx/gdx-box2d "1.9.4"] [com.badlogicgames.gdx/gdx-tools "1.9.4"] - [com.badlogicgames.gdx/gdx-backend-android "1.9.4"] [neko/neko "4.0.0-alpha5"] @@ -28,7 +27,7 @@ [play-clj "0.4.6-BRYCE" :exclusions [org.clojure/clojure]] [org.clojure/data.priority-map "0.0.5"] - #_[org.clojure/core.asyc "0.6.532" :exclusions [org.clojure/clojure]]] + [org.clojure/core.async "0.2.371" :exclusions [org.clojure/clojure]]] :plugins [[lein-droid "0.4.7-snapshot" :exclusions [org.clojure/clojure] ]] :repositories [["jCenter" "https://jcenter.bintray.com/"] ["google" "https://maven.google.com"]] @@ -40,7 +39,7 @@ :jvm-opts ["-Dplatform=android"] :android {:aot :all-with-unused - :rename-manifest-package "tickstales.core.debug" + :rename-manifest-package "advent.core.debug" :manifest-options {:app-name "ticks tales (debug)"} :aot-exclude-ns ["clojure.core.memoize" "core.async"]}} :release { @@ -49,8 +48,9 @@ {;; Specify the path to your private ;; keystore and the the alias of the ;; key you want to sign APKs with. - ;; :keystore-path "ticks-talkes-release.jks" - ;; :key-alias "ticks-tales-release" + :keystore-path "debug.keystore" + :key-alias "androiddebugkey" + :rename-manifest-package "advent.core" :build-type :release :aot :all-with-unused @@ -63,9 +63,9 @@ ;; Uncomment this if dexer fails with OutOfMemoryException #_#_:force-dex-optimize true - :assets-paths ["/Users/brycecovert/dev/advent/desktop/resources"] + :assets-paths ["../desktop/resources"] :native-libraries-paths ["libs"] - :target-version "24" ; 18+ + :target-version "28" ; 18+ :aot-exclude-ns ["clojure.parallel" "clojure.core.reducers" "cider.nrepl" "cider-nrepl.plugin" "cider.nrepl.middleware.util.java.parser" diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 6df3a6b4..d0085ff6 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,7 +1,7 @@ - advent + advent.core 891208148801 diff --git a/android/src/java/advent/core/SplashActivity.java b/android/src/java/advent/core/SplashActivity.java index a74e460c..3eaa5533 100644 --- a/android/src/java/advent/core/SplashActivity.java +++ b/android/src/java/advent/core/SplashActivity.java @@ -9,7 +9,7 @@ import android.widget.ImageView; import android.widget.TextView; import neko.App; -import tickstales.core.R; +import advent.core.R; public class SplashActivity extends Activity { diff --git a/desktop/release.sh b/desktop/release.sh index fb8bd52e..a7a3697c 100755 --- a/desktop/release.sh +++ b/desktop/release.sh @@ -1,6 +1,6 @@ #!/bin/bash -gawk -i inplace ' { print $1+1; } ' last-release -git tag -a v1.2.`cat last-release` -m "tagging version 1.2.`cat 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`" lein with-profile steam do clean, compile, uberjar java -jar packr.jar build-windows.json java -jar packr.jar build-osx.json diff --git a/ios/Entitlements.plist b/ios/Entitlements.plist index d9f38429..f44758d4 100644 --- a/ios/Entitlements.plist +++ b/ios/Entitlements.plist @@ -5,7 +5,7 @@ get-task-allow beta-reports-active - + application-identifier AVDPGBD777.com.digitalbouncehouse.tickstales keychain-access-groups diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index b8ab566e..76ef3c52 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 137 + 141 CFBundleIconName AppIcon MinimumOSVersion diff --git a/ios/build-debug.sh b/ios/build-debug.sh index be83f6de..1f057c1a 100755 --- a/ios/build-debug.sh +++ b/ios/build-debug.sh @@ -1 +1 @@ -lein do javac, compile && ~/dev/robovm-sdks/robovm-2.3.3/bin/robovm -verbose -cp `lein cp` -config robovm.xml -provisioningprofile "TicksTales Dev" -cache tmp/my-cache -tmp tmp/tmp-dir -rvm:ms64M -createipa -ipaarchs arm64 -debug +lein do javac, compile && ~/dev/robovm-sdks/.robovm-sdks/robovm-2.3.3/bin/robovm -verbose -cp `lein cp` -config robovm.xml -provisioningprofile "TicksTales Dev" -cache tmp/my-cache -tmp tmp/tmp-dir -rvm:ms64M -createipa -ipaarchs arm64 -debug diff --git a/ios/build-release.sh b/ios/build-release.sh index 691a6c12..0177ee26 100755 --- a/ios/build-release.sh +++ b/ios/build-release.sh @@ -1 +1 @@ -lein do javac, compile && ~/Desktop/Advent/robovm-sdks/.robovm-sdks/robovm-2.3.3/bin/robovm -verbose -cp `lein cp` -config robovm.xml -provisioningprofile "TicksTales Test2" -cache tmp/my-cache -tmp tmp/tmp-dir -rvm:ms64M -signidentity "/iPhone Distribution/" -createipa -ipaarchs arm64 -entitlements Entitlements.plist +lein do javac, compile && ~/dev/robovm-sdks/.robovm-sdks/robovm-2.3.3/bin/robovm -verbose -cp `lein cp` -config robovm.xml -provisioningprofile "TicksTales Test2" -cache tmp/my-cache -tmp tmp/tmp-dir -rvm:ms64M -signidentity "/iPhone Distribution/" -createipa -ipaarchs arm64 -entitlements Entitlements.plist