Update template to use bullet and box2d extensions

template/project.clj

@@ -1,4 +1,4 @@
-(defproject play-clj/lein-template "0.2.4"
+(defproject play-clj/lein-template "0.3.0-SNAPSHOT"
   :description "A template for making play-clj projects"
   :url "https://github.com/oakes/play-clj"
   :license {:name "Public Domain"

template/src/leiningen/new/play_clj.clj

@@ -81,19 +81,41 @@
                 (lein-droid-render "splashscreen.xml")]
                ["android/src/java/{{path}}/SplashActivity.java"
                 (lein-droid-render "SplashActivity.java" data)]
+               ; android libgdx.so
                ["android/libs/armeabi/libgdx.so"
-                (-> (io/resource "armeabi-libgdx.so") io/input-stream)]
+                (-> (io/resource "armeabi/libgdx.so") io/input-stream)]
                ["android/libs/armeabi-v7a/libgdx.so"
-                (-> (io/resource "armeabi-v7a-libgdx.so") io/input-stream)]
+                (-> (io/resource "armeabi-v7a/libgdx.so") io/input-stream)]
                ["android/libs/x86/libgdx.so"
-                (-> (io/resource "x86-libgdx.so") io/input-stream)]
+                (-> (io/resource "x86/libgdx.so") io/input-stream)]
+               ; android libgdx-box2d.so
+               ["android/libs/armeabi/libgdx-box2d.so"
+                (-> (io/resource "armeabi/libgdx-box2d.so") io/input-stream)]
+               ["android/libs/armeabi-v7a/libgdx-box2d.so"
+                (-> (io/resource "armeabi-v7a/libgdx-box2d.so") io/input-stream)]
+               ["android/libs/x86/libgdx-box2d.so"
+                (-> (io/resource "x86/libgdx-box2d.so") io/input-stream)]
+               ; android libgdx-bullet.so
+               ["android/libs/armeabi/libgdx-bullet.so"
+                (-> (io/resource "armeabi/libgdx-bullet.so") io/input-stream)]
+               ["android/libs/armeabi-v7a/libgdx-bullet.so"
+                (-> (io/resource "armeabi-v7a/libgdx-bullet.so") io/input-stream)]
+               ["android/libs/x86/libgdx-bullet.so"
+                (-> (io/resource "x86/libgdx-bullet.so") io/input-stream)]
                ; ios
                ["ios/project.clj" (render "ios-project.clj" data)]
                ["ios/Info.plist.xml" (render "Info.plist.xml" data)]
                "ios/src/clojure"
                ["ios/src/java/{{ios-path}}.java"
                 (render "IOSLauncher.java" data)]
+               ; ios libObjectAL.a and libgdx.a
                ["ios/libs/libObjectAL.a"
-                (-> (io/resource "libObjectAL.a") io/input-stream)]
+                (-> (io/resource "ios/libObjectAL.a") io/input-stream)]
                ["ios/libs/libgdx.a"
-                (-> (io/resource "libgdx.a") io/input-stream)])))
+                (-> (io/resource "ios/libgdx.a") io/input-stream)]
+               ; ios libgdx-box2d.a
+               ["ios/libs/libgdx-box2d.a"
+                (-> (io/resource "ios/libgdx-box2d.a") io/input-stream)]
+               ; ios libgdx-bullet.a
+               ["ios/libs/libgdx-bullet.a"
+                (-> (io/resource "ios/libgdx-bullet.a") io/input-stream)])))

template/src/leiningen/new/play_clj/android-project.clj

@@ -4,7 +4,9 @@
   :dependencies [[com.badlogicgames.gdx/gdx "1.0" :use-resources true]
                  [com.badlogicgames.gdx/gdx-backend-android "1.0"]
                  [neko/neko "3.0.1"]
-                 [org.clojure-android/clojure "1.5.1-jb" :use-resources true]
+                 [com.badlogicgames.gdx/gdx-box2d "1.0"]
+                 [com.badlogicgames.gdx/gdx-bullet "1.0"]
+                 [org.clojure-android/clojure "1.6.0-RC1" :use-resources true]
                  [play-clj "0.3.0"]]
   :profiles {:dev {:dependencies [[android/tools.nrepl "0.2.0-bigstack"]
                                   [compliment "0.0.3"]]

template/src/leiningen/new/play_clj/desktop-project.clj

@@ -3,6 +3,12 @@
   
   :dependencies [[com.badlogicgames.gdx/gdx "1.0"]
                  [com.badlogicgames.gdx/gdx-backend-lwjgl "1.0"]
+                 [com.badlogicgames.gdx/gdx-box2d "1.0"]
+                 [com.badlogicgames.gdx/gdx-box2d-platform "1.0"
+                  :classifier "natives-desktop"]
+                 [com.badlogicgames.gdx/gdx-bullet "1.0"]
+                 [com.badlogicgames.gdx/gdx-bullet-platform "1.0"
+                  :classifier "natives-desktop"]
                  [com.badlogicgames.gdx/gdx-platform "1.0"
                   :classifier "natives-desktop"]
                  [org.clojure/clojure "1.6.0"]

template/src/leiningen/new/play_clj/ios-project.clj

@@ -2,13 +2,15 @@
   :description "FIXME: write description"
   :dependencies [[com.badlogicgames.gdx/gdx "1.0"]
                  [com.badlogicgames.gdx/gdx-backend-robovm "1.0"]
+                 [com.badlogicgames.gdx/gdx-box2d "1.0"]
+                 [com.badlogicgames.gdx/gdx-bullet "1.0"]
                  [org.clojure/clojure "1.6.0"]
                  [play-clj "0.3.0"]]
   :source-paths ["src/clojure" "../desktop/src-common"]
   :java-source-paths ["src/java"]
   :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"]
   :ios {:robovm-opts ["-forcelinkclasses" "{{package-prefix}}.**:clojure.**:com.badlogic.**:play_clj.**"
-                      "-libs" "libs/libObjectAL.a:libs/libgdx.a"
+                      "-libs" "libs/libObjectAL.a:libs/libgdx.a:libs/libgdx-box2d.a:libs/libgdx-bullet.a"
                       "-frameworks" "UIKit:OpenGLES:QuartzCore:CoreGraphics:OpenAL:AudioToolbox:AVFoundation"
                       "-resources" "../desktop/resources/**"]}
   :aot :all