Commit graph

3796 commits

Author SHA1 Message Date
Phil Hagelberg
bc69a1212d Merge pull request #1700 from circlespainter/circlespainter-manifest-sections
Manifest sections support
2014-10-11 20:08:31 -07:00
Phil Hagelberg
7b68061366 Merge pull request #1709 from hugoduncan/allow-all-non-default-profiles-in-jar
Fix inclusion of explicitly added profiles in jar
2014-10-11 20:04:53 -07:00
Florian Anderiasch
f325f226d1 Merge pull request #1727 from winks/fix-warning
Remove debug line when calling `lein deps`
2014-10-10 19:20:17 +02:00
Florian Anderiasch
553a94861e Remove debug line when calling lein deps 2014-10-10 19:08:20 +02:00
Jean Niklas L'orange
ca3b505905 Merge pull request #1723 from dbriones/upgrade-wagon-http
Upgrade `wagon-http` to version 2.7
2014-10-07 19:32:00 +02: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
05f958d0aa Merge pull request #1716 from sindux/bugfix/1702-lein-self-install-broken
Fix broken lein self-install
2014-10-02 16:06:06 +02:00
Sindunata Sudarmaji
fa0556d6ed Fix broken lein self-install 2014-09-29 22:51:36 +09:00
Jean Niklas L'orange
26a3abe841 Merge pull request #1711 from cortextual/master
fix typo: had ben -> had been
2014-09-26 00:16:58 +02:00
Andrew D. Ball
b0c725a43f fix typo: had ben -> had been 2014-09-25 16:35:56 -05:00
Hugo Duncan
bb0b132894 Fix inclusion of explicitly added profiles in jar
Closes #1701
2014-09-25 12:48:44 -04:00
Phil Hagelberg
19085004ef Merge pull request #1707 from jbence/feature/fix-script-env-value
Avoid setting SCRIPT to empty string
2014-09-24 11:12:55 -07:00
James Bence
7fb710c8a6 Avoid setting SCRIPT to empty string 2014-09-24 09:50:47 -07:00
Tim McCormack
5b089a024b Merge branch 'test-1676-fie-encoding' 2014-09-23 13:11:57 -04:00
Tim McCormack
810deb59bc Merge branch 'no-inst' 2014-09-23 12:20:00 -04:00
Tim McCormack
225e24b2c5 Add regression test for file.encoding override 2014-09-23 09:29:26 -04:00
circlespainter
3471153cf3 leiningen.test.jar now covers array-of-pairs maps and sections 2014-09-23 03:05:25 +02: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
circlespainter
ff6197bc60 More readable and consistent spacing 2014-09-19 13:11:18 +02:00
Fabio Tudone
72c0d04f51 Manifest sections example & doc 2014-09-18 21:05:11 +02:00
Fabio Tudone
04e4c49dc2 Manifest sections example & doc 2014-09-18 21:03:05 +02:00
Fabio Tudone
bd6d25b323 Implemented non-map manifest and sections 2014-09-18 21:01:36 +02:00
Tim McCormack
ef4e459824 Use SimpleDateFormat instead of #inst (flaky)
#inst was failing when run as `lein test`, but not if I ran
`lein test leiningen.test.keys`. Something's screwy with
data-readers.
2014-09-15 17:02:40 -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
Phil Hagelberg
284c79c24c Merge pull request #1688 from hugoduncan/fix-jar-refactoring
Fix jar task broken by 87c3499
2014-09-14 20:34:23 -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
c6cfe88db7 Merge pull request #1689 from hugoduncan/fix-with-profile-aliases
Fix aliasing recursion with with-profile
2014-09-15 01:03:31 +02:00
Jean Niklas L'orange
11c0364302 Remove base dependencies for lein checkouts.
Closes #1629.
2014-09-14 15:07:00 +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
fb33a9506e Set env var if .lein-fast-trampoline exists.
Makes it possible to just use LEIN_FAST_TRAMPOLINE in the Lein process,
to check if the user is using fast trampolining. Strictly speaking, one
previously had to check whether LEIN_FAST_TRAMPOLINE was set or check
that .lein-fast-trampoline existed inside Lein.
2014-09-14 01:22:31 +02:00
Hugo Duncan
0334cc8efa Fix aliasing recursion with with-profile
If an alias uses with-profile, then the alias was not being handled
correctly, causing a stack overflow.

e.g

    {:user {"plz" ["with-profile" "+plz" "plz"]}
     :plz {:plugins [[lein-plz "0.2.1"]]}}

    lein plz
2014-09-13 15:49:36 -04:00
Jean Niklas L'orange
2c8c5dcb5f Fix erroneous shell command form, fixes #1683. 2014-09-13 16:11:59 +02:00
Hugo Duncan
4a86c4f687 Fix jar task broken by 87c3499
The :provided scope profiles were not being captured before un-merging
profiles.
2014-09-13 08:49:29 -04:00
Phil Hagelberg
87c3499d3a Merge remote-tracking branch 'hugoduncan/fix-classifier-jars' 2014-09-12 17:24:47 -07:00
Phil Hagelberg
a625cf4f1a Release lein-pprint 1.1.2, allows running outside projects. 2014-09-12 10:37:53 -07:00
Phil Hagelberg
27c2e6fb24 Allow update-in task to run outside projects.
Fixes #1687.
2014-09-12 10:36:31 -07:00
Phil Hagelberg
23a772bfc2 Uberjar profile needs to be leaky too. 2014-09-10 16:25:25 -07:00
Hugo Duncan
bcb4e5af21 Propagate metadata on composite profiles
When metadata is specified on a composite profile, propagate the
metadata to the profiles it is composed of.
2014-09-10 07:00:36 -04:00
Phil Hagelberg
9def660852 Bump to 2.5.0-SNAPSHOT. 2014-09-09 16:26:47 -07:00
Phil Hagelberg
3f373ee918 A few documentation changes. 2014-09-09 16:25:46 -07:00
Phil Hagelberg
9a0448041a Rename :core-default to :leiningen/default. 2014-09-09 16:24:12 -07:00
Phil Hagelberg
60bb8e406e Merge remote-tracking branch 'hugoduncan/feature/annotated-profiles' 2014-09-09 15:43:40 -07:00
Hugo Duncan
2da05e6356 Add profile metadata
Adds :leaky and :pom-scope metadata for profiles.  The :dev, :test,
:base and :provided profiles are implemented in terms of these.

Profiles with :leaky metadata affect the pom and jar creation.

Profiles with a :pom-scope metadata of :test or :provided also affect
the dependencies of a pom.
2014-09-09 13:27:49 -04:00
Jean Niklas L'orange
400ad40c44 Test higher order aliases. 2014-09-09 02:13:26 +02:00
Jean Niklas L'orange
66926d3b5d Implement higher order aliases, closes #1678. 2014-09-09 02:13:18 +02:00
Phil Hagelberg
e13ccd7a5c Use plugin name for reading profiles for now.
This is for consistency with reading middleware/hooks. In the future it
might be nice to honor the group-id as well.
2014-09-08 11:17:09 -07:00