fix deps conflict

juji-io · Dec 6, 2023 · 678eb19 · 678eb19
1 parent 9361041
commit 678eb19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## WIP
+### Fixed
+- deps conflict
+
 ## 0.8.22 (2023-12-06)
 ### Improved
 - [Datalog] `<`, `>`, `<=`, `>=` built-in functions handle any comparable data, not just numbers.

diff --git a/project.clj b/project.clj
@@ -13,7 +13,7 @@
    [com.fasterxml.jackson.core/jackson-databind "2.16.0"]
    [com.github.clj-easy/graal-build-time "0.1.4"]
    [com.github.jnr/jnr-ffi "2.2.15"]
-   [com.taoensso/encore "3.74.0"]
+   ;; [com.taoensso/encore "3.68.0"]
    [com.taoensso/nippy "3.3.0"]
    [com.taoensso/timbre "6.3.1"]
    ;; only for testing serializing joda-time, as some user data contain these
@@ -44,7 +44,7 @@
    [com.github.jnr/jnr-ffi]
    [com.taoensso/timbre]
    [org.lmdbjava/lmdbjava]
-   [com.taoensso/encore]
+   ;; [com.taoensso/encore]
    [com.taoensso/nippy]
    [org.babashka/sci]
    [nrepl/bencode]

diff --git a/release.clj b/release.clj
@@ -79,9 +79,9 @@
   (println "\n\n[ Running tests ]\n")
   (sh "./lein-test" :dir "script")
 
-  ;; (println "\n\n[ Testing jar ]\n")
-  ;; (sh "./jar" :dir "script")
-  ;; (sh "test-jar/test.sh")
+  (println "\n\n[ Testing jar ]\n")
+  (sh "./jar" :dir "script")
+  (sh "test-jar/test.sh")
 
   (println "\n\n[ Testing uberjar ]\n")
   (sh "./uberjar" :dir "script")