From 4805555417a62844f7e89f68f8d136677a1317be Mon Sep 17 00:00:00 2001 From: Tommi Reiman Date: Thu, 26 Oct 2017 19:25:09 +0300 Subject: [PATCH] Initial module split * metosin/reitit (all) * metosin/reitit-core (just the router) * metosin/reitit-ring (the ring stuff) --- .deps-versions.clj | 1 + lein-modules | 12 ++++++++++++ modules/reitit-core/project.clj | 7 +++++++ {src => modules/reitit-core/src}/reitit/core.cljc | 0 {src => modules/reitit-core/src}/reitit/impl.cljc | 0 {src => modules/reitit-core/src}/reitit/spec.cljc | 0 modules/reitit-ring/project.clj | 7 +++++++ .../reitit-ring/src}/reitit/coercion.cljc | 0 .../reitit-ring/src}/reitit/coercion/protocol.cljc | 0 .../reitit-ring/src}/reitit/coercion/spec.cljc | 0 .../reitit-ring/src}/reitit/middleware.cljc | 0 {src => modules/reitit-ring/src}/reitit/ring.cljc | 0 project.clj | 13 ++++++++----- 13 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 .deps-versions.clj create mode 100755 lein-modules create mode 100644 modules/reitit-core/project.clj rename {src => modules/reitit-core/src}/reitit/core.cljc (100%) rename {src => modules/reitit-core/src}/reitit/impl.cljc (100%) rename {src => modules/reitit-core/src}/reitit/spec.cljc (100%) create mode 100644 modules/reitit-ring/project.clj rename {src => modules/reitit-ring/src}/reitit/coercion.cljc (100%) rename {src => modules/reitit-ring/src}/reitit/coercion/protocol.cljc (100%) rename {src => modules/reitit-ring/src}/reitit/coercion/spec.cljc (100%) rename {src => modules/reitit-ring/src}/reitit/middleware.cljc (100%) rename {src => modules/reitit-ring/src}/reitit/ring.cljc (100%) diff --git a/.deps-versions.clj b/.deps-versions.clj new file mode 100644 index 00000000..cf72ad42 --- /dev/null +++ b/.deps-versions.clj @@ -0,0 +1 @@ +(def reitit-version "0.1.0-SNAPSHOT") diff --git a/lein-modules b/lein-modules new file mode 100755 index 00000000..2ed0c9ae --- /dev/null +++ b/lein-modules @@ -0,0 +1,12 @@ +#!/bin/bash + +# A script that walks the tree of Leiningen projects and does $* on them +# original: https://github.com/juxt/yada/blob/master/treelein + +# Modules +for ext in reitit-core reitit-ring; do + cd modules/$ext; lein $*; cd ../..; + done + +# Core +lein $* diff --git a/modules/reitit-core/project.clj b/modules/reitit-core/project.clj new file mode 100644 index 00000000..0bccf5d2 --- /dev/null +++ b/modules/reitit-core/project.clj @@ -0,0 +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" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[meta-merge "1.0.0"]]) diff --git a/src/reitit/core.cljc b/modules/reitit-core/src/reitit/core.cljc similarity index 100% rename from src/reitit/core.cljc rename to modules/reitit-core/src/reitit/core.cljc diff --git a/src/reitit/impl.cljc b/modules/reitit-core/src/reitit/impl.cljc similarity index 100% rename from src/reitit/impl.cljc rename to modules/reitit-core/src/reitit/impl.cljc diff --git a/src/reitit/spec.cljc b/modules/reitit-core/src/reitit/spec.cljc similarity index 100% rename from src/reitit/spec.cljc rename to modules/reitit-core/src/reitit/spec.cljc diff --git a/modules/reitit-ring/project.clj b/modules/reitit-ring/project.clj new file mode 100644 index 00000000..f8e9a625 --- /dev/null +++ b/modules/reitit-ring/project.clj @@ -0,0 +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" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[metosin/reitit-core ~reitit-version]]) diff --git a/src/reitit/coercion.cljc b/modules/reitit-ring/src/reitit/coercion.cljc similarity index 100% rename from src/reitit/coercion.cljc rename to modules/reitit-ring/src/reitit/coercion.cljc diff --git a/src/reitit/coercion/protocol.cljc b/modules/reitit-ring/src/reitit/coercion/protocol.cljc similarity index 100% rename from src/reitit/coercion/protocol.cljc rename to modules/reitit-ring/src/reitit/coercion/protocol.cljc diff --git a/src/reitit/coercion/spec.cljc b/modules/reitit-ring/src/reitit/coercion/spec.cljc similarity index 100% rename from src/reitit/coercion/spec.cljc rename to modules/reitit-ring/src/reitit/coercion/spec.cljc diff --git a/src/reitit/middleware.cljc b/modules/reitit-ring/src/reitit/middleware.cljc similarity index 100% rename from src/reitit/middleware.cljc rename to modules/reitit-ring/src/reitit/middleware.cljc diff --git a/src/reitit/ring.cljc b/modules/reitit-ring/src/reitit/ring.cljc similarity index 100% rename from src/reitit/ring.cljc rename to modules/reitit-ring/src/reitit/ring.cljc diff --git a/project.clj b/project.clj index cff31f7a..d941c35b 100644 --- a/project.clj +++ b/project.clj @@ -1,17 +1,20 @@ -(defproject metosin/reitit "0.1.0-SNAPSHOT" +(load-file ".deps-versions.clj") +(defproject metosin/reitit reitit-version :description "Snappy data-driven router for Clojure(Script)" :url "https://github.com/metosin/reitit" :license {:name "Eclipse Public License" - :url "http://www.eclipse.org/legal/epl-v10.html" - :distribution :repo - :comments "same as Clojure"} + :url "http://www.eclipse.org/legal/epl-v10.html"} :test-paths ["test/clj" "test/cljc"] :deploy-repositories [["releases" :clojars]] :codox {:output-path "doc" :source-uri "https://github.com/metosin/reitit/{version}/{filepath}#L{line}" :metadata {:doc/format :markdown}} - :dependencies [[meta-merge "1.0.0"]] + :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"]