From 35dbcc5aa9ba6d87d9335987f5076e0e764213ba Mon Sep 17 00:00:00 2001 From: James Elliott Date: Sun, 1 Oct 2023 02:55:22 -0500 Subject: [PATCH] Remove unused dependency on humanize There was a release version that was newer, but this one was also pulling in an old version of clojure.math/numeric-tower, which produced a warning about `abs` being shadowed. Getting rid of it showed we were relying on that implicit dependency in some code, but we can replace that with the new, faster, tinier clojure.math in the core library. --- CHANGELOG.md | 2 ++ project.clj | 5 ++--- src/beat_link_trigger/show_phrases.clj | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91231b82..cc157a96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ Nothing so far. actually needs Java 1.9 or later. The fact that nobody has run into this issue suggests nobody is using such ancient versions anyway, so this could perhaps be removed. +- Removed some libraries that were not actually used any more, saving + some file size. ## [7.2.0] - 2023-08-13 diff --git a/project.clj b/project.clj index 120ed513..6aa61798 100644 --- a/project.clj +++ b/project.clj @@ -6,13 +6,12 @@ :url "https://www.eclipse.org/legal/epl-2.0/"} :aot [beat-link-trigger.BeatLinkTrigger beat-link-trigger.TexturedRaven] :dependencies [[org.clojure/clojure "1.11.1"] - [org.clojure/core.async "1.6.673"] + [org.clojure/core.async "1.6.681"] [org.clojure/data.csv "1.0.1"] - [org.clojure/tools.cli "1.0.214"] + [org.clojure/tools.cli "1.0.219"] [beat-carabiner "1.0.0"] [cheshire "5.11.0"] [cider/cider-nrepl "0.30.0"] - [clojure-humanize "0.2.2"] [clj-commons/pomegranate "1.2.23"] [com.cemerick/url "0.1.1"] [com.fifesoft/rstaui "3.3.1"] diff --git a/src/beat_link_trigger/show_phrases.clj b/src/beat_link_trigger/show_phrases.clj index e52c47e8..61d7e92f 100644 --- a/src/beat_link_trigger/show_phrases.clj +++ b/src/beat_link_trigger/show_phrases.clj @@ -9,7 +9,7 @@ swap-show! swap-phrase! swap-phrase-runtime! phrase-runtime-info get-chosen-output no-output-chosen]] [beat-link-trigger.util :as util] - [clojure.math.numeric-tower :as math] + [clojure.math :as math] [clojure.set :as set] [clojure.string :as str] [overtone.midi :as midi] @@ -1475,7 +1475,7 @@ editor windows, in their cue canvases as well." "Custom" (let [result (run-phrase-function show phrase-trigger :custom-enabled status false)] (if (number? result) - (let [weight (long (min (math/round result) 1000))] + (let [weight (min (math/round result) 1000)] (when (pos? weight) weight)) (when result 1)))