diff --git a/CODEOWNERS b/.github/CODEOWNERS similarity index 100% rename from CODEOWNERS rename to .github/CODEOWNERS diff --git a/.bouncer/config.edn b/.wallbrew/bouncer/config.edn similarity index 100% rename from .bouncer/config.edn rename to .wallbrew/bouncer/config.edn diff --git a/.sealog/changes/2-0-0.edn b/.wallbrew/sealog/changes/2-0-0.edn similarity index 100% rename from .sealog/changes/2-0-0.edn rename to .wallbrew/sealog/changes/2-0-0.edn diff --git a/.sealog/changes/2-0-1.edn b/.wallbrew/sealog/changes/2-0-1.edn similarity index 100% rename from .sealog/changes/2-0-1.edn rename to .wallbrew/sealog/changes/2-0-1.edn diff --git a/.sealog/changes/2-1-0.edn b/.wallbrew/sealog/changes/2-1-0.edn similarity index 100% rename from .sealog/changes/2-1-0.edn rename to .wallbrew/sealog/changes/2-1-0.edn diff --git a/.sealog/changes/2-2-0.edn b/.wallbrew/sealog/changes/2-2-0.edn similarity index 100% rename from .sealog/changes/2-2-0.edn rename to .wallbrew/sealog/changes/2-2-0.edn diff --git a/.sealog/changes/2-2-1.edn b/.wallbrew/sealog/changes/2-2-1.edn similarity index 100% rename from .sealog/changes/2-2-1.edn rename to .wallbrew/sealog/changes/2-2-1.edn diff --git a/.sealog/changes/1-0-0.edn b/.wallbrew/sealog/changes/v1/1-0-0.edn similarity index 100% rename from .sealog/changes/1-0-0.edn rename to .wallbrew/sealog/changes/v1/1-0-0.edn diff --git a/.sealog/changes/1-1-0.edn b/.wallbrew/sealog/changes/v1/1-1-0.edn similarity index 100% rename from .sealog/changes/1-1-0.edn rename to .wallbrew/sealog/changes/v1/1-1-0.edn diff --git a/.sealog/changes/1-2-0.edn b/.wallbrew/sealog/changes/v1/1-2-0.edn similarity index 100% rename from .sealog/changes/1-2-0.edn rename to .wallbrew/sealog/changes/v1/1-2-0.edn diff --git a/.sealog/changes/1-3-0.edn b/.wallbrew/sealog/changes/v1/1-3-0.edn similarity index 100% rename from .sealog/changes/1-3-0.edn rename to .wallbrew/sealog/changes/v1/1-3-0.edn diff --git a/.sealog/changes/1-4-0.edn b/.wallbrew/sealog/changes/v1/1-4-0.edn similarity index 100% rename from .sealog/changes/1-4-0.edn rename to .wallbrew/sealog/changes/v1/1-4-0.edn diff --git a/.sealog/changes/1-5-0.edn b/.wallbrew/sealog/changes/v1/1-5-0.edn similarity index 100% rename from .sealog/changes/1-5-0.edn rename to .wallbrew/sealog/changes/v1/1-5-0.edn diff --git a/.sealog/config.edn b/.wallbrew/sealog/config.edn similarity index 67% rename from .sealog/config.edn rename to .wallbrew/sealog/config.edn index 6a2fb61d..ed010094 100644 --- a/.sealog/config.edn +++ b/.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 index 8bcbf456..1216f08e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -317,9 +317,9 @@ } }, "node_modules/cookie": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz", - "integrity": "sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "dev": true, "license": "MIT", "engines": { @@ -451,9 +451,9 @@ } }, "node_modules/engine.io": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.1.tgz", - "integrity": "sha512-NEpDCw9hrvBW+hVEOK4T7v0jFJ++KgtPl4jKFwsZVfG1XhS0dCrSb3VMb9gPAd7VAdW52VT1EnaNiU2vM8C0og==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz", + "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==", "dev": true, "license": "MIT", "dependencies": { @@ -462,7 +462,7 @@ "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", - "cookie": "~0.4.1", + "cookie": "~0.7.2", "cors": "~2.8.5", "debug": "~4.3.1", "engine.io-parser": "~5.2.1", diff --git a/project.clj b/project.clj index c37d3677..387ff74f 100644 --- 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 index 55aff62f..cf126f01 100644 --- 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 index ccf89651..fde14d5e 100644 --- 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 index e15f70b5..6348beee 100644 --- 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 index 76b78647..8164ec0a 100644 --- 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 index 544030ed..5a1a1e7c 100644 --- 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 index 0ed0a19f..76026422 100644 --- 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 index 99f3234b..8d28ce1c 100644 --- 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 index b40f46fc..ffab78a8 100644 --- 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 index d7f6fe53..d39d271e 100644 --- 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 index 41c744bf..f631d9e5 100644 --- 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 index 19b71449..881cd98b 100644 --- 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 index 10951761..3f7995de 100644 --- 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 index 9b4fdfd2..7fb5fbeb 100644 --- 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 index d9bebbd5..8df2641c 100644 --- 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 index 3f8b5890..b9187843 100644 --- 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 index f0564c88..f1d23170 100644 --- 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 index cbe16b3a..a7d74846 100644 --- 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 index bb1bd638..7a98c0cf 100644 --- 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 index 07e0ea83..870d5556 100644 --- 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 index 62edf9ef..580eeb7a 100644 --- 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 index 38baf37f..bd06d28a 100644 --- 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 index 9913f5ad..13d8e7bb 100644 --- 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 index c7b4a835..e0d364c1 100644 --- 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 index b2ce7ff8..2fdba8d0 100644 --- 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 index 37d19799..35d2bf93 100644 --- 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 index 163956fa..020adc9c 100644 --- 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 index e4f7be42..8b727e0b 100644 --- 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 index 9b37e674..8d5ffa16 100644 --- 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 diff --git a/test/brewtility/units/specific_gravity_test.cljc b/test/brewtility/units/specific_gravity_test.cljc index 0e0da804..44e14470 100644 --- a/test/brewtility/units/specific_gravity_test.cljc +++ b/test/brewtility/units/specific_gravity_test.cljc @@ -1,9 +1,8 @@ (ns brewtility.units.specific-gravity-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.specific-gravity :as sut])) + [brewtility.units.specific-gravity :as sut] + [clojure.test :refer [deftest is testing]])) (deftest conversion-test diff --git a/test/brewtility/units/temperature_test.cljc b/test/brewtility/units/temperature_test.cljc index 3633b8f3..1abf837a 100644 --- a/test/brewtility/units/temperature_test.cljc +++ b/test/brewtility/units/temperature_test.cljc @@ -1,9 +1,8 @@ (ns brewtility.units.temperature-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.temperature :as sut])) + [brewtility.units.temperature :as sut] + [clojure.test :refer [deftest is testing]])) (deftest code-type-tests diff --git a/test/brewtility/units/time_test.cljc b/test/brewtility/units/time_test.cljc index 6306d3b9..c8d44a48 100644 --- a/test/brewtility/units/time_test.cljc +++ b/test/brewtility/units/time_test.cljc @@ -1,9 +1,8 @@ (ns brewtility.units.time-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.time :as sut])) + [brewtility.units.time :as sut] + [clojure.test :refer [deftest is testing]])) (deftest code-type-tests diff --git a/test/brewtility/units/volume_test.cljc b/test/brewtility/units/volume_test.cljc index 753f7a8e..017e53dc 100644 --- a/test/brewtility/units/volume_test.cljc +++ b/test/brewtility/units/volume_test.cljc @@ -1,9 +1,8 @@ (ns brewtility.units.volume-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.volume :as sut])) + [brewtility.units.volume :as sut] + [clojure.test :refer [deftest is testing]])) (deftest code-type-tests diff --git a/test/brewtility/units/weight_test.cljc b/test/brewtility/units/weight_test.cljc index 72dbae39..f75565f7 100644 --- a/test/brewtility/units/weight_test.cljc +++ b/test/brewtility/units/weight_test.cljc @@ -1,9 +1,8 @@ (ns brewtility.units.weight-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.weight :as sut])) + [brewtility.units.weight :as sut] + [clojure.test :refer [deftest is testing]])) (deftest code-type-tests diff --git a/test/brewtility/units_test.cljc b/test/brewtility/units_test.cljc index 0b34d859..d66b005e 100644 --- a/test/brewtility/units_test.cljc +++ b/test/brewtility/units_test.cljc @@ -1,10 +1,9 @@ (ns brewtility.units-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 :as sut] [brewtility.units.color :as color] - [brewtility.units.options :as options])) + [brewtility.units.options :as options] + [clojure.test :refer [deftest is testing]])) ;; These test cases existed prior to version 2.0.0 of brewtility.units diff --git a/test/brewtility/wrapping_test.cljc b/test/brewtility/wrapping_test.cljc index eafc330f..6b81ff05 100644 --- a/test/brewtility/wrapping_test.cljc +++ b/test/brewtility/wrapping_test.cljc @@ -1,7 +1,5 @@ (ns brewtility.wrapping-test - (:require #? (:clj [clojure.test :refer [deftest is testing]]) - #? (:cljs [cljs.test :refer-macros [deftest is testing]]) - [brewtility.data.equipment :as equipment.data] + (:require [brewtility.data.equipment :as equipment.data] [brewtility.data.fermentables :as fermentables.data] [brewtility.data.hops :as hops.data] [brewtility.data.mash :as mash.data] @@ -11,6 +9,7 @@ [brewtility.data.waters :as waters.data] [brewtility.data.yeasts :as yeasts.data] [brewtility.wrapping :as sut] + [clojure.test :refer [deftest is testing]] [com.wallbrew.spoon.spec :as spoon.spec] [common-beer-format.equipment :as equipment.format] [common-beer-format.fermentables :as fermentables.format]