merged.

android/project.clj

@@ -1,21 +1,24 @@
-(defproject advent "0.0.1-SNAPSHOT"
+(defproject advent "1.3.1-SNAPSHOT"
   :description "FIXME: write description"
   
-  :dependencies [[com.badlogicgames.gdx/gdx "1.5.3"  :use-resources true]
+  :dependencies [[com.badlogicgames.gdx/gdx "1.9.3"  :use-resources true]
-                 [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.3"]
+                 [com.badlogicgames.gdx/gdx-backend-lwjgl "1.9.3"]
-                 [com.badlogicgames.gdx/gdx-box2d "1.5.3"]
+                 [com.badlogicgames.gdx/gdx-box2d "1.9.3"]
-                 [com.badlogicgames.gdx/gdx-tools "1.5.3"]
+                 [com.badlogicgames.gdx/gdx-tools "1.9.3"]
                 
                  
-                 [com.badlogicgames.gdx/gdx-backend-android "1.5.3"]
+                 [com.badlogicgames.gdx/gdx-backend-android "1.9.3"]
                  [neko/neko "4.0.0-alpha5"]
-                 [org.clojure-android/clojure "1.7.0-r2"]
+
+                 [org.clojure/tools.logging "0.3.1"]
+                 [org.clojure-android/clojure "1.7.0-r4"]
+                 [org.im4java/im4java "1.4.0"]
                  
                  [org.clojure/tools.nrepl "0.2.7"]
                  [play-clj "0.4.5-BRYCE"]
                  [org.clojure/data.priority-map "0.0.5"]
                  
-                 [org.clojure/core.async "0.1.346.0-17112a-alpha"]]
+                 [org.clojure/core.async "0.2.371"]]
   :plugins [[lein-droid "0.4.4-SNAPSHOT"]]
   
   
@@ -25,7 +28,7 @@
 
                              :rename-manifest-package "advent.core.debug"
                              :manifest-options {:app-name "ticks tales (debug)"}
-                             :aot-exclude-ns [cljs.core.async.macros cljs.core.impl-ioc-macros cljs.core.impl.ioc_macros]}}
+                             :aot-exclude-ns ["clojure.core.memoize" "core.async"]}}
              :release {:android
                        {;; Specify the path to your private
                         ;; keystore and the the alias of the
@@ -37,14 +40,14 @@
   
   :android {;; Specify the path to the Android SDK directory either
             ;; here or in your ~/.lein/profiles.clj file.
-            :sdk-path "/usr/local/Cellar/android-sdk/24.3.4/"
+            :sdk-path "/usr/local/Cellar/android-sdk/24.4.1_1/"
             
             ;; Uncomment this if dexer fails with OutOfMemoryException
             #_#_:force-dex-optimize true
             
             :assets-paths ["/Users/brycecovert/dev/advent/desktop/resources"]
             :native-libraries-paths ["libs"]
-            :target-version "15" ; 18+
+            :target-version "22" ; 18+
             :aot-exclude-ns ["clojure.parallel" "clojure.core.reducers"
                              "cider.nrepl" "cider-nrepl.plugin"
                              "cider.nrepl.middleware.util.java.parser"

desktop/.gitignore

@@ -8,3 +8,4 @@ screenshot*
 /content-builder/output/
 ticks_tales.log
 saves
+tmp

desktop/.lein-repl-history

@@ -0,0 +1 @@
+