diff --git a/android/project.clj b/android/project.clj index fe921870..3c755529 100644 --- a/android/project.clj +++ b/android/project.clj @@ -1,15 +1,18 @@ -(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] - [com.badlogicgames.gdx/gdx-backend-lwjgl "1.5.3"] - [com.badlogicgames.gdx/gdx-box2d "1.5.3"] - [com.badlogicgames.gdx/gdx-tools "1.5.3"] + :dependencies [[com.badlogicgames.gdx/gdx "1.9.3" :use-resources true] + [com.badlogicgames.gdx/gdx-backend-lwjgl "1.9.3"] + [com.badlogicgames.gdx/gdx-box2d "1.9.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"] @@ -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" diff --git a/desktop/src-common/advent/utils.clj b/desktop/src-common/advent/utils.clj index 6f95a253..1ae288d5 100644 --- a/desktop/src-common/advent/utils.clj +++ b/desktop/src-common/advent/utils.clj @@ -556,7 +556,7 @@ :volume-fn volume-fn :type type :ends-at (if (= type :once) - (+ (:total-time screen) (sound! snd :duration)) + (+ (:total-time screen) 1.0 #_(sound! snd :duration)) nil)})))) (defn stop-all-sounds! [entities]