Commit graph

3873 commits

Author SHA1 Message Date
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
5faada954a Check :manifest before using default :main.
Fixes #1736 and probably #1710.
2014-10-23 15:14:55 -07:00
Phil Hagelberg
e7a33e7d1c Bump stencil to 0.3.5.
Fixes #1739 and #1563.
2014-10-23 14:41:11 -07:00
Phil Hagelberg
0f71e1b645 Expose version-satisfies?. Shouldn't be internal. 2014-10-23 14:41:07 -07:00
Alan Malloy
7cbd5bfa7d Another silly flatten that could be a mapcat 2014-10-22 17:47:56 -07:00
Alan Malloy
77879b2d9e Got rid of silly uses of apply and flatten 2014-10-22 17:22:52 -07:00
Phil Hagelberg
962bc7fdba Merge pull request #1737 from jakebasile/update-test-help
Updated help text for `test`
2014-10-22 09:10:27 -07:00
Jake Basile
8cd298ce33
Updated help text for test 2014-10-22 10:17:24 -05:00
Jean Niklas L'orange
aabdba95e0 Merge pull request #1735 from martinklepsch/clarify-gpg-override
make placement of :signing key clearer
2014-10-20 14:18:33 +02:00
Martin Klepsch
b121da80b4 make it clearer that the :signing key is first-level 2014-10-20 14:13:41 +02: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
Jean Niklas L'orange
e77db48947 Merge pull request #1730 from hugoduncan/add-lein_no_user_profiles-to-sample-project
Add LEIN_NO_USER_PROFILES to sample.project.clj
2014-10-17 10:07:32 +02:00
Hugo Duncan
3dc207f78d Add LEIN_NO_USER_PROFILES to sample.project.clj 2014-10-16 21:49:42 -04:00
Phil Hagelberg
d7c069f6c0 Use require-resolve in update-in for function.
Fixes #1728.
2014-10-14 13:43:45 -07:00
Phil Hagelberg
96f24b3058 Update NEWS and clarify uses of GPG.
[ci skip]
2014-10-11 20:16:26 -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
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
behrica
b2410f180e fixed #1719
- uses read-line for reading password, if no console is available
2014-09-30 15:24:24 +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
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
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
Hugo Duncan
caa28570df Revert "Grant non-project profile access to with-profile"
This reverts commit 3a2cf94324.
2014-09-16 09:20:18 -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