Commit graph

915 commits

Author SHA1 Message Date
Jean Niklas L'orange
4859747b16 Allow ^:displace'ing clojure dep in :repl profile
This is a temporary workaround, as this doesn't work for tools.nrepl nor
clojure-complete. Gurr.
2015-08-08 15:33:52 +02:00
Jean Niklas L'orange
08c8a9d53f Allow tools.nrepl and cc to be project deps again
Fixes #1748.
2015-08-08 03:09:33 +02:00
Phil Hagelberg
2ea050fc67 Merge pull request #1941 from towler73/master
added fix for components.xml merging.  If the description tag contain…
2015-07-30 08:45:16 +07:00
Jean Niklas L'orange
ffa700f946 Replace old HttpWagon conn-mngr setup. Fixes #1746
Bumping HttpWagon from 2.4 to 2.6 caused old methods in HttpWagon to
disappear, and along with it all the old Apache Http stuff we depended
on. This caused additional CA certificates provided in :certificates to
make Lein just fall on the floor and die.

This bumps HttpWagon to 2.9 and refactors Apache Http usage to
non-deprecated usage for the version we depend on.
2015-07-26 22:12:01 +02:00
Yannick Scherer
da574d7b4c add simple test for certificate processing.
Signed-off-by: Jean Niklas L'orange <jeannikl@hypirion.com>
2015-07-26 19:03:38 +02:00
Brett Morgan
79f0d3a99a added fix for components.xml merging. If the description tag contained embedded html, it needs to be escaped in the resulting merged components.xml. 2015-07-23 11:12:07 -04:00
Stephen Nelson
f413b6d73f Add support for reader conditional files (cljc)
Clojure 1.7.0 will add support for reader conditionals:

http://dev.clojure.org/display/design/Reader+Conditionals

This patch adds reader conditional support to leiningen, in particular for
compilation (including aot and stale files) and testing.
2015-07-19 08:52:49 +12:00
Stephen Nelson
6e0ebc20f7 Upgrade clojure dependency to 1.7.0 2015-07-16 15:11:01 +12:00
Jean Niklas L'orange
4ab6de9b9c Bump nrepl dependency. 2015-07-09 15:32:01 +02:00
Or Neeman
a1c4cb2d94 Refactor main/drop-partial-args 2015-04-23 12:58:03 -06:00
Jean Niklas L'orange
ff84da6972 Chas isn't wasting time, I can tell you that. 2015-03-24 21:56:17 +01:00
Jean Niklas L'orange
80c84f3dff Fix docstrings for checkout functions.
[ci skip]
2015-03-22 02:28:24 +01:00
Jean Niklas L'orange
17a32dd510 Merge pull request #1842 from avasenin/read-checkouts
Move read-checkouts to project module and make it public
2015-03-22 01:58:19 +01:00
solicode
4b7f6667a3 Ensure gpg outputs English messages 2015-03-22 04:01:58 +09:00
Jean Niklas L'orange
00e158f6f3 Bump standalone nrepl version as well, ref #1861. 2015-03-21 00:37:46 +01:00
Jean Niklas L'orange
c35a1de4f0 Avoid wrapping shell pipes in writers, fixes #1857
The fix is actually very easy: Instead of piping stuff into a reader,
then feed it to *out*/*err* via a writer, we directly hook them to
System.out and System.err.

The problem is that it kills many tests that rely on `with-out-str`, so
we have to include `with-system-err/out-str` macros to catch
sysout/syserr data, and replace usage where tests fail.
2015-03-21 00:12:26 +01:00
Andrey Vasenin
2b1f06880f Move read-checkouts to project module and make it public 2015-02-24 15:58:37 +06:00
Jean Niklas L'orange
6b8e74eaee Bump nrepl version, fixes #1829. 2015-02-10 20:40:33 +01:00
Jean Niklas L'orange
f4cb405781 Merge pull request #1807 from brandonbloom/into-strings
Be explicit about array type.
2015-01-23 19:53:30 +01:00
Brandon Bloom
3282434f19 Be explicit about array type. 2015-01-23 13:29:25 -05:00
Phil Hagelberg
7aef5c3cfc Bump version to 2.5.2-SNAPSHOT.
[ci skip]
2015-01-09 09:55:40 -08:00
Phil Hagelberg
b630fa37b8 Release 2.5.1 2015-01-09 09:47:16 -08:00
Phil Hagelberg
26dff1929c Don't pass through :doc on alias metadata propagation.
It's likely that the alias vector provides additional arguments that
change the semantics of the invocation, so blindly propagating the
docstring would be misleading.
2014-12-05 09:25:18 -08:00
Phil Hagelberg
b4ed2564d5 Merge pull request #1769 from RyanMcG/fix-pass-through-help-on-vector-aliases
Fix pass-through-help on vector aliases by merging meta on aliases
2014-12-05 09:04:07 -08:00
Jean Niklas L'orange
d0ef5cbf1c Improve with-write-permissions macro. 2014-12-02 11:58:01 +01:00
Ryan McGowan
02c9f3134a Merge meta on aliases.
This fixes pass-through-help when used on vector valued aliases. Ex:

    :aliases {"a" ^:pass-through-help ["run" "-m" "some.core"]
              "b" ^:any-meta ["a"]}

The meta on task b will be `{:pass-through-help true, :any-meta true}`.
2014-12-01 20:06:24 -08:00
Max Prokopiev
5b2d994032 Add with-write-permissions macro and use it in leiningen.jar/jar to check for correct permissions 2014-10-27 12:58:22 +03:00
Jim Crossley
59ff0e61bf Don't change order of included profiles; fixes #1740 2014-10-24 16:06:27 -04:00
Phil Hagelberg
481be7460d Merge pull request #1732 from cprice404/bug/1695-repository-replace
Fix support for `^:replace` metadata on `:repositories` (fixes #1695)
2014-10-23 15:17:53 -07:00
Phil Hagelberg
0f71e1b645 Expose version-satisfies?. Shouldn't be internal. 2014-10-23 14:41:07 -07:00
Chris Price
403e96a51e (#1695) Respect priority when merging defaults
This commit adds an extra condition at the beginning of the
`setup-map-defaults` function, such that if one of the two
items being merged has a higher priority than the other,
it is honored.

This seems to fix the issue where the `^:replace` metadata
was not working properly
2014-10-18 15:44:54 -07:00
Chris Price
1354f15877 (#1695) Add failing test for repository replace
As described in #1695, the `^:replace` metadata for the
`:repositories` section of the project file stopped working
around 2.4.0 (commit 17e91e6).

This commit adds a failing test that illustrates the
behavior.
2014-10-18 15:24:53 -07:00
Phil Hagelberg
fa64351359 Merge pull request #1704 from hugoduncan/feature/add-task-profile-meta
Allow multiple repl task profiles
2014-10-11 20:12:43 -07:00
Phil Hagelberg
37f3c2535f Merge pull request #1696 from hugoduncan/fix-profiles-on-aliases
Fix with-profile alias changes
2014-10-11 20:10:02 -07:00
Dante Briones
ba2588de28 Bump to version 2.7 (latest) of Maven wagon-http. 2014-10-07 10:15:08 -07:00
Dante Briones
15f6832813 Upgrade wagon-http to version 2.6 2014-10-03 15:26:47 -07:00
Jean Niklas L'orange
93400c7a00 Merge pull request #1705 from dthume/RemovePrintlnFromGitFileContents
Remove println from leiningen.core.utils/git-file-contents
2014-09-22 13:22:57 +02:00
Jean Niklas L'orange
9cbb7df75a Back to snapshot. 2014-09-22 13:19:10 +02:00
David Thomas Hume
903dfd824f Remove println 2014-09-22 09:50:55 +01:00
Hugo Duncan
e946ad112f Allow multiple repl task profiles
The :repl profile does not compose well when specified in both
project.clj and profiles.clj files.

Merge all profiles with ^:repl metadata in the repl task.  This allows
multiple profiles to be applied for the repl task.
2014-09-21 10:19:04 -04:00
Hugo Duncan
7baeb2bce5 Add profiles-with-matching-meta
Function to return a sequence of profile keywords for all project
profiles with metadata matching a predicate.
2014-09-21 10:17:37 -04:00
Hugo Duncan
3150dc0fd8 Preserve metadata on profiles from profiles.clj
Preserve any metadata on profile maps specified in project.clj files.
2014-09-21 10:06:09 -04:00
Hugo Duncan
c2cc98e660 Add tests for with-profile 2014-09-16 09:16:13 -04:00
Hugo Duncan
d684019b46 Factor out default-project
Pulls the default project used when not in a directory into a separate
function, so it can be used in tests.
2014-09-16 09:16:12 -04:00
Phil Hagelberg
c78a8110a8 Release 2.5.0 2014-09-14 21:26:56 -07:00
Phil Hagelberg
7cca27e54a Depend directly on nrepl/clojure-complete.
[ci skip]
2014-09-14 20:52:09 -07:00
Jean Niklas L'orange
9e980b0f8a Bump nREPL version to 0.2.6 2014-09-15 01:26:18 +02:00
Jean Niklas L'orange
c362ae4bc2 Merge pull request #1691 from technomancy/fix-erroneous-shell-command-form
Fix negation in shell-command form.
2014-09-14 01:29:15 +02:00
Jean Niklas L'orange
2c8c5dcb5f Fix erroneous shell command form, fixes #1683. 2014-09-13 16:11:59 +02:00
Phil Hagelberg
23a772bfc2 Uberjar profile needs to be leaky too. 2014-09-10 16:25:25 -07:00