Skip to content

Commit 9b7b249

Browse files
arichiardialandipert
authored andcommitted
Fixes #596 : Strings contained in :source-paths are also appended. (#611)
* Fixes #596 : Strings contained in :source-paths are also appended. * Improve with-cp fix
1 parent e4bf63f commit 9b7b249

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
escape `%` in message to prevent errors about bad string formatting, and
1515
ensure that message ends in a newline.
1616
- Artifact upload slow because of an expensive evaluation of a debugging arguments for all calls to `transfer-listener` [#565][565] [#558][558]
17+
- With-cp does not consider source/resource paths
1718

1819
##### Tasks
1920

@@ -31,6 +32,7 @@ ensure that message ends in a newline.
3132
[565]: https://github.com/boot-clj/boot/pull/565
3233
[558]: https://github.com/boot-clj/boot/pull/558
3334
[567]: https://github.com/boot-clj/boot/pull/567
35+
[611]: https://github.com/boot-clj/boot/pull/611
3436

3537
## 2.7.1
3638

boot/core/src/boot/task/built_in.clj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,11 @@
349349
(if-let [conflicts (and safe (not-empty (dep-conflicts env)))]
350350
(throw (ex-info "Unresolved dependency conflicts." {:conflicts conflicts}))
351351
(let [resolved (pod/resolve-dependency-jars env)
352-
relative-paths (map (partial relativize local-repo) resolved)]
353-
(spit file-out (apply str (interpose ":" relative-paths))))))))))
352+
relative-paths (map (partial relativize local-repo) resolved)
353+
source-paths (:source-paths env)]
354+
(spit file-out (apply str (->> (concat source-paths relative-paths)
355+
(interpose ":")
356+
(into [])))))))))))
354357

355358
(core/deftask wait
356359
"Wait before calling the next handler.

0 commit comments

Comments
 (0)