Clean up wallbrew config (#223)

* Clean up wallbrew config * Fix ns sorting
Wall-Brew-Co · Oct 13, 2024 · b27f5eb · b27f5eb
1 parent e428fa3
commit b27f5eb
Show file tree

Hide file tree

Showing 51 changed files with 88 additions and 122 deletions.
diff --git a/CODEOWNERS → .github/CODEOWNERS b/CODEOWNERS → .github/CODEOWNERS
diff --git a/.bouncer/config.edn → .wallbrew/bouncer/config.edn b/.bouncer/config.edn → .wallbrew/bouncer/config.edn
diff --git a/.sealog/changes/2-0-0.edn → .wallbrew/sealog/changes/2-0-0.edn b/.sealog/changes/2-0-0.edn → .wallbrew/sealog/changes/2-0-0.edn
diff --git a/.sealog/changes/2-0-1.edn → .wallbrew/sealog/changes/2-0-1.edn b/.sealog/changes/2-0-1.edn → .wallbrew/sealog/changes/2-0-1.edn
diff --git a/.sealog/changes/2-1-0.edn → .wallbrew/sealog/changes/2-1-0.edn b/.sealog/changes/2-1-0.edn → .wallbrew/sealog/changes/2-1-0.edn
diff --git a/.sealog/changes/2-2-0.edn → .wallbrew/sealog/changes/2-2-0.edn b/.sealog/changes/2-2-0.edn → .wallbrew/sealog/changes/2-2-0.edn
diff --git a/.sealog/changes/2-2-1.edn → .wallbrew/sealog/changes/2-2-1.edn b/.sealog/changes/2-2-1.edn → .wallbrew/sealog/changes/2-2-1.edn
diff --git a/.sealog/changes/1-0-0.edn → .wallbrew/sealog/changes/v1/1-0-0.edn b/.sealog/changes/1-0-0.edn → .wallbrew/sealog/changes/v1/1-0-0.edn
diff --git a/.sealog/changes/1-1-0.edn → .wallbrew/sealog/changes/v1/1-1-0.edn b/.sealog/changes/1-1-0.edn → .wallbrew/sealog/changes/v1/1-1-0.edn
diff --git a/.sealog/changes/1-2-0.edn → .wallbrew/sealog/changes/v1/1-2-0.edn b/.sealog/changes/1-2-0.edn → .wallbrew/sealog/changes/v1/1-2-0.edn
diff --git a/.sealog/changes/1-3-0.edn → .wallbrew/sealog/changes/v1/1-3-0.edn b/.sealog/changes/1-3-0.edn → .wallbrew/sealog/changes/v1/1-3-0.edn
diff --git a/.sealog/changes/1-4-0.edn → .wallbrew/sealog/changes/v1/1-4-0.edn b/.sealog/changes/1-4-0.edn → .wallbrew/sealog/changes/v1/1-4-0.edn
diff --git a/.sealog/changes/1-5-0.edn → .wallbrew/sealog/changes/v1/1-5-0.edn b/.sealog/changes/1-5-0.edn → .wallbrew/sealog/changes/v1/1-5-0.edn
diff --git a/.sealog/config.edn → .wallbrew/sealog/config.edn b/.sealog/config.edn → .wallbrew/sealog/config.edn
@@ -1,4 +1,4 @@
 {:changelog-filename        "CHANGELOG.md"
- :changelog-entry-directory ".sealog/changes/"
+ :changelog-entry-directory ".wallbrew/sealog/changes/"
  :version-scheme            :semver3
  :pretty-print-edn?         true}
diff --git a/package-lock.json b/package-lock.json
diff --git a/project.clj b/project.clj
@@ -15,11 +15,10 @@
                  [org.clojure/clojurescript "1.11.132" :scope "provided"]]
 
   :plugins [[com.github.clj-kondo/lein-clj-kondo "2024.09.27"]
-            [com.wallbrew/lein-sealog "1.7.0"]
-            [com.wallbrew/bouncer "1.0.0"]
+            [com.wallbrew/lein-sealog "1.8.0"]
+            [com.wallbrew/bouncer "1.1.1"]
             [lein-cljsbuild/lein-cljsbuild "1.1.8"]
-            [mvxcvi/cljstyle "0.16.630"]
-            [ns-sort/ns-sort "1.0.3"]]
+            [mvxcvi/cljstyle "0.16.630"]]
 
   :deploy-repositories [["clojars" {:url           "https://clojars.org/repo"
                                     :username      :env/clojars_user

diff --git a/src/brewtility/precision.cljc b/src/brewtility/precision.cljc
@@ -1,7 +1,6 @@
 (ns brewtility.precision
   "Namespace for handling numeric precision, rounding, and approximation."
-  {:added "1.0"}
-  #?(:clj (:import [java.math RoundingMode])))
+  {:added "1.0"})
 
 
 (defn approximates?
@@ -25,7 +24,7 @@
    :see-also ["->1dp" "->2dp" "->3dp"]}
   [^double x ^long num-decimals]
   (double
-    #?(:clj (.setScale (bigdec x) num-decimals RoundingMode/HALF_UP)
+    #?(:clj (.setScale (bigdec x) num-decimals java.math.RoundingMode/HALF_UP)
        :cljs (let [denominator (Math/pow 10.0 (double num-decimals))
                    numerator   (Math/round (* x denominator))]
                (/ numerator denominator)))))

diff --git a/src/brewtility/units/pressure.cljc b/src/brewtility/units/pressure.cljc
@@ -10,7 +10,7 @@
       - [bar](https://en.wikipedia.org/wiki/Bar_(unit))
       - [atmosphere](https://en.wikipedia.org/wiki/Atmosphere_(unit))
       - [torr](https://en.wikipedia.org/wiki/Torr)
-      - [psi](https://en.wikipedia.org/wiki/Pound-force_per_square_inch"
+      - [psi](https://en.wikipedia.org/wiki/Pound-force_per_square_inch)"
   {:added "2.0"}
   (:require [brewtility.precision :as precision]
             [brewtility.units.options :as options]))

diff --git a/src/brewtility/units/volume.cljc b/src/brewtility/units/volume.cljc
@@ -19,7 +19,7 @@
       - [milliliter](https://en.wikipedia.org/wiki/Millilitre)
       - [millilitre](https://en.wikipedia.org/wiki/Millilitre)
       - [tablespoon](https://en.wikipedia.org/wiki/Tablespoon)
-      - [teaspoon](https://en.wikipedia.org/wiki/Teaspoon))"
+      - [teaspoon](https://en.wikipedia.org/wiki/Teaspoon)"
   {:added "2.0"}
   (:require [brewtility.precision :as precision]
             [brewtility.units.options :as options]))

diff --git a/test/brewtility/data/equipment.cljc b/test/brewtility/data/equipment.cljc
@@ -2,10 +2,9 @@
   "Namespace for static and generative test data for `common-beer-format.equipment/equipment` and `common-beer-format.equipment/equipment-wrapper`"
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
-            [common-beer-format.equipment :as equipment.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.equipment :as equipment.format]))
 
 
 (def sample-equipment

diff --git a/test/brewtility/data/fermentables.cljc b/test/brewtility/data/fermentables.cljc
@@ -2,10 +2,9 @@
   "Namespace for static and generative test data for `common-beer-format.fermentables/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
-            [common-beer-format.fermentables :as fermentables.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.fermentables :as fermentables.format]))
 
 
 (def sample-fermentable

diff --git a/test/brewtility/data/hops.cljc b/test/brewtility/data/hops.cljc
@@ -2,11 +2,10 @@
   "Namespace for static and generative test data for `common-beer-format.hops/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
             [com.wallbrew.spoon.string :as spoon.str]
-            [common-beer-format.hops :as hops.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.hops :as hops.format]))
 
 
 (defn random-hop-type

diff --git a/test/brewtility/data/mash.cljc b/test/brewtility/data/mash.cljc
@@ -2,10 +2,9 @@
   "Namespace for static and generative test data for `common-beer-format.mash/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
-            [common-beer-format.mash :as mash.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.mash :as mash.format]))
 
 
 (def sample-mash-step

diff --git a/test/brewtility/data/miscs.cljc b/test/brewtility/data/miscs.cljc
@@ -2,10 +2,9 @@
   "Namespace for static and generative test data for `common-beer-format.miscs/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
-            [common-beer-format.miscs :as miscs.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.miscs :as miscs.format]))
 
 
 (def sample-misc

diff --git a/test/brewtility/data/recipes.cljc b/test/brewtility/data/recipes.cljc
@@ -10,11 +10,10 @@
             [brewtility.data.yeasts :as yeasts]
             [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
             [com.wallbrew.spoon.string :as spoon.str]
-            [common-beer-format.recipes :as recipes.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.recipes :as recipes.format]))
 
 
 (defn random-ibu-method

diff --git a/test/brewtility/data/styles.cljc b/test/brewtility/data/styles.cljc
@@ -2,10 +2,9 @@
   "Namespace for static and generative test data for `common-beer-format.styles/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
-            [common-beer-format.styles :as style.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.styles :as style.format]))
 
 
 (def sample-style

diff --git a/test/brewtility/data/waters.cljc b/test/brewtility/data/waters.cljc
@@ -2,10 +2,9 @@
   "Namespace for static and generative test data for `common-beer-format.waters/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
-            [common-beer-format.waters :as waters.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.waters :as waters.format]))
 
 
 (defn random-ph

diff --git a/test/brewtility/data/yeasts.cljc b/test/brewtility/data/yeasts.cljc
@@ -2,11 +2,10 @@
   "Namespace for static and generative test data for `common-beer-format.yeasts/*` specs."
   (:require [clojure.spec.alpha :as spec]
             [clojure.spec.gen.alpha :as gen]
+            [clojure.test :refer [deftest is testing]]
             [com.wallbrew.spoon.spec :as spoon.spec]
             [com.wallbrew.spoon.string :as spoon.str]
-            [common-beer-format.yeasts :as yeasts.format]
-            #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])))
+            [common-beer-format.yeasts :as yeasts.format]))
 
 
 (defn random-flocculation

diff --git a/test/brewtility/predicates/equipment_test.cljc b/test/brewtility/predicates/equipment_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.equipment-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.equipment :as equipment]
+  (:require [brewtility.data.equipment :as equipment]
             [brewtility.predicates.equipment :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.equipment :as cbf-equipment]))
 
 

diff --git a/test/brewtility/predicates/fermentables_test.cljc b/test/brewtility/predicates/fermentables_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.fermentables-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.fermentables :as fermentables]
+  (:require [brewtility.data.fermentables :as fermentables]
             [brewtility.predicates.fermentables :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.fermentables :as cbf-fermentables]))
 
 

diff --git a/test/brewtility/predicates/hops_test.cljc b/test/brewtility/predicates/hops_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.hops-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.hops :as hops]
+  (:require [brewtility.data.hops :as hops]
             [brewtility.predicates.hops :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.hops :as cbf-hops]))
 
 

diff --git a/test/brewtility/predicates/impl_test.cljc b/test/brewtility/predicates/impl_test.cljc
@@ -1,7 +1,6 @@
 (ns brewtility.predicates.impl-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.predicates.impl :as sut]))
+  (:require [brewtility.predicates.impl :as sut]
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest fetch-or-throw!-test

diff --git a/test/brewtility/predicates/mash_test.cljc b/test/brewtility/predicates/mash_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.mash-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.mash :as mash]
+  (:require [brewtility.data.mash :as mash]
             [brewtility.predicates.mash :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.mash :as cbf-mash]))
 
 

diff --git a/test/brewtility/predicates/miscs_test.cljc b/test/brewtility/predicates/miscs_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.miscs-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.miscs :as miscs]
+  (:require [brewtility.data.miscs :as miscs]
             [brewtility.predicates.miscs :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.miscs :as cbf-miscs]))
 
 

diff --git a/test/brewtility/predicates/options_test.cljc b/test/brewtility/predicates/options_test.cljc
@@ -1,7 +1,6 @@
 (ns brewtility.predicates.options-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test :refer-macros [deftest is testing]])
-            [brewtility.predicates.options :as sut]))
+  (:require [brewtility.predicates.options :as sut]
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest type-test

diff --git a/test/brewtility/predicates/recipes_test.cljc b/test/brewtility/predicates/recipes_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.recipes-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.recipes :as recipes]
+  (:require [brewtility.data.recipes :as recipes]
             [brewtility.predicates.recipes :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.recipes :as cbf-recipes]))
 
 

diff --git a/test/brewtility/predicates/styles_test.cljc b/test/brewtility/predicates/styles_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.styles-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.styles :as styles]
+  (:require [brewtility.data.styles :as styles]
             [brewtility.predicates.styles :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.styles :as cbf-styles]))
 
 

diff --git a/test/brewtility/predicates/waters_test.cljc b/test/brewtility/predicates/waters_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.waters-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.waters :as waters]
+  (:require [brewtility.data.waters :as waters]
             [brewtility.predicates.waters :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.waters :as cbf-waters]))
 
 

diff --git a/test/brewtility/predicates/yeasts_test.cljc b/test/brewtility/predicates/yeasts_test.cljc
@@ -1,8 +1,7 @@
 (ns brewtility.predicates.yeasts-test
-  (:require #? (:clj  [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test    :refer-macros [deftest is testing]])
-            [brewtility.data.yeasts :as yeasts]
+  (:require [brewtility.data.yeasts :as yeasts]
             [brewtility.predicates.yeasts :as sut]
+            [clojure.test :refer [deftest is testing]]
             [common-beer-format.yeasts :as cbf-yeasts]))
 
 

diff --git a/test/brewtility/units/alcohol_content_test.cljc b/test/brewtility/units/alcohol_content_test.cljc
@@ -1,9 +1,8 @@
 (ns brewtility.units.alcohol-content-test
-  (:require #? (:clj [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test :refer-macros [deftest is testing]])
-            [brewtility.precision :as precision]
+  (:require [brewtility.precision :as precision]
             [brewtility.units.alcohol-content :as sut]
-            [brewtility.units.options :as options]))
+            [brewtility.units.options :as options]
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest conversion-test

diff --git a/test/brewtility/units/bitterness_test.cljc b/test/brewtility/units/bitterness_test.cljc
@@ -1,9 +1,8 @@
 (ns brewtility.units.bitterness-test
-  (:require #? (:clj [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test :refer-macros [deftest is testing]])
-            [brewtility.precision :as precision]
+  (:require [brewtility.precision :as precision]
             [brewtility.units.bitterness :as sut]
-            [brewtility.units.options :as options]))
+            [brewtility.units.options :as options]
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest conversion-test

diff --git a/test/brewtility/units/carbonation_test.cljc b/test/brewtility/units/carbonation_test.cljc
@@ -1,9 +1,8 @@
 (ns brewtility.units.carbonation-test
-  (:require #? (:clj [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test :refer-macros [deftest is testing]])
-            [brewtility.precision :as precision]
+  (:require [brewtility.precision :as precision]
             [brewtility.units.carbonation :as sut]
-            [brewtility.units.options :as options]))
+            [brewtility.units.options :as options]
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest conversion-test

diff --git a/test/brewtility/units/color_test.cljc b/test/brewtility/units/color_test.cljc
@@ -2,8 +2,7 @@
   (:require [brewtility.precision :as precision]
             [brewtility.units.color :as sut]
             [brewtility.units.options :as options]
-            #? (:clj [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test :refer-macros [deftest is testing]])))
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest srm->rgba-test

diff --git a/test/brewtility/units/pressure_test.cljc b/test/brewtility/units/pressure_test.cljc
@@ -1,9 +1,8 @@
 (ns brewtility.units.pressure-test
-  (:require #? (:clj [clojure.test :refer [deftest is testing]])
-            #? (:cljs [cljs.test :refer-macros [deftest is testing]])
-            [brewtility.precision :as precision]
+  (:require [brewtility.precision :as precision]
             [brewtility.units.options :as options]
-            [brewtility.units.pressure :as sut]))
+            [brewtility.units.pressure :as sut]
+            [clojure.test :refer [deftest is testing]]))
 
 
 (deftest conversion-test