Dependency re-organization (#40)

* Remove clj-uuid dependency

* Make dependency naming more consistent among sub-modules

* Remove explicit Clojure dependencies

* New dependency pattern; replace Kaocha with simpler test runners

* Add missing build.clj

Author: bobby

Makefile

@@ -42,11 +42,20 @@ ci:
 	$(MAKE) -C storage ci
 	$(MAKE) -C converge ci
 
+# Build
+
+.PHONY: clean
+clean:
+	$(MAKE) -C nippy clean
+	$(MAKE) -C transit clean
+	$(MAKE) -C storage clean
+	$(MAKE) -C converge clean
+
 # Project info
 
 .PHONY: loc
 loc:
-	$(MAKE) -C converge loc
-	$(MAKE) -C storage loc
 	$(MAKE) -C nippy loc
 	$(MAKE) -C transit loc
+	$(MAKE) -C storage loc
+	$(MAKE) -C converge loc

converge/Makefile

@@ -25,8 +25,6 @@ default: ci
 .PHONY: bootstrap
 bootstrap:
 	-brew install clojure tokei
-	wget "https://github.com/lambdaisland/funnel/releases/download/v0.1.42/funnel.darwin-amd64" -O bin/funnel
-	chmod +x bin/funnel
 
 .PHONY: outdated
 outdated:
@@ -65,28 +63,24 @@ cljs-dev: node_modules/.yarn-integrity shadow-start
 
 .PHONY: clj-test
 clj-test: clean
-	bin/kaocha unit-clj
-
-.PHONY: cljs-test-harness
-cljs-test-harness: shadow-start
-	bin/funnel
+	clojure -T:build test :aliases [:clj]
 
 .PHONY: cljs-test
 cljs-test: clean
-	yarn shadow-cljs -A:test release test
-#	open "http://localhost:8008"
-	bin/kaocha unit-cljs
+	yarn shadow-cljs -A:test compile ci
+	yarn karma start --single-run
 
 .PHONY: test
 test: clj-test cljs-test
 
+.PHONY: clj-ci
+clj-ci: clj-test
+
 .PHONY: cljs-ci
-cljs-ci: clean
-	yarn shadow-cljs -A:test compile ci
-	yarn karma start --single-run
+cljs-ci: cljs-test
 
 .PHONY: ci
-ci: clj-test cljs-ci
+ci: clj-ci cljs-ci
 
 BENCH_EDN_FILE:=../big-tree.edn
 

converge/build.clj

@@ -0,0 +1,27 @@
+(ns build
+  (:refer-clojure :exclude [test])
+  (:require [clojure.tools.build.api :as b] ; for b/git-count-revs
+            [org.corfield.build :as bb]))
+
+(def lib 'converge/converge)
+(def version (format "0.1.%s" (b/git-count-revs nil)))
+
+(defn test "Run the tests." [opts]
+  (bb/run-tests opts))
+
+(defn ci "Run the CI pipeline of tests (and build the JAR)." [opts]
+  (-> opts
+      (assoc :lib lib :version version)
+      (bb/run-tests)
+      (bb/clean)
+      (bb/jar)))
+
+(defn install "Install the JAR locally." [opts]
+  (-> opts
+      (assoc :lib lib :version version)
+      (bb/install)))
+
+(defn deploy "Deploy the JAR to Clojars." [opts]
+  (-> opts
+      (assoc :lib lib :version version)
+      (bb/deploy)))

converge/deps.edn

@@ -11,7 +11,11 @@
 ;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 ;; See the License for the specific language governing permissions and
 ;; limitations under the License.
-{:paths ["src" "resources"]
+{:paths ["src"]
+ :deps
+ {org.clojure/data.avl {:mvn/version "0.1.0"}
+  juji/editscript      {:mvn/version "0.5.7"}}
+
  :aliases
  {:cljs
   {:extra-deps
@@ -31,17 +35,17 @@
   :test
   {:extra-paths ["test"]
    :extra-deps
-   {lambdaisland/kaocha       {:mvn/version "1.60.945"}
-    lambdaisland/kaocha-cljs2 {:mvn/version "0.0.35"}
-    org.clojure/test.check    {:mvn/version "1.1.0"}}}
+   {org.clojure/test.check {:mvn/version "1.1.0"}
+    io.github.cognitect-labs/test-runner
+    {:git/tag "v0.5.0" :git/sha "48c3c67"}}}
 
   :bench
   {:extra-paths ["bench"]
    :extra-deps
-   {criterium/criterium {:mvn/version "0.4.6"}}}}
+   {criterium/criterium {:mvn/version "0.4.6"}}}
 
- :deps
- {org.clojure/clojure  {:mvn/version "1.10.3"}
-  org.clojure/data.avl {:mvn/version "0.1.0"}
-  juji/editscript      {:mvn/version "0.5.7"}
-  danlentz/clj-uuid    {:mvn/version "0.1.9"}}}
+  :build
+  {:ns-default build
+   :deps
+   {io.github.seancorfield/build-clj
+    {:git/tag "v0.5.2" :git/sha "8f75b81"}}}}}

converge/dev/user.clj

@@ -1,4 +1,4 @@
-;; Copyright 2020 Evident Systems LLC
+
 
 ;; Licensed under the Apache License, Version 2.0 (the "License");
 ;; you may not use this file except in compliance with the License.
@@ -16,18 +16,13 @@
             [clojure.pprint :refer [pprint]]
             [clojure.spec.test.alpha :as stest]
             [clojure.tools.namespace.repl :refer [refresh refresh-all set-refresh-dirs]]
-            [kaocha.repl :as kaocha]
             [criterium.core :as criterium]
             [clj-async-profiler.core :as profiler]))
 
 (set! *warn-on-reflection* true)
 
 (ns-unmap *ns* 'test)
 
-(defn test []
-  (refresh)
-  (kaocha/run :unit-clj {:config-file "test/tests.edn"}))
-
 (defn instrument
   []
   (stest/instrument))

converge/src/converge/domain.cljc

@@ -18,8 +18,7 @@
   (:require [clojure.data.avl :as avl]
             [clojure.string :as string]
             [editscript.edit :as edit]
-            #?(:clj  [clj-uuid :as uuid]
-               :cljs [uuid :as uuid]))
+            #?(:cljs [uuid :as uuid]))
   #?(:clj (:import java.util.UUID)))
 
 #?(:clj  (set! *warn-on-reflection* true)
@@ -29,7 +28,7 @@
 
 (defn uuid
   ([]
-   #?(:clj  (uuid/v4)
+   #?(:clj  (UUID/randomUUID)
       :cljs (random-uuid)))
   ([uuid-str]
    (cond

converge/test/tests.edn

@@ -26,10 +26,6 @@ default: ci
 bootstrap:
 	-brew install clojure tokei
 
-.PHONY: outdated
-outdated:
-	clojure -M:dev:test:outdated
-
 # Clean
 
 .PHONY: clean
@@ -42,16 +38,17 @@ CLJ_REPL_ALIAS:=
 
 .PHONY: dev
 dev:
-	clojure -M:dev:test${CLJ_REPL_ALIAS}
+	clojure -M:local:dev${CLJ_REPL_ALIAS}
 
 # Tests
 
 .PHONY: test
 test:
-	clojure -T:build test :aliases [:clj]
+	clojure -T:local:build test :aliases [:clj]
 
 .PHONY: ci
-ci: test
+ci:
+	clojure -T:build test :aliases [:clj]
 
 # Project info
 

nippy/Makefile

@@ -12,11 +12,16 @@
 ;; See the License for the specific language governing permissions and
 ;; limitations under the License.
 {:paths ["src"]
- :deps  {org.clojure/clojure     {:mvn/version "1.10.3"}
-         com.taoensso/nippy      {:mvn/version "3.1.1"}
-         evidentsystems/converge {:local/root "../converge"}}
+ :deps  {com.taoensso/nippy {:mvn/version "3.1.1"}
+         converge/converge  {:git/url   "https://github.com/evidentsystems/converge.git"
+                             :git/sha   "2c18eae54322555c8db58b129c1b1f2995635de1"
+                             :deps/root "./converge"}}
+
  :aliases
- {:dev
+ {:local
+  {:override-deps {converge/converge {:local/root "../converge"}}}
+
+  :dev
   {:extra-paths ["dev"]
    ;; cf. https://github.com/clojure-goes-fast/clj-async-profiler#jvm-options
    :jvm-opts    ["-Djdk.attach.allowAttachSelf"

nippy/deps.edn

@@ -25,12 +25,6 @@ default: ci
 .PHONY: bootstrap
 bootstrap:
 	-brew install clojure tokei
-	wget "https://github.com/lambdaisland/funnel/releases/download/v0.1.42/funnel.darwin-amd64" -O bin/funnel
-	chmod +x bin/funnel
-
-.PHONY: outdated
-outdated:
-	clojure -M:dev:test:outdated
 
 # Clean
 
@@ -44,16 +38,17 @@ CLJ_REPL_ALIAS:=
 
 .PHONY: dev
 dev:
-	clojure -M:dev:test${CLJ_REPL_ALIAS}
+	clojure -M:local:dev${CLJ_REPL_ALIAS}
 
 # Tests
 
 .PHONY: test
 test:
-	clojure -T:build test :aliases [:clj]
+	clojure -T:local:build test :aliases [:clj]
 
 .PHONY: ci
-ci: test
+ci:
+	clojure -T:build test :aliases [:clj]
 
 # Project info
 

storage/Makefile

@@ -12,11 +12,18 @@
 ;; See the License for the specific language governing permissions and
 ;; limitations under the License.
 {:paths ["src"]
- :deps  {org.clojure/clojure {:mvn/version "1.10.3"}
-         converge/converge   {:local/root "../converge"}
-         converge/nippy      {:local/root "../nippy"}}
+ :deps  {converge/nippy    {:git/url   "https://github.com/evidentsystems/converge.git"
+                            :git/sha   "2c18eae54322555c8db58b129c1b1f2995635de1"
+                            :deps/root "./nippy"}
+         converge/converge {:git/url   "https://github.com/evidentsystems/converge.git"
+                            :git/sha   "2c18eae54322555c8db58b129c1b1f2995635de1"
+                            :deps/root "./converge"}}
  :aliases
- {:dev
+ {:local
+  {:override-deps {converge/nippy    {:local/root "../nippy"}
+                   converge/converge {:local/root "../converge"}}}
+
+  :dev
   {:extra-paths ["dev"]
    ;; cf. https://github.com/clojure-goes-fast/clj-async-profiler#jvm-options
    :jvm-opts    ["-Djdk.attach.allowAttachSelf"
@@ -29,9 +36,10 @@
 
   :test
   {:extra-paths ["test"]
-   :extra-deps  {org.clojure/test.check {:mvn/version "1.1.0"}
-                 io.github.cognitect-labs/test-runner
-                 {:git/tag "v0.5.0" :git/sha "48c3c67"}}}
+   :extra-deps
+   {org.clojure/test.check {:mvn/version "1.1.0"}
+    io.github.cognitect-labs/test-runner
+    {:git/tag "v0.5.0" :git/sha "48c3c67"}}}
 
   :build
   {:deps       {io.github.seancorfield/build-clj

storage/deps.edn

@@ -16,18 +16,13 @@
             [clojure.pprint :refer [pprint]]
             [clojure.spec.test.alpha :as stest]
             [clojure.tools.namespace.repl :refer [refresh refresh-all set-refresh-dirs]]
-            [kaocha.repl :as kaocha]
             [criterium.core :as criterium]
             [clj-async-profiler.core :as profiler]))
 
 (set! *warn-on-reflection* true)
 
 (ns-unmap *ns* 'test)
 
-(defn test []
-  (refresh)
-  (kaocha/run :unit-clj {:config-file "test/tests.edn"}))
-
 (defn instrument
   []
   (stest/instrument))