Commit graph

2895 commits

Author SHA1 Message Date
Marko Topolnik
7a7e7fb623 project.clj setting overrides profile setting
// fixes #1128
2013-04-10 12:19:52 +02:00
Marko Topolnik
ea29210d23 Populate project-map meta when outside project
// fixes #1129
2013-04-10 12:08:26 +02:00
Michael Klishin
7d782e6173 Merge pull request #1137 from technomancy/use-newline
Use platform-specific newline. Fixes #987
2013-04-08 13:05:26 -07:00
Max Prokopiev
1725fc0af9 Use platform-specific newline. Fixes #987 2013-04-09 00:02:08 +04:00
Nelson Morris
df5528d916 Fix version range check for cyclic dependencies
Some dependendency graphs can have cycles, and we need to break out.
In this case, we'll just check the list of nodes so far on this path for
the current node.  If its found then we have a cycle, so we can
stop checking for version ranges in children.

Fixed #1127
2013-04-04 22:26:30 -05:00
Michael Klishin
2e8e08e619 Merge pull request #1131 from laurentpetit/master
ack port for repl :headless
2013-04-04 09:39:24 -07:00
Laurent Petit
f41ddcae9a repl task: use specified ack ports in :headless subcommand 2013-04-04 17:24:58 +02:00
Jean Niklas L'orange
95992a5bb2 Print doc for aliases if provided, closes #1116. 2013-04-04 16:06:02 +02:00
Jean Niklas L'orange
2f69f71aee Merge pull request #1126 from MichaelDrogalis/master
Updated sample project.clj
2013-04-03 17:10:50 -07:00
Michael Drogalis
e5e55edef0 Update sample project.clj to use Clojure 1.5.1 2013-04-03 20:58:27 -03:00
Jean Niklas L'orange
18ab31d683 Merge pull request #1125 from bdollard/master
fix for #1123: allow mirrors to get credentials from credentials.clj.gpg
2013-04-03 12:21:42 -07:00
bdollard
3debae78c0 fixes #1123: mirrors can get credentials using gpg 2013-04-03 14:06:19 -04:00
Phil Hagelberg
11b7e6b559 Add no-proxy to news.
[ci skip]
2013-04-03 09:05:40 -07:00
Jean Niklas L'orange
7052d998ee Merge branch 'improve-update-in'
Conflicts:
	src/leiningen/update_in.clj
	test/leiningen/test/update_in.clj
2013-04-03 16:39:38 +02:00
Marko Topolnik
4280f2bb1f update-in: use resolve-and-apply (honor aliases) 2013-04-03 16:32:22 +02:00
Jean Niklas L'orange
ba79abe22a We always forget this, for some strange reason. 2013-04-03 16:31:11 +02:00
Marko Topolnik
d1f024b21f update-in: improve docstring 2013-04-03 16:31:11 +02:00
Marko Topolnik
f30e2ee9de update-in: vary meta project :without-profiles 2013-04-03 16:31:11 +02:00
Marko Topolnik
88a3d563e3 Add resolve-and-apply to main and use it
Fixes #1120
2013-04-03 16:22:06 +02:00
Marko Topolnik
0908397422 Add resolve-and-apply to main and use it
Fixes #1120
2013-04-03 16:20:32 +02:00
Marko Topolnik
5e0ac82a74 update-in: improve docstring 2013-04-03 15:11:13 +02:00
Marko Topolnik
cd906e6bf0 update-in: vary meta project :without-profiles 2013-04-03 15:06:38 +02:00
Michael Klishin
81fb062a95 Merge pull request #1118 from djpowell/quotes-around-download
Allow for spaces in download locations
2013-03-31 08:36:30 -07:00
David Powell
bd9e2e2550 Allow for spaces in download locations 2013-03-31 16:13:27 +01:00
Jean Niklas L'orange
95185a9b0a Improve error messages when reading user profiles.
Also associates :origin to the file the user profile were defined in,
and tags it within its metadata.
2013-03-30 16:36:21 +01:00
Reid McKenzie
5e0c1c1451 same require update for the app template 2013-03-30 14:42:01 +01:00
Phil Hagelberg
5778bd7c20 Merge pull request #1115 from arrdem/patch-1
update tests template to :require from :use
2013-03-29 21:38:54 -07:00
Reid McKenzie
1b6572246d update tests template to :require from :use 2013-03-29 23:24:25 -05:00
Jean Niklas L'orange
66a6e2b2ef Update docs with semantic change for profiles.d
Ref fa602e807b.
2013-03-30 04:15:52 +01:00
Marko Topolnik
a8506b146a Fix typo in sample project 2013-03-29 14:16:51 +01:00
Phil Hagelberg
3c220999c1 Argh; forgot NEWS for 2.1.2. Here it is. 2013-03-28 15:44:33 -07:00
Phil Hagelberg
da76893c23 Back to 2.2.0-SNAPSHOT. 2013-03-28 15:38:43 -07:00
Phil Hagelberg
10d7d1faa3 Release 2.1.2 2013-03-28 14:46:32 -07:00
Phil Hagelberg
d0337ad02a Add a note about testing the repl task. 2013-03-28 14:44:49 -07:00
Phil Hagelberg
952076e822 Use file.separator in pom path relativization.
Fixes #944 I think.
2013-03-28 12:40:11 -07:00
Phil Hagelberg
f8f568bf96 Fix self-install dev heuristic to refuse to operate on a checkout.
Fixes #1106.
2013-03-28 12:21:19 -07:00
Phil Hagelberg
078ff98f3d Merge pull request #1114 from joelittlejohn/system-no-proxy
Add support for no_proxy environment variable
2013-03-28 12:15:57 -07:00
Phil Hagelberg
f5c2d04b57 Move default :test-selectors to :leiningen/test profile.
Fixes #1099.
2013-03-28 11:38:04 -07:00
Phil Hagelberg
a42c5521f4 Move Tiered Compilation to LEIN_JVM_OPTS and document.
Fixes #1111.
2013-03-28 11:04:13 -07:00
Joe Littlejohn
802e666f14 Add support for no_proxy environment variable
Closes #816.
2013-03-28 17:47:46 +00:00
Toby Crawley
86e6cd88b4 GPG doc updates.
This includes:

* publishing to a keyserver
* revocation
* setting the default signing key via lein
2013-03-28 13:25:31 -04:00
Jean Niklas L'orange
51a2e1e625 Add tests for IObj vs. non IObjs merging. 2013-03-27 20:20:53 +01:00
Jean Niklas L'orange
664da4a3df Allow IObjs to be cmp. to non IObjs when merging.
Fixes #1110.
2013-03-27 20:20:15 +01:00
Jean Niklas L'orange
c42bb2a2c0 Only try to open file when needed in lein-version.
(This should fix the breaking tests.)
2013-03-27 19:38:15 +01:00
Jean Niklas L'orange
0f9b8bfc31 Fix #1103 by bumping stencil dependency. 2013-03-27 18:53:38 +01:00
Phil Hagelberg
b42a4d89f4 Merge pull request #1109 from pyr/patch-1
Provide a default version for leiningen
2013-03-26 19:15:47 -07:00
Pierre-Yves Ritschard
dc3cade47c Fetch version from pom.properties
After clarifying things with @technomancy, it makes more sense
to pull the version from the already provisionned pom.properties
file.
2013-03-27 00:37:24 +01:00
Pierre-Yves Ritschard
ea0b00a199 Provide a default version for leiningen
For odd cases where leiningen is called without the wrapper shell script, any occurence of `:min-lein-version` will throw an exception since `leiningen-version` will return nil.

This fixes jenkinsci/leiningen-plugin#1 for instance.
I see two other ways to fix this:

- have the version be propagated from project.clj directly, through substitution
- let leiningen-version return a string that always passes or always fails (not sure which is best) the `:min-lein-version` requirement
2013-03-26 23:54:21 +01:00
Jean Niklas L'orange
f36518c535 Merge pull request #1108 from gaverhae/global-vars
Add way to set! global vars through :global-vars.
2013-03-26 15:09:08 -07:00
Gary Verhaegen
c65d2f510d Change sample project file for global vars
Change sample.project.clj to reflect the new way to set global variables (see ticket #1107).
2013-03-26 22:22:52 +01:00