Commit graph

468 commits

Author SHA1 Message Date
Bruce Adams
7495e10103 Bug fix for leading spaces in JVM_OPTS #856 2012-11-19 11:45:54 -05:00
Phil Hagelberg
24fd117104 Back to classic Clojars for a while.
Took longer than expected to get Releases working.
2012-11-18 05:43:27 -08:00
Phil Hagelberg
6d4ffe9a98 Add classic repo to Leiningen's own project.clj. 2012-11-15 07:07:52 -08:00
Phil Hagelberg
1fa23122ce Fix error message when there's an arity mismatch in apply-task. 2012-11-14 15:06:38 -08:00
Phil Hagelberg
8470f34c3f Fix global exclusions test broken by meta-merge changes. 2012-11-14 12:54:25 -08:00
Phil Hagelberg
d4a3708f44 Fix usages of when for return values. 2012-11-14 12:48:36 -08:00
Phil Hagelberg
2973d99652 Check Clojars releases repository instead of classic. Fixes #241. 2012-11-14 12:45:34 -08:00
Phil Hagelberg
4d9b8537cd Better docstrings in leiningen-core. 2012-11-12 15:15:12 -08:00
Phil Hagelberg
168d5e29b1 Accept optional not-found arg in lookup-alias. 2012-11-12 14:40:30 -08:00
Phil Hagelberg
359eed9627 Accept ^:replace metadata on *env*; don't always want to merge. 2012-11-12 14:40:30 -08:00
Phil Hagelberg
43110b873d Remove deprecated conj-dependencies function. 2012-11-12 14:40:30 -08:00
Justin Balthrop
c7cedb7db8 don't need a meta-merge to combine exclusion 2012-11-08 18:07:07 -08:00
Jacek Laskowski
bac476ce6d a typo 2012-11-09 01:31:15 +01:00
Justin Balthrop
8407b5906a fix bug when adding exclusions to dependencies with :displace metadata 2012-11-08 15:09:23 -08:00
Phil Hagelberg
e804b26716 Remove compatibility shims and warnings in preparation for 2.0.0. 2012-11-01 16:39:34 -07:00
Phil Hagelberg
3a0ab9b672 Tidy up user.clj and help.clj. 2012-10-31 11:51:23 -07:00
Phil Hagelberg
377153b1bc OK, I knew that was too clever. 2012-10-27 07:46:18 -07:00
Phil Hagelberg
9202b099ea Hooks that come from profiles can be rolled back. Fixes #802. 2012-10-26 19:25:35 -07:00
AtKaaZ
cf35d81c04 fix #836 trampoline EOF error, on windows 2012-10-27 00:05:08 +02:00
Phil Hagelberg
a5b833a0f4 Fix src/resource paths when with-profile is trampolined. Fixes #822. 2012-10-26 11:29:05 -07:00
Phil Hagelberg
55651a086d Add leiningen-core's pom.xml to fix #745.
[ci skip]
2012-10-25 21:29:24 -07:00
Phil Hagelberg
753d40723d clojure.walk strips metadata. Fixes #804. 2012-10-25 17:03:53 -07:00
Phil Hagelberg
dedb237dde Don't use colon in filename in when-stale. 2012-10-25 11:41:59 -07:00
Phil Hagelberg
ecdc783f2d repl task needs to disable pumping *in*. 2012-10-23 10:44:43 -07:00
Phil Hagelberg
abb9e44f56 Pump *in* to subprocesses as well.
There was a good reason we couldn't support this in earlier versions
of Leiningen, but it escapes me now. Perhaps it doesn't work on old
JDKs or there are platform-specific issues or something?
2012-10-23 09:53:30 -07:00
Phil Hagelberg
720a61ae65 Fix some typos in eval.clj tests.
[ci skip]
2012-10-20 15:02:34 -07:00
Phil Hagelberg
329b4b7fa6 Un-deprecate :auth profile since full-disk encryption is a good use case for it. 2012-10-10 10:04:30 -07:00
Justin Balthrop
0e02ad7164 switch with-profile to last-wins
This patch switches with-profile so that the last profile specified
wins. This is more in line with the way clojure.core/merge works.

For more info, see:
http://librelist.com/browser/leiningen/2012/9/12/changing-with-profile-from-first-wins-to-last-wins/#ff32b118546fa95d0960f2247e190c18
2012-10-08 18:27:40 -07:00
Justin Balthrop
9f37f53c5e move dependency and repository merging into meta-merge
This is accomplished with the :reduce metadata, which specifies the
reduce function to use when merging. This allows us to merge
dependencies and repositories deeply like other structures. Note that
dependencies are transformed into a map before they are merged and then
transformed back into a vector.

Also change the way that collections are merged. They used to be merged
by taking the right collection and prepending it to the left collection.
This behavior was needed for :*-paths in defproject, but it is not an
obvious default. Now, the default is to append the right collection, but
the :prepend metadata can be used to tell meta-merge to prepend instead.
By default, :source-paths, :resource-paths and :test-paths have :prepend
set to true.
2012-10-08 18:27:40 -07:00
Justin Balthrop
5893c1406a keep track of :active-profiles when merging
This is a list of all named profiles that have been merged in, after
following composite profile. This is different from :included-profiles
which is the list of profiles before composite profiles have been
expanded.
2012-10-08 18:27:40 -07:00
Justin Balthrop
5b76a2eb6a add leiningen.core.project/make
Move some defproject logic out of the macro into project/make.
2012-10-08 16:45:35 -07:00
Justin Balthrop
11037d7ddb rename profile-key-merge to meta-merge 2012-10-08 16:10:38 -07:00
Justin Balthrop
d24e36a63b move hooke-injection closer to where it is used 2012-10-08 15:46:51 -07:00
Chas Emerick
b06a04593a re-add support for :creds :gpg, add warning for anyone using e.g. :username :gpg to get all creds for a repo (gh-768) 2012-10-05 06:14:13 -04:00
Chas Emerick
268d723796 Add support for:
* namespaced keywords to control lookup of credentials in env vars
* using a vector to define a number of credential sources to be checked in series

(gh-768)
2012-10-05 06:09:54 -04:00
Phil Hagelberg
856207caf0 Load plugins in set-profiles. Fixes #772. 2012-10-04 16:24:36 -07:00
Phil Hagelberg
ff0e95baf0 Debug output in apply-task. 2012-10-04 09:36:21 -07:00
Justin Balthrop
123b929ec7 Fix environment passing to project JVM.
Runtime#exec takes an array of strings of the form "key=val", but we
were previously passing an array of interspersed keys and vals.
2012-09-27 13:46:35 -07:00
Justin Balthrop
c369447c8b support :os and :arch options in project map
Use :arch option to provide -d32 or -d64 option to project JVM.
2012-09-27 13:44:11 -07:00
Justin Balthrop
b7b61e9655 always extract native deps from snapshot jars
- fixes #796
- also add token param to when-stale, because otherwise multiple callers
  of with-stale can contaminate each other's results
2012-09-27 13:23:34 -07:00
Justin Balthrop
48bea66ea0 use -classpath instead of -cp so that jdb can be used for :java-cmd 2012-09-27 11:22:03 -07:00
Michael S. Klishin
dc9fd48376 Make LEIN_OFFLINE take precedence over what's in project.clj
Per discussion with @technomancy
2012-09-19 03:16:18 +04:00
Michael S. Klishin
387e624838 If LEIN_OFFLINE env var is set, assume offline mode by default. References #678. 2012-09-18 13:00:29 +04:00
Justin Balthrop
d702a234f5 fix truncated doc string for set-profiles 2012-09-10 12:15:47 -07:00
Phil Hagelberg
edfa52753e Wait no, that Postel's law invocation doesn't make sense. 2012-09-10 08:20:22 -07:00
Phil Hagelberg
5d37b41fbe Postel's law, I guess? 2012-09-06 10:26:04 -07:00
Nelson Morris
d254dae544 Reduce output for dependency resolution
Showing every failed repo lookup is bad for users.
They see the failure and get confused.

Hook up a custom listener that has the following behavior:

1. success -> print out artifact name, size, and repository name
2. failure -> ignore unless it is the last repo, then print out failure
   message with artifact name.

Fixes #610.
2012-09-05 14:59:53 -05:00
deduktion
e9386b7362 Update leiningen-core/src/leiningen/core/project.clj
use concat instead of merge to merge values, :plugin-repositories and :repositories are lists again 

with merge you will end up with a value for :repositories like [[repo {:url url}] ([pluginrepo {:url url}])]
instead of [[repo {:url url}] [pluginrepo {:url url}]]
2012-09-04 19:58:03 +03:00
Phil Hagelberg
10edee1d6f Fix bug where normalize-repos wasn't honoring mapization of entries. 2012-08-30 09:59:03 -07:00
Phil Hagelberg
8c68621ce8 Only apply workaround to Windows bug when not trampolining.
Fixes #674.
2012-08-30 09:14:38 -07:00