Skip to content

Commit

Permalink
Remove project prepping from lein-jank
Browse files Browse the repository at this point in the history
  • Loading branch information
jeaye committed May 11, 2024
1 parent 014d7c5 commit 5a949c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 18 deletions.
8 changes: 4 additions & 4 deletions lein-jank/project.clj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(defproject lein-jank "0.0.1-SNAPSHOT"
(defproject org.jank-lang/lein-jank "0.0.1-SNAPSHOT"
:description "Build your jank projects using leiningen."
:url "https://jank-lang.org/"
:license {:name "MPL 2.0"
:url "https://www.mozilla.org/en-US/MPL/2.0/"}
:dependencies [[babashka/fs "0.4.9"]
[babashka/process "0.5.21"]
[leiningen-core "2.10.0"]]
:dependencies [[babashka/fs "0.5.20"]
[babashka/process "0.5.22"]
[leiningen-core "2.11.2"]]
:eval-in-leiningen true)
15 changes: 1 addition & 14 deletions lein-jank/src/leiningen/jank.clj
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,6 @@
(map ->absolute-path)
(concat lein-paths)))

(defn prep-project [{jank-project :jank
:as project}]
(-> project
(dissoc :jank)
; TODO: Needed?
(update :source-paths #(concat-project-paths % (:source-paths jank-project)))
(update :test-paths #(concat-project-paths % (:test-paths jank-project)))
(update :resource-paths #(concat-project-paths % (:resource-paths jank-project)))
(assoc :compile-path (when-let [compile-path (:compile-path jank-project)]
(->absolute-path compile-path)))
(update :dependencies #(concat-project-paths % (:dependencies jank-project)))
(assoc :main (:main jank-project))))

(defn run-main [project classpath & args]
(apply ps/shell
{:continue true
Expand Down Expand Up @@ -88,7 +75,7 @@
"Compile, run and repl into jank"
[project subcmd & args]
(if-some [handler (subtask-kw->var (keyword subcmd))]
(apply handler (prep-project project) args)
(apply handler project args)
(do
(lmain/warn "Invalid subcommand!")
(print-help))))

0 comments on commit 5a949c7

Please sign in to comment.