Commit graph

2854 commits

Author SHA1 Message Date
Phil Hagelberg
06fecc812a Use default repositories for plugins when outside project.
Fixes #928.
2013-01-12 12:56:39 -08:00
Colin Jones
23c2e263d0 Bump reply / nREPL versions for nREPL 0.2.0 final 2013-01-12 12:03:36 -06:00
Jean Niklas L'orange
74e30d7e45 Merge pull request #927 from AtKaaZ/master
`main/get-os` should be `eval/get-os` in `new/templates.clj`
2013-01-12 05:30:46 -08:00
AtKaaZ
2ea4e4486c "main/get-os" is supposed to be "eval/get-os"
allows compiling lein from master now
2013-01-12 13:03:18 +01:00
Phil Hagelberg
33bab94f7f Merge pull request #926 from redinger/normalize-profiles
Normalize profiles before merging them
2013-01-11 19:33:34 -08:00
Christopher Redinger
e053fe1930 Normalize profiles before merging them 2013-01-11 21:49:03 -05:00
Colin Jones
e7177c0b89 Bump reply / nREPL versions
fixes #917
fixes #921
2013-01-11 14:44:14 -06:00
Phil Hagelberg
ab080ecd30 quadruple bacon deluxe backslash for Windows. Fixes #920. 2013-01-11 11:21:29 -08:00
Phil Hagelberg
b6a4caad45 Oops; accidentally merged lein-newnew 0.3.6 instead of latest. 2013-01-11 11:14:33 -08:00
Phil Hagelberg
829046af7f Fix upgrade command. 2013-01-11 11:06:09 -08:00
Phil Hagelberg
03151e1af9 Docs for new. 2013-01-11 11:04:26 -08:00
Phil Hagelberg
c300908789 newnew's not newnew anymore; it's just new. 2013-01-11 10:55:55 -08:00
Phil Hagelberg
eb15a82e12 Back to 2.0.0-SNAPSHOT. 2013-01-10 16:59:36 -08:00
Phil Hagelberg
1e309c1a52 Release 2.0.0-RC1 2013-01-10 16:45:09 -08:00
Phil Hagelberg
54806fa5bc Fix newnew test 2013-01-10 16:45:09 -08:00
Nelson Morris
b7c54adc4e Print checksum exceptions 2013-01-10 17:03:20 -06:00
Phil Hagelberg
5f6fd4f306 Move resolution failure messages to catch block in get-dependencies. 2013-01-10 13:31:46 -08:00
Phil Hagelberg
871b1c0b61 Move downloads to S3 bucket. Fixes #885. 2013-01-10 11:57:24 -08:00
Phil Hagelberg
96adcdccc5 Fix tests re: central snapshots. 2013-01-10 11:40:15 -08:00
Phil Hagelberg
567a4f87bc Bump to latest lein-newnew. 2013-01-10 11:40:02 -08:00
Phil Hagelberg
15c5eb9287 Don't need to explicitly include clojars classic in project.clj. 2013-01-10 11:35:35 -08:00
Phil Hagelberg
adab79df77 Todos and news. 2013-01-10 11:35:18 -08:00
Phil Hagelberg
824c3dc511 Don't refer folks to the Releases repository docs yet. 2013-01-10 11:08:56 -08:00
Phil Hagelberg
c70fca859f Merge pull request #909 from hyPiRion/normalize-data-in-project-map
Normalize data in project map
2013-01-10 11:02:53 -08:00
Phil Hagelberg
fd2a8bece9 Avoid NPE in trampoline's win-batch? detection. Fixes #896. 2013-01-10 10:42:56 -08:00
Phil Hagelberg
3d1aac4e77 Merge pull request #914 from revelytix/test-report-hook
Hooked clojure.test report function should pass invocation through to original fn
2013-01-10 10:13:35 -08:00
Ryan Senior
f4c2b97bc6 changed leiningen/test to allow the call into the clojure.test report to
pass through the hook to  the original multimethod
2013-01-10 11:07:01 -06:00
Phil Hagelberg
6f13cd4d21 Merge pull request #913 from mybuddymichael/change-tutorial-to-use-find
Use `find .` instead of `tree` in the tutorial
2013-01-09 22:33:50 -08:00
Michael Hanson
f1b7365556 Use find . instead of tree in the tutorial
`find` is more universal than `tree`.

Fixes #892.
2013-01-09 20:07:58 -08:00
Phil Hagelberg
bfc24c3486 Merge pull request #911 from hugoduncan/feature/central-is-release-only
Disable snapshots from maven central
2013-01-09 14:07:25 -08:00
Hugo Duncan
eb58efca7d Disable snapshots from maven central 2013-01-09 17:04:40 -05:00
Phil Hagelberg
6f77bd1dbe Add debug logging to javac. 2013-01-08 10:20:32 -08:00
Phil Hagelberg
bfff08f5dd Merge pull request #910 from trevor/patch-1
No tabs
2013-01-08 09:24:12 -08:00
Trevor Wennblom
496f1352a1 No tabs
:)
2013-01-08 09:57:56 -06:00
Jean Niklas L'orange
ef3641c172 Add a repo test case which actually merges repositories. 2013-01-07 21:48:03 +01:00
Jean Niklas L'orange
0bb1cc42bf Avoid crash in lein.bat when path contain spaces. Fixes #907. 2013-01-07 21:00:23 +01:00
Jean Niklas L'orange
88dfec8daf Add tests to ensure that repository merging works as intended. 2013-01-07 20:42:19 +01:00
Jean Niklas L'orange
4c1320255e Normalize repositories in project map before merging. Fixes #858. 2013-01-07 02:54:46 +01:00
Phil Hagelberg
3d3fb9cdb2 Clarify the exit docstring. 2013-01-02 22:32:30 -08:00
Phil Hagelberg
da3b3e13f2 No tabs! 2013-01-02 22:32:15 -08:00
Phil Hagelberg
0d69412db6 Move contributing guidelines into their own file. 2013-01-02 22:32:07 -08:00
Michael Klishin
18ed0590ff Merge pull request #902 from hyPiRion/uberjar-compile-after-aot-calculations
Make jar accept alternative main class
2013-01-02 14:36:49 -08:00
Jean Niklas L'orange
ce2913062f Don't conj :main during uberjar if :aot is :all.
When :aot is :all, don't conjoin the :main value to :aot, as this will result in
an error.
2013-01-02 19:48:29 +01:00
Jean Niklas L'orange
98cc22927f Make jar accept alt. main class as arg. Fixes #897 and fixes #899.
By having jar accepting an alternative main class, uberjar can call jar with an
additional parameter and uberjar's alternative main class won't be ignored. This
fixes #897. In addition, as jar is now responsible for adding main to :aot, the
main class will now actually be compiled. This fixes #899.
2013-01-02 19:48:25 +01:00
Colin Jones
e01a1980af Bump reply again for more sjacket fixes 2012-12-29 16:54:27 -06:00
Colin Jones
9f628786eb Bump reply version 2012-12-28 21:50:05 -06:00
Phil Hagelberg
712ac9a017 Exclusion to pacify lein-pedantic. 2012-12-28 12:00:19 -08:00
Jean Niklas L'orange
511ba8eed7 Fix typo in sample.project 2012-12-28 05:00:44 +01:00
Jean Niklas L'orange
6280b73da0 Enforce nREPL dependencies in :repl profile. Fixes #893.
Enforces a nREPL dependency and a clojure-complete dependency for the :repl
profile. Previously, the first found :repl profile from
`project.clj`-`profiles.clj`-default was returned and merged into the real
profile. Now all :repl profiles that are found are merged into the active
profile.

The dependencies are tagged with the ^:displace tag, and as such will be
discarded if a collision occurs.

The changes made `repl-profile-in-project` fail as it did not contain
`leiningen.core.project/empty-dependencies`, which has a :reduce tag in its
metadata for handling dependency merging. The dependency merger expands the
version to its url, hence the change to a url map.

Also removed a TODO from the file, fixed by 27fe39d.
2012-12-28 04:56:27 +01:00
Jean Niklas L'orange
27fe39d618 Fix ^:displace and ^:replace handling in meta-merge
An object with the metadata flag `:displace` set signals that, if a merge
conflict appears, this object is to be discarded. Likewise, `^:replace` signals
that this object should be kept in a merge conflict.

However, previous functionality only tested if the right element had the
`:replace` flag, or if the left element had the `:displace` flag. This commit
resolves this by checking whether the left element has a `:replace` flag and the
right element has a `:displace` flag, and handles accordingly to the semantics
explained in the previous paragraph.

Whenever two elements where both has the `:displace` flag is merged, the
leftmost is picked, and their metadata is merged. Likewise for the `:replace`
flag. The elements will not lose their `:displace` and `:replace` flags, as they
have not really been preferred over another element.

The `nil?` tests have been placed at the top to reflect that nil is the lack of
a value, not a value itself. As such, elements will not be "preferred" or
"discarded" over nil/nothing.
2012-12-28 04:28:34 +01:00