From bedaf15e7796ffbdbfce27fc8066ecc6689615b9 Mon Sep 17 00:00:00 2001 From: jiyinyiyong Date: Fri, 6 Mar 2020 20:58:07 +0800 Subject: [PATCH] switching to deps-library --- .github/workflows/deploy.yaml | 2 +- .gitignore | 1 + deps.edn | 18 +++++++++++------- package.json | 3 +-- pom.xml | 31 ------------------------------- release.edn | 5 +++++ 6 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 pom.xml create mode 100644 release.edn diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 4b3c6b5..10a5a9d 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -44,4 +44,4 @@ jobs: - run: echo Working on ${{ github.ref }} - name: deploy to clojars - run: clojure -A:depstar && env CLOJARS_USERNAME=jiyinyiyong CLOJARS_PASSWORD=${{ secrets.CLOJARS_PASSWORD }} clojure -A:deploy + run: env CLOJARS_USERNAME=jiyinyiyong CLOJARS_PASSWORD=${{ secrets.CLOJARS_PASSWORD }} clojure -A:release diff --git a/.gitignore b/.gitignore index b430887..257a98c 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ .nrepl-port .DS_Store +pom.xml diff --git a/deps.edn b/deps.edn index 57c3115..698d29e 100644 --- a/deps.edn +++ b/deps.edn @@ -1,8 +1,12 @@ -{:paths ["src"] - :aliases {:depstar {:extra-deps {seancorfield/depstar {:mvn/version "0.5.2"}} - :main-opts ["-m" "hf.depstar.jar" "target/lilac.jar"]} - :deploy {:extra-deps {deps-deploy {:mvn/version "RELEASE"}} - :main-opts ["-m" "deps-deploy.deps-deploy" "deploy" "target/lilac.jar"]} - :install {:extra-deps {deps-deploy {:mvn/version "RELEASE"}} - :main-opts ["-m" "deps-deploy.deps-deploy" "install" "target/lilac.jar"]}}} +{ + :paths ["src"] + :aliases { + :release { + :extra-deps { + appliedscience/deps-library {:mvn/version "0.3.2"} + } + :main-opts ["-m" "deps-library.release"] + } + } +} diff --git a/package.json b/package.json index 25e938f..b6df283 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,7 @@ "description": "ClojureScript workflow using Calcit Editor", "main": "index.js", "scripts": { - "m2": "clojure -A:depstar && clojure -A:install", - "deploy": "clojure -A:depstar && clojure -A:deploy", + "deploy": "clj -A:release", "watch": "shadow-cljs watch client", "serve": "http-server dist -s", "build-cdn": "shadow-cljs clj-run build.main/build-cdn", diff --git a/pom.xml b/pom.xml deleted file mode 100644 index cf2fd2a..0000000 --- a/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - mvc-works - calcit-workflow - 0.0.1-a1 - calcit-workflow - - https://github.com/mvc-works/calcit-workflow - TODO - - https://github.com/mvc-works/calcit-workflow - - - - - org.clojure - clojure - 1.10.1 - - - - src - - - - clojars - https://repo.clojars.org/ - - - diff --git a/release.edn b/release.edn new file mode 100644 index 0000000..3a047f5 --- /dev/null +++ b/release.edn @@ -0,0 +1,5 @@ +{:version "0.0.1" + :group-id "mvc-works" + :artifact-id "calcit-workflow" + :skip-tag true + :scm-url "https://github.com/mvc-works/calcit-workflow"}