From bfe6a6aa9891b388df7b17cf4c9ac8cfa01e9536 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Thu, 28 Jan 2021 14:32:31 +0530 Subject: [PATCH 1/5] Add tests + jar building to deps --- deps.edn | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index a9e0b0b..f51303e 100644 --- a/deps.edn +++ b/deps.edn @@ -1 +1,10 @@ -{:deps {honeysql {:mvn/version "0.9.5" :exclusions [org.clojure/clojurescript]}}} +{:deps {honeysql/honeysql {:mvn/version "0.9.5" :exclusions [org.clojure/clojurescript]}} + :paths ["src"] + :aliases {:test {:extra-paths ["test"]} + :runner {:extra-deps {com.cognitect/test-runner + {:git/url "https://github.com/cognitect-labs/test-runner" + :sha "b6b3193fcc42659d7e46ecd1884a228993441182"}} + :main-opts ["-m" "cognitect.test-runner" + "-d" "test"]} + :jar {:extra-deps {seancorfield/depstar {:mvn/version "2.0.165"}} + :main-opts ["-m" "hf.depstar.jar" "honeysql-postgres.jar"]}}} From b73d9f5e4fc2bb445b2e5199a5ebf6789802ff86 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Thu, 28 Jan 2021 14:44:48 +0530 Subject: [PATCH 2/5] Add cljs runner --- deps.edn | 2 ++ src/honeysql_postgres/helpers.cljc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index f51303e..b5bd842 100644 --- a/deps.edn +++ b/deps.edn @@ -6,5 +6,7 @@ :sha "b6b3193fcc42659d7e46ecd1884a228993441182"}} :main-opts ["-m" "cognitect.test-runner" "-d" "test"]} + :cljs-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "3.7.0"}} + :main-opts ["-m" "cljs-test-runner.main"]} :jar {:extra-deps {seancorfield/depstar {:mvn/version "2.0.165"}} :main-opts ["-m" "hf.depstar.jar" "honeysql-postgres.jar"]}}} diff --git a/src/honeysql_postgres/helpers.cljc b/src/honeysql_postgres/helpers.cljc index 80fba56..c391413 100644 --- a/src/honeysql_postgres/helpers.cljc +++ b/src/honeysql_postgres/helpers.cljc @@ -1,6 +1,6 @@ (ns honeysql-postgres.helpers (:refer-clojure :exclude [partition-by]) - (:require [honeysql-postgres.format :refer :all] + (:require [honeysql-postgres.format] [honeysql.helpers :as sqlh #?(:clj :refer :cljs :refer-macros) [defhelper]])) ;; Extension of the honeysql helper funcitons for postgreSQL From aa557c74b985e2a2582eab45c9a358cef30dc464 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Fri, 29 Jan 2021 10:30:22 +0530 Subject: [PATCH 3/5] Remove project.clj (lein) --- project.clj | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 project.clj diff --git a/project.clj b/project.clj deleted file mode 100644 index 0a5e4e2..0000000 --- a/project.clj +++ /dev/null @@ -1,13 +0,0 @@ -(defproject nilenso/honeysql-postgres "0.2.6" - :description "PostgreSQL extension for honeysql" - :url "https://github.com/nilenso/honeysql-postgres" - :license {:name "Eclipse Public License" - :url "http://www.eclipse.org/legal/epl-v10.html"} - ;; read dependencies from deps.edn - :plugins [[lein-tools-deps "0.4.1"]] - :middleware [lein-tools-deps.plugin/resolve-dependencies-with-deps-edn] - :lein-tools-deps/config {:config-files [:install :user :project]} - - :tach {:test-runner-ns 'honeysql-postgres.postgres-test - :source-paths ["src" "test"]} - :profiles {:dev {:plugins [[lein-tach "0.4.0"]]}}) From 59df870df5cdacbc3b7140c7039270320dad4e11 Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Fri, 29 Jan 2021 10:40:53 +0530 Subject: [PATCH 4/5] Add jar building via exec-fn --- deps.edn | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/deps.edn b/deps.edn index b5bd842..ca86a0c 100644 --- a/deps.edn +++ b/deps.edn @@ -6,7 +6,12 @@ :sha "b6b3193fcc42659d7e46ecd1884a228993441182"}} :main-opts ["-m" "cognitect.test-runner" "-d" "test"]} - :cljs-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "3.7.0"}} + :cljs-runner {:extra-deps {olical/cljs-test-runner {:mvn/version "3.8.0"}} :main-opts ["-m" "cljs-test-runner.main"]} - :jar {:extra-deps {seancorfield/depstar {:mvn/version "2.0.165"}} - :main-opts ["-m" "hf.depstar.jar" "honeysql-postgres.jar"]}}} + :jar {:replace-deps {seancorfield/depstar {:mvn/version "2.0.165"}} + :exec-fn hf.depstar/jar + :exec-args {}} + ;; this is for consistency with the alias shown in the depstar project: + :depstar {:replace-deps {seancorfield/depstar {:mvn/version "2.0.165"}} + :ns-default hf.depstar + :exec-args {}}}} From dc0b174b0faf9ff249166c5446870c5ba5c9609c Mon Sep 17 00:00:00 2001 From: Akshay Gupta Date: Fri, 29 Jan 2021 16:54:03 +0530 Subject: [PATCH 5/5] Remove depstar alias --- deps.edn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/deps.edn b/deps.edn index ca86a0c..51398ab 100644 --- a/deps.edn +++ b/deps.edn @@ -10,8 +10,4 @@ :main-opts ["-m" "cljs-test-runner.main"]} :jar {:replace-deps {seancorfield/depstar {:mvn/version "2.0.165"}} :exec-fn hf.depstar/jar - :exec-args {}} - ;; this is for consistency with the alias shown in the depstar project: - :depstar {:replace-deps {seancorfield/depstar {:mvn/version "2.0.165"}} - :ns-default hf.depstar :exec-args {}}}}