From 9da8916998383e2f2db5b3f5029461ce2ed4199e Mon Sep 17 00:00:00 2001 From: Dominic Monroe Date: Fri, 13 Nov 2020 06:33:10 +0000 Subject: [PATCH] Use wedge for examples This is easier to depend on than edge. --- examples/cms/deps.edn | 17 +++++++---------- examples/cms/dev/dev.clj | 2 +- .../cms/dev/io/dominic/wedge/system-config.edn | 2 ++ examples/cms/dev/user.clj | 3 +++ examples/petstore/deps.edn | 13 +++++++------ examples/petstore/dev/dev.clj | 2 +- .../dev/io/dominic/wedge/system-config.edn | 2 ++ examples/petstore/dev/user.clj | 3 +++ examples/petstore/src/config.edn | 2 +- examples/tutorial/deps.edn | 17 +++++++---------- examples/tutorial/dev/dev.clj | 2 +- .../dev/io/dominic/wedge/system-config.edn | 2 ++ examples/tutorial/dev/user.clj | 3 +++ 13 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 examples/cms/dev/io/dominic/wedge/system-config.edn create mode 100644 examples/cms/dev/user.clj create mode 100644 examples/petstore/dev/io/dominic/wedge/system-config.edn create mode 100644 examples/petstore/dev/user.clj create mode 100644 examples/tutorial/dev/io/dominic/wedge/system-config.edn create mode 100644 examples/tutorial/dev/user.clj diff --git a/examples/cms/deps.edn b/examples/cms/deps.edn index 34114fa..d0993d9 100644 --- a/examples/cms/deps.edn +++ b/examples/cms/deps.edn @@ -23,17 +23,14 @@ {:dev {:extra-paths ["dev" "test"] :jvm-opts ["-XX:-OmitStackTraceInFastThrow"] - :override-deps {juxt.edge/logging.dev {:local/root "dev/logging"}} + :override-deps {com.stuartsierra/log.dev {:mvn/version "0.2.0"}} :extra-deps - {juxt.edge/lib.app.dev - {:git/url "https://github.com/juxt/edge.git" - :sha "b5f853ad71743382462f7e06f144687523211bc7" - :deps/root "lib/edge.app.dev"} - - juxt.edge/lib.app2.logging - {:git/url "https://github.com/juxt/edge.git" - :sha "b5f853ad71743382462f7e06f144687523211bc7" - :deps/root "lib/edge.app.logging"} + {io.dominic/wedge {:mvn/version "0.6.0"} + io.dominic/wedge-mise {:git/url "https://git.sr.ht/~severeoverfl0w/wedge-mise" + :sha "670720d43c24495284dcce1db98cdd4269109b6e"} + org.clojure/tools.namespace {:mvn/version "1.0.0"} + integrant/repl {:mvn/version "0.3.2"} + aero/aero {:mvn/version "1.1.6"} org.clojure/tools.logging {:mvn/version "0.5.0-alpha"} diff --git a/examples/cms/dev/dev.clj b/examples/cms/dev/dev.clj index 0d0bb7f..5958474 100644 --- a/examples/cms/dev/dev.clj +++ b/examples/cms/dev/dev.clj @@ -2,7 +2,7 @@ (ns dev (:require - [dev-extras :refer :all] + [io.dominic.wedge.dev :refer :all] [crux.api :as crux])) (defn crux-node [] diff --git a/examples/cms/dev/io/dominic/wedge/system-config.edn b/examples/cms/dev/io/dominic/wedge/system-config.edn new file mode 100644 index 0000000..6a7c0a3 --- /dev/null +++ b/examples/cms/dev/io/dominic/wedge/system-config.edn @@ -0,0 +1,2 @@ +{:system io.dominic.wedge.integrant-aero + :dev {:profile :dev}} diff --git a/examples/cms/dev/user.clj b/examples/cms/dev/user.clj new file mode 100644 index 0000000..d61ebf6 --- /dev/null +++ b/examples/cms/dev/user.clj @@ -0,0 +1,3 @@ +(ns user + (:require + [io.dominic.wedge.user :refer :all])) diff --git a/examples/petstore/deps.edn b/examples/petstore/deps.edn index c74189f..de63ac2 100644 --- a/examples/petstore/deps.edn +++ b/examples/petstore/deps.edn @@ -17,13 +17,14 @@ {:dev {:extra-paths ["dev" "test"] :jvm-opts ["-XX:-OmitStackTraceInFastThrow"] - :override-deps {juxt.edge/logging.dev {:local/root "dev/logging"}} + :override-deps {com.stuartsierra/log.dev {:mvn/version "0.2.0"}} :extra-deps - { - ;; TODO: Replace ../edge with a git dep with :deps/root - ;; of 'lib/edge.app.dev': - juxt.edge/lib.app.dev {:local/root "../../../edge/lib/edge.app.dev"} - juxt.edge/lib.app.logging {:local/root "../../../edge/lib/edge.app.logging"} + {io.dominic/wedge {:mvn/version "0.6.0"} + io.dominic/wedge-mise {:git/url "https://git.sr.ht/~severeoverfl0w/wedge-mise" + :sha "670720d43c24495284dcce1db98cdd4269109b6e"} + org.clojure/tools.namespace {:mvn/version "1.0.0"} + integrant/repl {:mvn/version "0.3.2"} + aero/aero {:mvn/version "1.1.6"} org.clojure/tools.logging {:mvn/version "0.5.0-alpha"} diff --git a/examples/petstore/dev/dev.clj b/examples/petstore/dev/dev.clj index 596dc49..b814416 100644 --- a/examples/petstore/dev/dev.clj +++ b/examples/petstore/dev/dev.clj @@ -2,6 +2,6 @@ (ns dev (:require - [dev-extras :refer :all])) + [io.dominic.wedge.dev :refer :all])) ;; Add your helpers here diff --git a/examples/petstore/dev/io/dominic/wedge/system-config.edn b/examples/petstore/dev/io/dominic/wedge/system-config.edn new file mode 100644 index 0000000..6a7c0a3 --- /dev/null +++ b/examples/petstore/dev/io/dominic/wedge/system-config.edn @@ -0,0 +1,2 @@ +{:system io.dominic.wedge.integrant-aero + :dev {:profile :dev}} diff --git a/examples/petstore/dev/user.clj b/examples/petstore/dev/user.clj new file mode 100644 index 0000000..b1c708b --- /dev/null +++ b/examples/petstore/dev/user.clj @@ -0,0 +1,3 @@ +(ns user + (:require + [io.dominic.wedge.user :refer :all])) diff --git a/examples/petstore/src/config.edn b/examples/petstore/src/config.edn index bac5e2b..d776bc2 100644 --- a/examples/petstore/src/config.edn +++ b/examples/petstore/src/config.edn @@ -21,7 +21,7 @@ :client-id "926c11b0-13ce-0138-8f1d-0a2a13b62018140139" :client-secret "ac41d73df09841ddeda710ac7bf6861d8b7ab371536a435f45e3e0b61291c810"}} - :openid-provider #ref [:openid-providers #_"cognito" "keycloak"] + :openid-provider #ref [:openid-providers #_"cognito" #_"keycloak" "google"] :ig/system {:juxt.apex.examples.petstore.api-server/jetty diff --git a/examples/tutorial/deps.edn b/examples/tutorial/deps.edn index cb6b87c..c6a2208 100644 --- a/examples/tutorial/deps.edn +++ b/examples/tutorial/deps.edn @@ -26,17 +26,14 @@ {:dev {:extra-paths ["dev" "test"] :jvm-opts ["-XX:-OmitStackTraceInFastThrow"] - :override-deps {juxt.edge/logging.dev {:local/root "dev/logging"}} + :override-deps {com.stuartsierra/log.dev {:mvn/version "0.2.0"}} :extra-deps - {juxt.edge/lib.app.dev - {:git/url "https://github.com/juxt/edge.git" - :sha "b5f853ad71743382462f7e06f144687523211bc7" - :deps/root "lib/edge.app.dev"} - - juxt.edge/lib.app.logging - {:git/url "https://github.com/juxt/edge.git" - :sha "b5f853ad71743382462f7e06f144687523211bc7" - :deps/root "lib/edge.app.logging"} + {io.dominic/wedge {:mvn/version "0.6.0"} + io.dominic/wedge-mise {:git/url "https://git.sr.ht/~severeoverfl0w/wedge-mise" + :sha "670720d43c24495284dcce1db98cdd4269109b6e"} + org.clojure/tools.namespace {:mvn/version "1.0.0"} + integrant/repl {:mvn/version "0.3.2"} + aero/aero {:mvn/version "1.1.6"} org.clojure/tools.logging {:mvn/version "0.5.0-alpha"} diff --git a/examples/tutorial/dev/dev.clj b/examples/tutorial/dev/dev.clj index 7f2961a..ae08b6d 100644 --- a/examples/tutorial/dev/dev.clj +++ b/examples/tutorial/dev/dev.clj @@ -2,4 +2,4 @@ (ns dev (:require - [dev-extras :refer :all])) + [io.dominic.wedge.dev :refer :all])) diff --git a/examples/tutorial/dev/io/dominic/wedge/system-config.edn b/examples/tutorial/dev/io/dominic/wedge/system-config.edn new file mode 100644 index 0000000..6a7c0a3 --- /dev/null +++ b/examples/tutorial/dev/io/dominic/wedge/system-config.edn @@ -0,0 +1,2 @@ +{:system io.dominic.wedge.integrant-aero + :dev {:profile :dev}} diff --git a/examples/tutorial/dev/user.clj b/examples/tutorial/dev/user.clj new file mode 100644 index 0000000..d61ebf6 --- /dev/null +++ b/examples/tutorial/dev/user.clj @@ -0,0 +1,3 @@ +(ns user + (:require + [io.dominic.wedge.user :refer :all]))