Permalink
Browse files

Move :aot option into :android map

  • Loading branch information...
alexander-yakushev committed Sep 12, 2012
1 parent b263ca5 commit 2d4c4eec1b26877dc6bff3de99f3b8ca0a8cd5aa
Showing with 12 additions and 13 deletions.
  1. +5 −6 res/templates/project.clj
  2. +6 −6 sample/project.clj
  3. +1 −1 src/leiningen/droid/compile.clj
View
@@ -13,22 +13,21 @@
;; target-path is "target", but you can change it to whatever you like.
;; :target-path "bin"
;; :compile-path "bin/classes"
- :aot :all-with-unused ;; This one is necessary, please keep it
- :aot-exclude-ns ["clojure.parallel"]
:dependencies [[android/clojure "1.4.0"]
[neko/neko "2.0.0-beta1"]]
- :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]]}
+ :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]]
+ :android {:aot :all-with-unused}}
: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}}}
: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/"
- :target-version "{{target-sdk}}"})
+ :target-version "{{target-sdk}}"
+ :aot-exclude-ns ["clojure.parallel"]})
View
@@ -13,19 +13,17 @@
;; target-path is "target", but you can change it to whatever you like.
;; :target-path "bin"
;; :compile-path "bin/classes"
- :aot :all-with-unused ;; This one is necessary, please keep it
- :aot-exclude-ns ["clojure.parallel"]
:dependencies [[android/clojure "1.4.0"]
[neko/neko "2.0.0-beta1"]]
- :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]]}
+ :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]]
+ :android {:aot :all-with-unused}}
: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}}}
:android {;; Specify the path to the Android SDK directory either
;; here or in your ~/.lein/profiles.clj file.
@@ -36,4 +34,6 @@
;; Use this property to add project dependencies.
;; :project-dependencies [ "/path/to/library/project" ]
- :target-version "10"})
+ :target-version "10"
+ :aot-exclude-ns ["clojure.parallel"]
+ })
@@ -62,7 +62,7 @@
(defn namespaces-to-compile
"Takes project and returns a set of namespaces that should be AOT-compiled."
- [{:keys [aot aot-exclude-ns] :as project}]
+ [{{:keys [aot aot-exclude-ns]} :android :as project}]
(-> (case aot
:all
(seq (leiningen.compile/stale-namespaces project))

0 comments on commit 2d4c4ee

Please sign in to comment.