Use new reader conditionals and remove cljx deps

README.md

@@ -26,7 +26,6 @@ $ chmod a+x ~/bin/lein
 Build
 -------
 <pre>
-$ lein cljx
 $ lein cljsbuild once dev
 </pre>
 

project.clj

@@ -3,8 +3,7 @@
   :url "http://example.com/FIXME"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [
-                 [org.clojure/clojure "1.7.0-RC1"]
+  :dependencies [[org.clojure/clojure "1.7.0"]
                  [org.clojure/clojurescript "0.0-3308"]
                  [org.clojure/core.async "0.1.346.0-17112a-alpha"]
                  [om "0.7.3"]
@@ -18,29 +17,25 @@
                  [cljs-uuid "0.0.4"]
                  [com.cognitect/transit-clj "0.8.275"]
                  [com.cognitect/transit-cljs "0.8.220"]]
-  :aliases {"cljx" ["with-profile" "cljx" "cljx"]}
+  :profiles {:uberjar {:aot :all}
+             :dev {:source-paths ["dev"]
+                   :dependencies [[org.clojure/tools.namespace "0.2.10"]
+                                  [org.clojure/java.classpath "0.2.2"]]}}
   :min-lein-version "2.1.2"
   :plugins [[lein-cljsbuild "1.0.3"]
-            [lein-ring "0.8.6"]
-            [com.keminglabs/cljx "0.4.0"]]
-  :cljsbuild {:builds {:dev {:source-paths ["src/cljs" "target/generated/cljs"]
+            [lein-ring "0.8.6"]]
+  :cljsbuild {:builds {:dev {:source-paths ["src/cljs" "src/cljc" "target/generated/cljs"]
                              :compiler {:output-dir "resources/public/js/out"
                                         :output-to "resources/public/js/grub.js"
                                         :optimizations :none
                                         :source-map true}}
-                       :prod {:source-paths ["src/cljs" "target/generated/cljs"]
+                       :prod {:source-paths ["src/cljs" "src/cljc" "target/generated/cljs"]
                               :compiler {:output-to "resources/public/js/grub.min.js"
                                          :optimizations :advanced
                                          :pretty-print false
                                          :preamble ["react/react.min.js"]
                                          :externs ["react/externs/react.js"]}}}}
-  :cljx {:builds [{:source-paths ["src/cljx"]
-                   :output-path "target/classes"
-                   :rules :clj}
-                  {:source-paths ["src/cljx"]
-                   :output-path "target/generated/cljs"
-                   :rules :cljs}]}
-  :source-paths ["src/clj" "target/classes"]
+  :source-paths ["src/clj" "src/cljc" "target/classes"]
   :test-paths ["src/test"]
   :ring {:handler grub.core/app}
   :uberjar-name "grub-standalone.jar"

src/clj/grub/db.clj

@@ -1,8 +1,14 @@
 (ns grub.db
-  (:require [monger.core :as m]
+  (:require [datomic.api :as d :refer [q db]]
+            clojure.pprint
+            [monger.core :as m]
             [monger.collection :as mc]
             [clojure.core.async :as a :refer [<! >! chan go]]))
 
+;(def uri "datomic:mem://seattle")
+;(d/create-database uri)
+
+
 (def collection "grub-lists")
 
 (defn clear-all [db]

src/cljc/grub/sync.cljc

@@ -1,10 +1,10 @@
 (ns grub.sync
   (:require [grub.diff :as diff]
             [grub.state :as state]
-            #+clj [clojure.core.async :as a :refer [<! >! chan go]]
-            #+cljs [cljs.core.async :as a :refer [<! >! chan]])
-  #+cljs (:require-macros [grub.macros :refer [log logs]]
-                          [cljs.core.async.macros :refer [go]]))
+            #?(:clj [clojure.core.async :as a :refer [<! >! chan go]]
+               :cljs [cljs.core.async :as a :refer [<! >! chan]]))
+  #?(:cljs (:require-macros [grub.macros :refer [log logs]]
+                          [cljs.core.async.macros :refer [go]])))
 
 (def full-sync-request {:type :full-sync-request})
 
@@ -69,8 +69,8 @@
                    (assoc latest-state :tag (inc (:tag shadow))))}))
 
 (defmethod handle-event :default [msg]
-  #+cljs (logs "Unhandled message:" msg)
-  #+clj (println "Unhandled message:" msg)
+  #?(:cljs (logs "Unhandled message:" msg)
+     :clj (println "Unhandled message:" msg))
   {})
 
 (defn make-server-agent
@@ -127,12 +127,12 @@
                          {:keys [new-shadow out-event]} (handle-event event)]
                      (recur (if new-shadow new-shadow shadow) out-event))))))))
 
-#+cljs
-(defn sync-client! [>remote events new-states states]
-  (let [new-states* (chan (a/sliding-buffer 1))]
-    (go (loop []
-          (let [v (<! new-states)]
-            (>! new-states* v)
-            (recur))))
-    (make-client-agent >remote events new-states* states)
-    (a/put! >remote full-sync-request)))
+#?(:cljs
+   (defn sync-client! [>remote events new-states states]
+         (let [new-states* (chan (a/sliding-buffer 1))]
+              (go (loop []
+                        (let [v (<! new-states)]
+                             (>! new-states* v)
+                             (recur))))
+              (make-client-agent >remote events new-states* states)
+              (a/put! >remote full-sync-request))))