diff --git a/.github/workflows/validation_delaguardo.yml b/.github/workflows/validation_delaguardo.yml index 0e0d092a..a59791a6 100644 --- a/.github/workflows/validation_delaguardo.yml +++ b/.github/workflows/validation_delaguardo.yml @@ -1,5 +1,9 @@ name: Commit validation - Delaguardo flavor -on: [push] +on: + push: + branches: + - main + - la jobs: clojure: strategy: diff --git a/bb.edn b/bb.edn index e9ba6177..87abb681 100644 --- a/bb.edn +++ b/bb.edn @@ -1,4 +1,4 @@ -{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.2-2-la"}} +{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.2.0-22-la"}} :paths [] :tasks {-base-deps {:doc "Dependencies for a task using bb" diff --git a/deps.edn b/deps.edn index 28678e2c..32d57d50 100644 --- a/deps.edn +++ b/deps.edn @@ -1,33 +1,26 @@ {:aliases {:antq {:deps {com.github.liquidz/antq {:mvn/version "2.9.1217"}} :main-opts ["-m" "antq.core"]} - :bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.2-2-la"}}} - :build {:extra-deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.2-2-la"}} - :ns-default build} - :cljs-deps {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"} - clj-commons/pushy #:mvn{:version "0.3.10"} + :cljs-deps {:extra-deps {clj-commons/pushy #:mvn{:version "0.3.10"} cljsjs/highlight #:mvn{:version "11.7.0-0"} com.andrewmcveigh/cljs-time #:mvn{:version "0.5.2"} com.taoensso/encore #:mvn{:version "3.62.1"} com.taoensso/sente #:mvn{:version "1.19.2"} com.taoensso/tempura #:mvn{:version "1.5.3"} - day8.re-frame/http-fx #:mvn{:version "0.2.4"} - day8.re-frame/re-frame-10x #:mvn{:version "1.9.9"} - day8.re-frame/tracing #:mvn{:version "0.6.2"} lambdaisland/uri #:mvn{:version "1.19.155"} metosin/reitit #:mvn{:version "0.7.1"} metosin/reitit-frontend #:mvn{:version "0.7.1"} - no.cjohansen/portfolio #:mvn{:version "2024.06.30"} re-frame/re-frame #:mvn{:version "1.4.3"} reagent/reagent #:mvn{:version "1.2.0"} thheller/shadow-cljs #:mvn{:version "2.28.12"}} - :extra-paths ["src/cljs/" - "src/cljc/" - "resources/" - "test/cljs/" - "test/cljc/" - "env/development/src/cljc/" - "env/development/src/cljs/"]} + :extra-paths ["src/cljs/" "src/cljc/" "resources/"]} + :cljs-dev-deps + {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"} + day8.re-frame/http-fx #:mvn{:version "0.2.4"} + day8.re-frame/re-frame-10x #:mvn{:version "1.9.9"} + day8.re-frame/tracing #:mvn{:version "0.6.2"} + no.cjohansen/portfolio #:mvn{:version "2024.06.30"}} + :extra-paths ["test/cljs/" "test/cljc/" "env/development/src/cljc/" "env/development/src/cljs/"]} :common-test {:exec-fn cognitect.test-runner.api/test :extra-deps {com.cognitect/test-runner {:git/url "https://github.com/cognitect-labs/test-runner" @@ -36,8 +29,12 @@ org.clojure/tools.reader #:mvn{:version "1.5.0"}} :extra-paths ["test/clj/" "test/cljc/" "test/resources/"] :jvm-opts ["-Dheph-conf=env/test/config.edn,env/common_config.edn" "-Dhephaistox-in-test=true"]} + :deploy {:exec-args {:installer :remote} + :exec-fn deps-deploy.deps-deploy/deploy + :extra-deps {slipset/deps-deploy {:git/url "https://github.com/Kaspazza/deps-deploy" + :sha "7b4b72d124f788c9e4a876e0ba55899fd9091f1d"}}} :env-development-repl - {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version "1.4.0-2-la"} + {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version "1.5.0-13-la"} org.clojure/core.async #:mvn{:version "1.6.681"}} :extra-paths ["env/development/resources/" "env/development/src/clj/" "env/development/src/cljc/"] @@ -62,7 +59,7 @@ metosin/reitit #:mvn{:version "0.7.1"} metosin/ring-http-response #:mvn{:version "0.9.4"} mount/mount #:mvn{:version "0.1.19"} - org.clojars.hephaistox/automaton-core #:mvn{:version "1.4.0-2-la"} + org.clojars.hephaistox/automaton-core #:mvn{:version "1.5.0-13-la"} ring-cors/ring-cors #:mvn{:version "0.1.13"} ring/ring #:mvn{:version "1.12.2"} ring/ring-anti-forgery #:mvn{:version "1.3.1"} diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 5b5db30b..00000000 --- a/pom.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - 4.0.0 - jar - org.clojars.hephaistox - automaton-web - 2.1.0-2-la - automaton-web - - - org.clojure - clojure - 1.11.4 - - - metosin - ring-http-response - 0.9.4 - - - metosin - muuntaja - 0.6.10 - - - ring - ring-ssl - 0.4.0 - - - org.clojars.hephaistox - automaton-core - 1.4.0-2-la - - - ring-cors - ring-cors - 0.1.13 - - - hiccup - hiccup - 2.0.0-RC3 - - - com.taoensso - sente - 1.19.2 - - - ring - ring-anti-forgery - 1.3.1 - - - mount - mount - 0.1.19 - - - amalloy - ring-gzip-middleware - 0.1.4 - - - metosin - reitit - 0.7.1 - - - ring - ring - 1.12.2 - - - http-kit - http-kit - 2.8.0 - - - - src/clj/ - - - - clojars - https://repo.clojars.org/ - - - - - CC BY-NC 4.0 - https://creativecommons.org/licenses/by-nc/4.0/deed.en - - - diff --git a/project.edn b/project.edn index 63375617..e2c939e4 100644 --- a/project.edn +++ b/project.edn @@ -8,4 +8,16 @@ {:name "marked"}]} :frontend {:css "resources/css/custom.css" :run-aliases [:automaton-web-portfolio :browser-test :ltest]} - :publication {:as-lib org.clojars.hephaistox/automaton-web}} + :publication + {:as-lib org.clojars.hephaistox/automaton-web + :base-branch "main" + :clojars true + :compile-jar true + :compiled-css-path "resources/public/css/compiled/styles.css" + :css-files ["resources/css/custom.css" "resources/css/main.css"] + :excluded-aliases + [:antq :codox :env-development-repl :env-development-test :common-test :cljs-dev-deps :deploy] + :la-branch "la" + :pom-xml-license {:name "CC BY-NC 4.0" + :url "https://creativecommons.org/licenses/by-nc/4.0/deed.en"} + :repo-url "git@github.com:hephaistox/automaton-web.git"}} diff --git a/shadow-cljs.edn b/shadow-cljs.edn index baaf9b34..1ed10c82 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -10,7 +10,7 @@ :ltest {:ns-regexp "-test$" :output-to "target/ltest.js" :target :karma}} - :deps {:aliases [:cljs-deps]} + :deps {:aliases [:cljs-deps :cljs-dev-deps]} :dev-http {8080 ["public" "classpath:public"] 8290 ["target/browser-test"]} :nrepl {:port 8776}} diff --git a/version.edn b/version.edn index a98fbaf3..002ef9cb 100644 --- a/version.edn +++ b/version.edn @@ -1,2 +1 @@ -;; Last generated version, note a failed push consume a number -{:version "2.1.0-2-la"} \ No newline at end of file +{:version "2.2.0-13-la"} \ No newline at end of file