Commit graph

839 commits

Author SHA1 Message Date
Phil Hagelberg
cc711200a4 Move version back to 2.0.0-SNAPSHOT. 2012-03-07 14:24:03 -08:00
Phil Hagelberg
efe16d5dee Release 2.0.0-preview1. 2012-03-07 12:06:48 -08:00
Phil Hagelberg
14ec91355b Load plugins when operating outside a project dir. 2012-03-07 11:58:12 -08:00
Phil Hagelberg
f6f46c267e Don't recursively prep project. 2012-03-07 11:30:26 -08:00
Tobias Crawley
158355303e leiningen.core.main/task-not-found needs to be marked as not needing a project to work properly. 2012-03-07 13:59:20 -05:00
Phil Hagelberg
d6fdc21648 Allow suppressing of leiningen.core.main/exit for IDEs/tools. 2012-03-06 11:07:52 -08:00
Phil Hagelberg
1370be9725 Drop user/settings in favour of checking :user profile directly. 2012-03-06 11:07:51 -08:00
Phil Hagelberg
bf1ab79052 Port :checkout-deps-shares to master branch. 2012-03-05 17:39:48 -08:00
Phil Hagelberg
94a12b3cde Pass through :local-repo and :offline? options to pomegranate. 2012-03-02 16:17:46 -08:00
Phil Hagelberg
c4dad5be02 Bump lein-newnew plugin to 0.2.4. Fixes #427. 2012-03-02 14:15:14 -08:00
Phil Hagelberg
02e39e507a Add conj-dependency function. 2012-03-01 15:50:56 -08:00
Phil Hagelberg
28397ad6eb Test :exclusions. 2012-03-01 15:31:12 -08:00
Phil Hagelberg
5e7808796f Move :dependencies back to vector-of-vectors. 2012-03-01 15:31:08 -08:00
Phil Hagelberg
861e4f08ea Make leiningen-core dirs visible when testing leiningen proper. 2012-03-01 15:30:50 -08:00
Phil Hagelberg
71874208f3 Move normalization out of defproject into top-level comp. 2012-03-01 11:17:40 -08:00
Phil Hagelberg
85f2fa1935 Cosmetics. 2012-03-01 11:17:40 -08:00
Hugo Duncan
28fd085c5a Add warning if a checkouts directory does not contain a project.clj
This provides a diagnostic message, will leaving open the possibility for other
type of projects in checkouts
2012-02-29 16:16:47 -05:00
Phil Hagelberg
29c262da3b Don't put $LEIN_DIR/lib on the classpath; that's deprecated. 2012-02-25 22:01:53 -08:00
Anthony Grimes
9b0185747a Switch to bultitude for ns finding stuff. 2012-02-24 22:15:19 -06:00
Phil Hagelberg
d0768feb11 Move prep-tasks out of atom into :default profile. 2012-02-24 15:55:55 -08:00
Phil Hagelberg
03aa94c661 Implement :middleware. 2012-02-24 15:38:10 -08:00
Chas Emerick
03b8635c67 keys in :auth :repository-auth can now be regexes matching repository URLs, fixes gh-424 2012-02-24 07:44:07 -05:00
Chas Emerick
f0a17e3aad missed a test 2012-02-23 18:42:39 -05:00
Chas Emerick
a22da503be load plugins through classpath/resolve-dependencies so as to benefit from authentication config, etc, fixes gh-423 2012-02-23 14:35:57 -05:00
Chas Emerick
d4169089cc allow hook load/activation exceptions to bubble up, fixes gh-419 2012-02-23 13:25:34 -05:00
Chas Emerick
5c66dc0d22 Upgrade pomegranate to 0.0.8, fixes gh-422 2012-02-23 13:25:34 -05:00
Phil Hagelberg
fa0d11c48d Add a todo for including denormalize. 2012-02-22 17:31:16 -08:00
Phil Hagelberg
b449cd6a13 Ensure we launch eval-in-subprocess in the project root.
Needed for lein-sub-type behaviour.
2012-02-22 16:57:35 -08:00
Phil Hagelberg
ae37356845 Update tasks to use plural paths. Use :resource-paths instead of resources. 2012-02-22 16:43:17 -08:00
Phil Hagelberg
74c264fa59 Switch to "input" paths as plural keys. 2012-02-22 12:08:22 -08:00
Phil Hagelberg
7dcc660847 Simplify profile merging now that deps/repos are maps. 2012-02-22 12:03:49 -08:00
Phil Hagelberg
b03e2240ee Move :test-path into default-project. Fixes #416. 2012-02-22 11:03:59 -08:00
Phil Hagelberg
b518e9c962 Allow :injections to be a collection. 2012-02-22 11:03:30 -08:00
Chas Emerick
b2b8621618 emit sane progress messages when resolving dependencies and deploying artifacts 2012-02-22 08:47:18 -05:00
Chas Emerick
0a2e84754e upgrade to pomegranate 0.0.7 2012-02-22 08:47:18 -05:00
Chas Emerick
e03b74e00f upgrade to pomegranate 0.0.6; changes default checksum policy to only warn on failure 2012-02-22 08:47:18 -05:00
Chas Emerick
19a40fae95 don't swap out thread context classloader if it's already modifiable 2012-02-20 18:19:54 -05:00
Chas Emerick
b85b48a48b upgrade to pomegranate 0.0.5; use its get-classpath in leiningen.core.ns to fix gh-412 2012-02-20 18:19:29 -05:00
Chas Emerick
600fb09a31 add project classpath to leiningen's classpath if :eval-in :leiningen, fixes gh-411 2012-02-20 05:31:03 -05:00
Phil Hagelberg
7d8dca635d Use ordered maps for :dependencies and :repositories. Fixes #400. 2012-02-19 22:10:09 -08:00
Phil Hagelberg
6cadab9bd4 Going to go ahead and call that a typo. 2012-02-19 21:34:36 -08:00
Phil Hagelberg
1c41bf0d17 Expose :repository-auth from user profiles to pomegranate. 2012-02-19 21:18:12 -08:00
Phil Hagelberg
77d0abb474 Move special nrepl deps from :default profile to repl task. 2012-02-19 16:26:53 -08:00
Phil Hagelberg
69b03bf327 Fix a few leiningen-core tests. 2012-02-19 15:36:05 -08:00
Phil Hagelberg
7cc7afc61b Clarify mismatch warning when merging profiles. 2012-02-17 14:20:32 -08:00
Phil Hagelberg
ba8904a90d Don't rely on binding of *ns* in project/read. 2012-02-16 20:31:06 -08:00
Phil Hagelberg
4c5c173f1e Fix locking call. 2012-02-16 20:02:36 -08:00
Phil Hagelberg
8425e06ed1 Move :test-path to :default profile and lock inside project/read. 2012-02-16 15:51:05 -08:00
Phil Hagelberg
af2a5ddb53 Allow :aliases in project.clj. 2012-02-13 21:02:52 -08:00
Phil Hagelberg
0234593c4c Call System/setProperty for eval-in-leiningen calls. 2012-02-13 21:02:43 -08:00
Colin Jones
b757cb0cd3 Revert "Upgrade to the latest nrepl"
This reverts commit 01084cdb6a.
2012-02-11 18:05:25 -06:00
Colin Jones
d8be20b2ec Revert "Add sonatype snapshots for the time being"
This reverts commit 6a145804f7.
2012-02-11 18:05:12 -06:00
Colin Jones
6a145804f7 Add sonatype snapshots for the time being
This is only for nrepl 0.2.0-SNAPSHOT - we can get rid of it
as soon as there's a non-snapshot release.
2012-02-11 17:57:12 -06:00
Colin Jones
01084cdb6a Upgrade to the latest nrepl 2012-02-11 16:50:46 -06:00
Phil Hagelberg
432c4eae41 Link to the EPL in project.clj. 2012-02-08 22:55:48 -08:00
Phil Hagelberg
61522df1af Be more forgiving of sparse project maps in eval-in-project. 2012-02-08 22:55:19 -08:00
Phil Hagelberg
c11a3a83c0 Absolutize paths in :without-profiles project map as well. 2012-02-08 00:18:31 -08:00
Phil Hagelberg
bc22a95f66 Implement a few partially-applied help aliases. 2012-02-07 23:26:47 -08:00
Phil Hagelberg
dc1fa56950 Allow aliases to specify partially-applied tasks.
Love it... except for the bits dealing with varargs; yuck!
2012-02-07 23:26:47 -08:00
Phil Hagelberg
98ad4f9897 Profiles mean :jvm-opts in user/settings isn't necessary. 2012-02-07 20:58:48 -08:00
Phil Hagelberg
07c699cb6f Warn when profile is specified that doesn't exist. 2012-02-07 20:32:04 -08:00
Phil Hagelberg
c48f6ee9df Move absolutize-path call into merge-profiles.
Otherwise merge-profiles isn't any good for keys that involve paths
outside leiningen.core.project/read.
2012-02-07 18:15:03 -08:00
Phil Hagelberg
1c0f2099f9 Move :dev profile to :default in default-profiles.
Otherwise project-level :dev profiles will stomp on the inclusion of
nrepl and friends.

Conflicts:

	bin/lein
2012-02-07 17:09:34 -08:00
Phil Hagelberg
032a023eb5 Fix trampoline task. 2012-02-07 17:09:09 -08:00
Anthony Grimes
7a7945880f Move reply and lein-newnew to lein's own project.clj.
The only reason this wasn't possible before was because the classpath
was being cached in .lein-classpath, giving the appearance of those
dependencies not being seen.
2012-02-07 16:12:14 -06:00
Anthony Grimes
385867d8f2 Add Clojure exclusions across the board.
This should fix travis failures.
2012-02-07 16:01:26 -06:00
Colin Jones
6042a92e5c Enable completion for non-leiningen projects 2012-02-07 07:45:55 -06:00
Anthony Grimes
31217cfdb2 Hardcore merging action. 2012-02-07 02:59:48 -06:00
Phil Hagelberg
772679473c Allow :dependencies to be loaded after profiles in :eval-in-leiningen. 2012-02-06 17:30:03 -08:00
Anthony Grimes
75a062dfb7 WIP new lein repl task that uses reply. 2012-02-06 19:29:31 -06:00
Phil Hagelberg
00b3caea1b Honor :hooks. Allow hook namespaces to contain "activate" defn.
This lets us avoid nasty top-level side-effects.
2012-02-06 17:29:31 -08:00
Phil Hagelberg
cddd1d96ac Help, search, and repl tasks may run outside projects. 2012-02-06 17:24:40 -08:00
Anthony Grimes
a68774c36a Inc lein-newnew version to fix boogz. 2012-02-05 14:56:56 -06:00
Anthony Grimes
8f2c0c178e Remove newnew stuff from leiningen and add it as a dependency. 2012-02-05 04:21:14 -06:00
Anthony Grimes
32543350d9 Clean up a bit.
Don't pass the whole project when we can just pass the single value it
uses from it instead.
2012-02-04 17:34:40 -06:00
Anthony Grimes
91efae3327 Add native deps extraction. 2012-02-04 17:28:53 -06:00
Nelson Morris
09483ed64d Update pomegranate; all repo/dependency options should work 2012-02-01 21:20:20 -06:00
Phil Hagelberg
a1e5ee9bb9 Don't splice injected forms. 2012-02-01 17:58:51 -08:00
Phil Hagelberg
2f73e7dcef Merge remote branch 'JulianBirch/master' 2012-01-29 14:00:58 -08:00
Phil Hagelberg
0f855f96b8 Document prep-tasks, clean up ignores. 2012-01-29 13:59:07 -08:00
Phil Hagelberg
8a2baf54cc Warn when encountering user-level repositories. 2012-01-29 13:48:49 -08:00
Julian Birch
7f58cbcee5 Added support for replacing/displacing profile values instead of merging. 2012-01-28 21:10:52 +00:00
Phil Hagelberg
751a75532e Support :injections project key. 2012-01-24 20:55:24 -08:00
Phil Hagelberg
326df9578a Merge pull request #377 from timmc/master
\d+ for extracting version segments
2012-01-23 19:18:07 -08:00
Phil Hagelberg
b26928441b Add prep-tasks for precompile/javac. 2012-01-23 19:05:04 -08:00
Tim McCormack
ea91d3f1e9 Fix version comparison for multi-digit version segments (e.g. 1.273) 2012-01-23 20:45:38 -05:00
Nelson Morris
d7c335cee7 Update pomegranate version
This allows most lein v1 repository options to work.
Still need to re-add user auth from config file.
2012-01-22 22:41:47 -06:00
Phil Hagelberg
92dfe67a85 Re-enable ci for master branch. 2012-01-17 20:08:19 -08:00
Phil Hagelberg
e50ee1ba4e Fix tests for main in leiningen-core. 2012-01-17 20:08:06 -08:00
Phil Hagelberg
6ff6d603ad Move dynamic resolution of eval-in-leiningen :dependencies. 2012-01-17 15:11:46 -08:00
Phil Hagelberg
bb33e60639 Fix typo. 2012-01-17 14:58:02 -08:00
Phil Hagelberg
205c58695b Move HACKING.md into leiningen-core README.md. 2012-01-15 20:43:12 -08:00
Phil Hagelberg
d5ceec16fc Update leiningen.core.main tests. 2012-01-15 20:20:15 -08:00
Phil Hagelberg
d8190b1cb7 Move -main to leiningen.core.main. 2012-01-15 20:20:02 -08:00
Phil Hagelberg
2aa664b24f Fix checkout-deps classpath test. 2012-01-12 17:07:40 -08:00
Phil Hagelberg
39b63be344 Remove support for profiles.clj in root; read profiles.clj instead of load. 2012-01-12 17:07:27 -08:00
Phil Hagelberg
f4836379c9 Fix help task to work with plugins added to the classpath dynamically. 2012-01-12 09:19:51 -08:00
Phil Hagelberg
0da32574a7 Load :dependencies in eval-in-leiningen cases. 2012-01-12 09:07:26 -08:00
Phil Hagelberg
2c58368012 Load plugins inside leiningen.core.project/read. 2012-01-12 09:06:56 -08:00
Phil Hagelberg
4064065bd5 Fix compile task and tests. Punt on transitive cleaning for now. 2012-01-10 22:12:37 -08:00
Phil Hagelberg
c2b40834e0 OK, so relative paths in project maps was the wrong way to go. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
f6b2882b7f Fix a couple tests. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
d9a3cdd82f Checkout deps shouldn't apply default profiles. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
da54afa8c8 Document a couple functions. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
284c06476f Add debug profile. 2012-01-06 21:27:21 -08:00
Phil Hagelberg
7a0449e6d6 Fix run tests. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
0b3314b0ad Expose pre-merged project without profiles applied on metadata. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
69e286628c Fix and test profile aliases. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
4ccbbfd2bb Allow profiles to be aliased to other profiles using keywords. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
d490acd9d7 Read profiles from ~/.lein/profiles.clj and :profiles key in defproject. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
7a59a30193 Merge maps in profiles correctly. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
d170dae303 Implement merging profiles into project maps. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
a9c945505b Add a test for unquote. 2012-01-06 21:27:20 -08:00
Phil Hagelberg
57ac6a705c Simplify representation of paths and deps to prepare for profiles.
Basically any path not considered an output (target) is expanded to
support a vector rather than a single value. This will allow profiles
to work by concatenating additional values into these keys.
:dev-dependencies is also dropped in favour of :dependencies inside a
:dev profile, though the actual implementation of profiles isn't
implemented.
2012-01-06 21:27:20 -08:00
Justin Balthrop
ac3e84ea24 classlojure 0.6.5 2011-12-08 15:42:39 -08:00
Anthony Grimes
4c4ede10b9 Fix a bug where native deps were not being added to the java.library.path. Hyphens vs dots. 2011-12-08 14:13:11 -06:00
Phil Hagelberg
07e9b4d0bc Fixed deps task; tests are still a mess. 2011-12-03 13:11:39 -08:00
Phil Hagelberg
6540de69a4 Un-mapify :repositories before handing off to pomegranate. 2011-12-03 12:41:11 -08:00
Nelson Morris
5184b8017e Update tests for compile tests
The classpath was changed to use absolute paths for the checkout
dependencies.  They were pointing to the wrong directory since the
working directory would be the leiningen project instead of the
test project.

This adds the absolute paths for test projects back, as just
changing the classpath does not help for the other tasks.
2011-12-03 13:39:22 -06:00
Phil Hagelberg
2c4fdac5e1 Normalize :repositories values into map. This fixes search task. 2011-12-02 21:02:01 -08:00
Phil Hagelberg
85b1dc5e81 Absolutize paths inside get-classpath for now. 2011-12-02 20:48:58 -08:00
Phil Hagelberg
08097d409c Add test for leiningen.core.project namespace. 2011-12-02 19:23:59 -08:00
Phil Hagelberg
4b7d53740e Merge remote-tracking branch 'ninjudd/master' 2011-12-02 19:18:03 -08:00
Phil Hagelberg
7ff6478f5a Try to fix reading of sample projects in leiningen.test.helper.
Still broken unfortunately; getting inexplicable NPE out of resolve.
2011-12-02 16:00:32 -08:00
Justin Balthrop
18719c9e01 add eval-in :classloader 2011-11-24 08:31:43 -08:00
Justin Balthrop
4cd8c4b355 remove :eval-in-leiningen check 2011-11-23 17:49:15 -08:00
Justin Balthrop
b15736008b add eval-in multimethod and add support for :eval-in project key 2011-11-23 16:27:51 -08:00
Justin Balthrop
fd1a2b3539 simple leiningen-core eval test 2011-11-23 16:16:47 -08:00
Phil Hagelberg
4eb88c7861 Add explicit hooke dep to leiningen-core. 2011-11-23 14:07:10 -08:00
Phil Hagelberg
0b8f061f2a Fix silly classpath test. 2011-11-22 17:50:20 -08:00
Phil Hagelberg
da3028a514 Fix eval-in-project and project/read. 2011-11-22 13:47:52 -08:00
Phil Hagelberg
cadde5a2a0 Drop deprecated arities of eval-in-project. 2011-11-21 12:31:09 -08:00
Phil Hagelberg
98d8aa8f97 Better marginalia-friendly docs for leiningen-core. 2011-11-21 12:31:05 -08:00
Phil Hagelberg
6bdfd3e5c3 Fix compile task. 2011-11-20 14:37:15 -08:00
Phil Hagelberg
8488b22764 Move leiningen.util.ns to leiningen.core.ns. 2011-11-20 13:46:36 -08:00
Phil Hagelberg
74fcb25976 OK, now lein version at least runs again. Whew! 2011-11-19 21:07:34 -08:00
Phil Hagelberg
9598ab778a Add repositories handling in defproject. 2011-11-19 20:36:29 -08:00
Phil Hagelberg
8131832fdd Add leiningen.core.eval; still needs plenty of work. 2011-11-19 16:08:29 -08:00
Phil Hagelberg
91d7a283f9 Begin work on 2.0 in leiningen-core library. 2011-11-19 16:01:07 -08:00