From 460ba5ecc0076f860189642035f52c81d3eaed00 Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Fri, 27 Oct 2017 08:14:55 +0300 Subject: [PATCH] Fix based on Miikka's comments --- lein-modules | 8 +++++--- modules/reitit-core/project.clj | 2 +- modules/reitit-ring/project.clj | 2 +- project.clj | 5 ++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lein-modules b/lein-modules index 2ed0c9ae..f9fe5708 100755 --- a/lein-modules +++ b/lein-modules @@ -3,10 +3,12 @@ # A script that walks the tree of Leiningen projects and does $* on them # original: https://github.com/juxt/yada/blob/master/treelein +set -e + # Modules for ext in reitit-core reitit-ring; do - cd modules/$ext; lein $*; cd ../..; - done + cd modules/$ext; lein $@; cd ../..; +done # Core -lein $* +lein $@ diff --git a/modules/reitit-core/project.clj b/modules/reitit-core/project.clj index 0bccf5d2..72e9d8ef 100644 --- a/modules/reitit-core/project.clj +++ b/modules/reitit-core/project.clj @@ -1,7 +1,7 @@ (load-file "../../.deps-versions.clj") (defproject metosin/reitit-core reitit-version :description "Snappy data-driven router for Clojure(Script)" - :url "https://github.com/metosin/reitit/tree/master/modules/reitit-core" + :url "https://github.com/metosin/reitit" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[meta-merge "1.0.0"]]) diff --git a/modules/reitit-ring/project.clj b/modules/reitit-ring/project.clj index f8e9a625..59e95ff6 100644 --- a/modules/reitit-ring/project.clj +++ b/modules/reitit-ring/project.clj @@ -1,7 +1,7 @@ (load-file "../../.deps-versions.clj") (defproject metosin/reitit-ring reitit-version :description "Ring routing with reitit" - :url "https://github.com/metosin/reitit/tree/master/modules/reitit-ring" + :url "https://github.com/metosin/reitit" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[metosin/reitit-core ~reitit-version]]) diff --git a/project.clj b/project.clj index d941c35b..6353b147 100644 --- a/project.clj +++ b/project.clj @@ -13,9 +13,6 @@ :dependencies [[metosin/reitit-core ~reitit-version] [metosin/reitit-ring ~reitit-version]] - :source-paths ["modules/reitit-core/src" - "modules/reitit-ring/src"] - :plugins [[jonase/eastwood "0.2.5"] [lein-doo "0.1.8"] [lein-cljsbuild "1.1.7"] @@ -24,6 +21,8 @@ [metosin/boot-alt-test "0.4.0-20171019.180106-3"]] :profiles {:dev {:jvm-opts ^:replace ["-server"] + :source-paths ["modules/reitit-core/src" + "modules/reitit-ring/src"] :dependencies [[org.clojure/clojure "1.9.0-beta2"] [org.clojure/clojurescript "1.9.946"]