Skip to content

Commit f1a5999

Browse files
authored
Dependency bump (#80)
* Dependency bump * switch the cljs runner to node * fixed the gh build workflow * changelog * Adding clojars badge
1 parent b32578b commit f1a5999

File tree

5 files changed

+41
-49
lines changed

5 files changed

+41
-49
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@ jobs:
4444
uses: DeLaGuardo/[email protected]
4545
with:
4646
lein: latest
47-
- run: sudo sh ./script/install-phantom-js-ubuntu.sh
48-
- run: lein do clean, compile :all, test :all, doo phantom test once
47+
- name: Setup Node.js
48+
uses: actions/setup-node@v4
49+
with:
50+
node-version: '20'
51+
- run: lein do clean, compile :all, test :all, doo node test once

README.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
# clj-momo
22

3+
[![Clojars Project](https://img.shields.io/clojars/v/threatgrid/clj-momo.svg)](https://clojars.org/threatgrid/clj-momo)
4+
35
This clojure library can be seen as a common library for many `threatgrid` projects.
46
It centralizes many generic functions.
57

68
## Changes
79

10+
- 0.4.1
11+
- Dependency upgrades:
12+
- clojure: 1.10.1 → 1.12.3
13+
- tools.logging: 0.5.0 → 1.3.0
14+
- prismatic/schema: 1.1.12 → 1.4.1
15+
- metosin/schema-tools: 0.12.2 → 0.13.1
16+
- cheshire: 5.9.0 → 6.1.0
17+
- clj-http: 3.12.3 → 3.13.1
18+
- riemann-clojure-client: 0.5.1 → 0.5.4
19+
- error_prone_annotations: 2.1.3 → 2.42.0
20+
- clojurescript: 1.10.597 → 1.12.42
21+
- logback-classic: 1.2.3 → 1.5.19
22+
- Switch from PhantomJS to Node.js for ClojureScript tests
23+
- Fix `goog.date.UtcDateTime` comparison support for Node.js
24+
825
- 0.4.0
926
- upgrades clj-http 3.12.3 which deprecates `json-strict` operations
1027

project.clj

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(def clj-version "1.10.1")
1+
(def clj-version "1.12.3")
22
(def metrics-clojure-version "2.10.0")
33

44
(defproject threatgrid/clj-momo "0.4.1-SNAPSHOT"
@@ -15,16 +15,16 @@
1515
; Avoid combining :exclusions with an override as it can obscure the indended
1616
; dependencies when browsing the full deps tree.
1717
:dependencies [[org.clojure/clojure ~clj-version]
18-
[org.clojure/tools.logging "0.5.0"]
19-
[prismatic/schema "1.1.12"]
20-
[metosin/schema-tools "0.12.2"]
18+
[org.clojure/tools.logging "1.3.0"]
19+
[prismatic/schema "1.4.1"]
20+
[metosin/schema-tools "0.13.1"]
2121
[com.andrewmcveigh/cljs-time "0.5.2"]
2222
[clj-time "0.15.2"]
2323
[com.arohner/uri "0.1.2"]
24-
[cheshire "5.9.0"]
25-
[clj-http "3.12.3"]
24+
[cheshire "6.1.0"]
25+
[clj-http "3.13.1"]
2626
[slugger "1.0.1"]
27-
[riemann-clojure-client "0.5.1"]
27+
[riemann-clojure-client "0.5.4"]
2828
[metrics-clojure ~metrics-clojure-version]
2929
[metrics-clojure-jvm ~metrics-clojure-version]
3030
[metrics-clojure-ring ~metrics-clojure-version]
@@ -55,9 +55,13 @@
5555

5656
:test {:source-paths ["src" "test"]
5757
:compiler {:output-to "target/tests.js"
58-
:optimizations :whitespace
58+
:optimizations :none
5959
:main clj-momo.runner
60-
:pretty-print true}}}}
60+
:pretty-print true
61+
:target :nodejs}}}}
62+
63+
:doo {:build "test"
64+
:alias {:default [:node]}}
6165

6266
:test-selectors {:integration :integration
6367
:default (complement :integration)
@@ -66,9 +70,9 @@
6670
:global-vars {*warn-on-reflection* true}
6771

6872
:profiles {:dev {:dependencies [;https://clojure.atlassian.net/browse/CLJS-3047
69-
[com.google.errorprone/error_prone_annotations "2.1.3"]
73+
[com.google.errorprone/error_prone_annotations "2.42.0"]
7074
;https://clojure.atlassian.net/browse/CLJS-3047
7175
[com.google.code.findbugs/jsr305 "3.0.2"]
72-
[org.clojure/clojurescript "1.10.597"]
73-
[ch.qos.logback/logback-classic "1.2.3"]]
76+
[org.clojure/clojurescript "1.12.42"]
77+
[ch.qos.logback/logback-classic "1.5.19"]]
7478
:resource-paths ["test/resources"]}})

script/install-phantom-js-ubuntu.sh

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/clj_momo/lib/clj_time/core.cljc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
(:require [clj-momo.lib.clj-time.coerce :as time-coerce]
55
#?(:clj [clj-momo.lib.clj-time.macros :refer [immigrate]])
66
#?(:clj [clj-time.core :as time-delegate]
7-
:cljs [cljs-time.core :as time-delegate]))
7+
:cljs [cljs-time.core :as time-delegate])
8+
#?@(:cljs [[goog.array :as garray]]))
89
#?(:clj
910
(:import [java.util Calendar Date GregorianCalendar TimeZone]
1011
[org.joda.time ReadablePartial ReadableInstant ReadablePeriod
@@ -603,7 +604,7 @@
603604
cljs.core/IComparable
604605
(^number -compare [x y]
605606
(if (instance? goog.date.UtcDateTime y)
606-
(goog.array/defaultCompare
607+
(garray/defaultCompare
607608
(.getTime x)
608609
(.getTime y))
609610
(throw

0 commit comments

Comments
 (0)