From 2cfe77de08a8470d891c95a7b267991d9c535497 Mon Sep 17 00:00:00 2001 From: Bryce Covert Date: Fri, 11 Sep 2015 08:57:28 -0700 Subject: [PATCH] working on android. --- android/.gitignore | 4 +++ android/AndroidManifest.template.xml | 27 ++++++++++++++++++++ android/project.clj | 38 +++++++++++++++++++--------- 3 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 android/.gitignore create mode 100644 android/AndroidManifest.template.xml diff --git a/android/.gitignore b/android/.gitignore new file mode 100644 index 00000000..33cfd6c4 --- /dev/null +++ b/android/.gitignore @@ -0,0 +1,4 @@ +target +\#*# +checkouts +.nrepl-port diff --git a/android/AndroidManifest.template.xml b/android/AndroidManifest.template.xml new file mode 100644 index 00000000..8cac0f4b --- /dev/null +++ b/android/AndroidManifest.template.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/android/project.clj b/android/project.clj index f2eb7962..f8d50205 100644 --- a/android/project.clj +++ b/android/project.clj @@ -1,36 +1,50 @@ (defproject advent "0.0.1-SNAPSHOT" :description "FIXME: write description" - :dependencies [[com.badlogicgames.gdx/gdx "1.3.0" :use-resources true] + :dependencies [[com.badlogicgames.gdx/gdx "1.5.3"] + [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"] + + [com.badlogicgames.gdx/gdx-bullet "1.5.3"] + [com.badlogicgames.gdx/gdx-backend-android "1.3.0"] - [com.badlogicgames.gdx/gdx-box2d "1.3.0"] - [com.badlogicgames.gdx/gdx-bullet "1.3.0"] - [neko/neko "3.0.2"] - [org.clojure-android/clojure "1.6.0-RC1" :use-resources true] - [play-clj "0.3.9"]] + [neko/neko "3.2.0"] + [org.clojure-android/clojure "1.6.0-RC1"] + + [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"]] + :plugins [[lein-droid "0.4.3"]] + + :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"] [compliment "0.1.3"]] - :android {:aot :all-with-unused}} + :android {:aot :all + :aot-exclude-ns [cljs.core.async.macros cljs.core.impl-ioc-macros cljs.core.impl.ioc_macros]}} :release {:android {;; Specify the path to your private ;; keystore and the the alias of the ;; key you want to sign APKs with. ;; :keystore-path "/home/user/.android/private.keystore" ;; :key-alias "mykeyalias" - :aot :all}}} + :aot :all + :aot-exclude-ns [cljs.core.async.macros cljs.core.impl-ioc-macros cljs.core.impl.ioc_macros]}}} :android {;; Specify the path to the Android SDK directory either ;; here or in your ~/.lein/profiles.clj file. - ;; :sdk-path "/home/user/path/to/android-sdk/" + :sdk-path "/usr/local/Cellar/android-sdk/24.3.4/" ;; Uncomment this if dexer fails with OutOfMemoryException - ;; :force-dex-optimize true + :force-dex-optimize true :assets-path "../desktop/resources" :native-libraries-paths ["libs"] :target-version "15" - :aot-exclude-ns ["clojure.parallel" "clojure.core.reducers"] - :dex-opts ["-JXmx2048M"]} + :aot-exclude-ns ["clojure.parallel" "clojure.core.reducers" "cljs.core.async.macros" "cljs.core.impl-ioc-macros" "cljs.core.impl.ioc_macros"] + :dex-opts ["-JXmx8192M" "--no-locals" "--multi-dex"]} :source-paths ["src/clojure" "../desktop/src-common"] :java-source-paths ["src/java" "gen"]