Skip to content

Commit d3bca93

Browse files
Upgrade mranderson to 0.5.0
mranderson 0.5.x specific config added to the project file as well. Using resolved tree mode. This means that mranderson works with a resolved dependency tree and does not create a deeply nested directory structure, only adds prefixes to all dependencies. Handles all depedendencies as first level ones and processes them in a topological order. Add project prefix in the project file and other config for unresolved tree mode in case we want to switch to that in the near future
1 parent 27d55f0 commit d3bca93

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
.PHONY: source-deps test release deploy clean
1+
.PHONY: inline-deps test release deploy clean
22

33
VERSION ?= 1.10
44

5-
.source-deps:
6-
lein source-deps
7-
touch .source-deps
5+
.inline-deps:
6+
lein inline-deps
7+
touch .inline-deps
88

9-
source-deps: .source-deps
9+
inline-deps: .inline-deps
1010

11-
test: .source-deps
11+
test: .inline-deps
1212
lein with-profile +$(VERSION),+plugin.mranderson/config test
1313

1414
cljfmt:
@@ -32,4 +32,4 @@ deploy:
3232

3333
clean:
3434
lein clean
35-
rm -f .source-deps
35+
rm -f .inline-deps

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ contains among other things a full stacktrace.
318318

319319
To work with `mranderson` the first thing to do is:
320320

321-
`lein do clean, source-deps :prefix-exclusions "[\"classlojure\"]"`
321+
`lein do clean, inline-deps`
322322

323323
this creates the munged local dependencies in target/srcdeps directory
324324

@@ -349,6 +349,8 @@ Or alternatively run
349349

350350
build.sh cleans, runs source-deps with the right parameters, runs the tests and then runs the provided lein target.
351351

352+
You can also use a Makefile now: `make clean && make test` for example.
353+
352354
## Changelog
353355

354356
An extensive changelog is available [here](CHANGELOG.md).

build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function check_result {
99
fi
1010
}
1111

12-
lein do clean, source-deps :prefix-exclusions "[\"classlojure\"]"
12+
lein do clean, inline-deps
1313
check_result
1414
lein with-profile +plugin.mranderson/config test
1515
check_result

project.clj

+7-8
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,10 @@
77
^:source-dep [http-kit "2.3.0"]
88
^:source-dep [cheshire "5.8.0"]
99
^:source-dep [org.clojure/tools.analyzer.jvm "0.7.1"]
10-
^:source-dep [org.clojure/tools.namespace "0.3.0-alpha3"]
11-
;; Not used directly in refactor-nrepl, but needed because of tool.namespace
12-
;; and the way MrAnderson processes dependencies
13-
;; See https://github.com/clojure-emacs/cider/issues/2176 for details
14-
^:source-dep [org.clojure/java.classpath "0.2.3"]
10+
^:source-dep [org.clojure/tools.namespace "0.3.0-alpha3" :exclusions [org.clojure/tools.reader]]
1511
^:source-dep [org.clojure/tools.reader "1.1.1"]
1612
^:source-dep [cider/orchard "0.3.0"]
17-
^:source-dep [lein-cljfmt "0.3.0"]
13+
^:source-dep [cljfmt "0.6.3"]
1814
^:source-dep [me.raynes/fs "1.4.6"]
1915
^:source-dep [rewrite-clj "0.6.0"]
2016
^:source-dep [cljs-tooling "0.2.0"]
@@ -23,7 +19,10 @@
2319
:username :env/clojars_username
2420
:password :env/clojars_password
2521
:sign-releases false}]]
26-
:plugins [[thomasa/mranderson "0.4.8"]]
22+
:plugins [[thomasa/mranderson "0.5.0"]]
23+
:mranderson {:project-prefix "refactor.inlined-deps"
24+
:expositions [[org.clojure/tools.analyzer.jvm org.clojure/tools.analyzer]]
25+
:unresolved-tree false}
2726
:filespecs [{:type :bytes :path "refactor-nrepl/refactor-nrepl/project.clj" :bytes ~(slurp "project.clj")}]
2827
:profiles {:provided {:dependencies [[cider/cider-nrepl "0.18.0"]
2928
[org.clojure/clojure "1.8.0"]]}
@@ -38,7 +37,7 @@
3837
:1.10 {:dependencies [[org.clojure/clojure "1.10.0"]
3938
[org.clojure/clojurescript "1.10.63"]]}
4039
:dev {:plugins [[jonase/eastwood "0.2.0"]]
41-
:global-vars {*warn-on-reflection* true}
40+
;:global-vars {*warn-on-reflection* true}
4241
:dependencies [[org.clojure/clojurescript "1.9.89"]
4342
[cider/piggieback "0.3.8"]
4443
[leiningen-core "2.7.1"]

0 commit comments

Comments
 (0)