From 559167bd5bc5a42f4ab22573ef81408a760ed5c5 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Wed, 29 Jan 2020 20:43:01 +0000 Subject: [PATCH] Fixed bug when serving data from jar file --- project.clj | 18 +++++++++++++++++- src/clj/geocsv/routes/rest.clj | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 7916487..e1e6f68 100644 --- a/project.clj +++ b/project.clj @@ -56,6 +56,9 @@ [lein-codox "0.10.7"] [lein-release "1.0.5"]] + :deploy-repositories [["releases" :clojars] + ["snapshots" :clojars]] + :clean-targets ^{:protect false} [:target-path [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]] :figwheel @@ -141,4 +144,17 @@ } :profiles/dev {} - :profiles/test {}}) + :profiles/test {}} + + ;; `lein release` doesn't play nice with `git flow release`. Run `lein release` in the + ;; `develop` branch, then reset the `master` branch to the release tag. + + :release-tasks [["vcs" "assert-committed"] + ["clean"] + ["codox"] + ["change" "version" "leiningen.release/bump-version" "release"] + ["vcs" "commit"] + ["uberjar"] + ["deploy" "clojars"] + ["change" "version" "leiningen.release/bump-version"] + ["vcs" "commit"]]) diff --git a/src/clj/geocsv/routes/rest.clj b/src/clj/geocsv/routes/rest.clj index c2d6fe7..165dc15 100644 --- a/src/clj/geocsv/routes/rest.clj +++ b/src/clj/geocsv/routes/rest.clj @@ -72,7 +72,7 @@ "Return JSON formatted data taken from the CSV file with the name `filename` in the directory `resources/public/data`." [filename] - (-> (str "public/data/" filename) io/resource io/file io/reader csv->json)) + (-> (str "public/data/" filename) io/resource io/reader csv->json)) (defn get-data "Return JSON formatted data from the source implied by this `request`."