Merge pull request #43 from jesims/JESI-3007

JESI-3007
jesims · Feb 9, 2020 · 46e975c · 46e975c
2 parents 36d8f00 + d8673d1
commit 46e975c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 3.4.0
+
+* Added [shadow-cljs](https://github.com/thheller/shadow-cljs) develop dependency and alias
+* Update `thheller/shadow-cljs` to `2.8.83`
+* Update `lambdaisland/kaocha` to `0.0-590`
+* Update `org.postgresql/postgresql` to `42.2.10`
+
 # 3.3.1
 
 * Update `org.clojure/core.async` to `0.7.559`

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject io.jesi/parent "3.3.1"
+(defproject io.jesi/parent "3.4.0"
   :description "Clojure and NPM parent package definitions"
   :url "https://github.com/jesims/parent#readme"
   :license {:name         "Eclipse Public License - v 1.0"
@@ -7,19 +7,18 @@
             :comments     "same as Clojure"}
   :min-lein-version "2.9.1"
   :managed-dependencies [[org.clojure/clojure "1.10.1"]
-                         [thheller/shadow-cljs "2.8.77"]    ;TODO update to latest (at least 2.8.83)
+                         [thheller/shadow-cljs "2.8.83"]
                          [org.clojure/clojurescript "1.10.597"] ;Match version used in shadow-cljs
                          [io.jesi/backpack "5.0.0"]
                          [io.jesi/customs "1.0.0"]
                          [com.rpl/specter "1.1.3"]
                          [org.clojure/core.async "0.7.559"]
                          ;DB
                          [org.clojure/java.jdbc "0.7.11"]
-                         [org.postgresql/postgresql "42.2.9"]
+                         [org.postgresql/postgresql "42.2.10"]
                          [clj-postgresql "0.7.0"]
                          [nilenso/honeysql-postgres "0.2.6"]]
   :dependencies [[org.clojure/clojure]]
-  :exclusions [org.clojure/clojure org.clojure/clojurescript]
   :profiles {:parent/dev {:plugins      [[jonase/eastwood "0.3.7"]
                                          [lein-ancient "0.6.15"]
                                          [lein-auto "0.1.3"]
@@ -29,8 +28,11 @@
                                          [lein-pprint "1.2.0"]
                                          [lein-set-version "0.4.1"]]
                           :eastwood     {:exclude-linters [:local-shadows-var]}
+                          ;TODO split CLJ and CLJS dependencies to separate profiles
                           :dependencies [[clj-kondo "RELEASE"]
-                                         [lambdaisland/kaocha "0.0-581"]
+                                         [lambdaisland/kaocha "0.0-590"]
+                                         [thheller/shadow-cljs]
+                                         [org.clojure/clojurescript]
                                          [lambdaisland/kaocha-cljs "0.0-68"]]}}
   :global-vars {*warn-on-reflection* true}
   :deploy-repositories [["clojars" {:url           "https://clojars.org/repo"
@@ -41,6 +43,7 @@
   :aliases {"run-main"        ["trampoline" "run" "-m"]
             "clj-kondo"       ["run-main" "clj-kondo.main"]
             "kaocha"          ["run-main" "kaocha.runner"]
+            "shadow-cljs"     ["run-main" "shadow.cljs.devtools.cli"]
             "lint-nsorg"      ["nsorg" "--replace"]
             "lint-kondo"      ["clj-kondo" "--" "--cache" "--lint" "src"] ;TODO use :project/source-paths
             "lint-test-kondo" ["clj-kondo" "--" "--cache" "--lint" "test"] ;TODO use :project/test-paths