diff --git a/android/project.clj b/android/project.clj index cc12cd70..ce7ec6db 100644 --- a/android/project.clj +++ b/android/project.clj @@ -28,8 +28,8 @@ [play-clj "0.4.6-BRYCE" :exclusions [org.clojure/clojure]] [org.clojure/data.priority-map "0.0.5"] - [org.clojure/core.async "0.2.371" :exclusions [org.clojure/clojure]]] - :plugins [[lein-droid "0.4.6" :exclusions [org.clojure/clojure] ]] + #_[org.clojure/core.asyc "0.6.532" :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"]] @@ -58,7 +58,7 @@ :android {;; Specify the path to the Android SDK directory either ;; here or in your ~/.lein/profiles.clj file. - :sdk-path "/Users/brycecovert/dev/advent/android/sdk" + :sdk-path "/Users/bryce/dev/advent/android/sdk" ;; Uncomment this if dexer fails with OutOfMemoryException #_#_:force-dex-optimize true diff --git a/desktop/build-osx.json b/desktop/build-osx.json index 67ca9bc2..51d25ecb 100644 --- a/desktop/build-osx.json +++ b/desktop/build-osx.json @@ -1,8 +1,8 @@ { "platform": "mac", - "jdk": "/Users/brycecovert/dev/jvms/jre1.8.0_112.jre/Contents/jre.zip", + "jdk": "/Users/bryce/Documents/jdk8u202-b08/Contents/Home/", "executable": "Tick's Tales", - "vmargs": ["-Dui_scale=1.0"], + "vmargs": ["-Duse-repl=false", "-Dui_scale=1.0", "-Dno-steam=true", "-Dclojure.compiler.direct-linking=true", "-Dis-desktop=true", "-Dplatform=desktop"], "classpath": ["target/advent-standalone.jar"], "mainclass": "advent.core.desktop_launcher", "resources": ["resources/icon", "steam_appid.txt"], diff --git a/desktop/src-common/advent/iap.clj b/desktop/src-common/advent/iap.clj index 069d8fa6..4abcc9bd 100644 --- a/desktop/src-common/advent/iap.clj +++ b/desktop/src-common/advent/iap.clj @@ -22,7 +22,7 @@ false))) (defn use-pref [] - (swap! has-purchased? #(or % (check-purchase-pref))) + (swap! has-purchased? #(or % (check-purchase-pref) (= "desktop" (System/getProperty "platform")))) (println "preferences purchased:" @has-purchased?)) (defn start-purchase [] diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 7a585cd4..67f6aac0 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -17,17 +17,21 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.0.11 + 2.0.12 CFBundleSignature ???? CFBundleVersion - 135 + 136 CFBundleIconName AppIcon MinimumOSVersion 8.0 LSRequiresIPhoneOS + UIRequiredDeviceCapabilities + + arm64 + UIDeviceFamily 1 diff --git a/ios/build-release.sh b/ios/build-release.sh index d36a61a3..a7aa0bc2 100755 --- a/ios/build-release.sh +++ b/ios/build-release.sh @@ -1 +1 @@ -lein do javac, compile && ~/.robovm-sdks/robovm-2.3.3/bin/robovm -verbose -cp `lein cp` -config robovm.xml -provisioningprofile "Bryce TT app store 2" -cache tmp/my-cache -tmp tmp/tmp-dir -rvm:ms64M -signidentity "/iPhone Distribution/" -createipa +lein do javac, compile && ~/Desktop/Advent\ from\ backup/robovm-sdks/.robovm-sdks/robovm-2.3.3/bin/robovm -verbose -cp `lein cp` -config robovm.xml -provisioningprofile "TicksTales test" -cache tmp/my-cache -tmp tmp/tmp-dir -rvm:ms64M -signidentity "/iPhone Distribution/" -createipa -ipaarchs arm64 diff --git a/ios/project.clj b/ios/project.clj index 8936b674..82383acb 100644 --- a/ios/project.clj +++ b/ios/project.clj @@ -19,7 +19,7 @@ :jvm-opts ["-Dno-steam=true" "-Dclojure.compiler.direct-linking=true" "-Dclojure.compiler.elide-meta=[:doc :file :line :added]" "-Dplatform=ios"] :ios {:robovm-opts ["-config" "robovm.xml"] - :robovm-path "/Users/brycecovert/.robovm-sdks/robovm-2.3.0" + :robovm-path "/Users/bryce/Desktop/Advent from backup/robovm-sdks/.robovm-sdks/robovm-2.3.0" :version 2.1} :aot :all :main advent.core.IOSLauncher)