Commit graph

3369 commits

Author SHA1 Message Date
Craig McDaniel
c87cb003a2 Initial happy-path unit tests for the clean task. Relates to #1458 2014-02-25 22:13:13 -05:00
Jean Niklas L'orange
491c2c9595 Merge branch 'retain-profile-metadata' 2014-02-24 18:32:08 +01:00
Jean Niklas L'orange
17e91e60fe Retain metadata after profile setup. Fixes #1414. 2014-02-24 18:31:43 +01:00
Jean Niklas L'orange
a0d3504b1e Test that :java-opts are converted to :jvm-opts.
Inside profiles. Ensures #1445 is fixed, thus closes #1445.
2014-02-23 15:06:51 +01:00
Jean Niklas L'orange
1d7e41bfbf Test that profile metadata is retained.
Breaks tests, as meta isn't retained yet.
2014-02-23 14:55:28 +01:00
Jean Niklas L'orange
a5d2ea5161 Allow non-string args to compile task. Fixes #1442 2014-02-22 15:24:40 +01:00
Jean Niklas L'orange
eac6cdf04f Merge pull request #1456, fixes #1455. 2014-02-22 13:58:20 +01:00
Jean Niklas L'orange
2cf555e99e Backquote uberjar-merge-with vector. 2014-02-22 13:56:52 +01:00
Peter Monks
d8302eff0b Fix for issue 1455 2014-02-20 11:21:17 -08:00
Jean Niklas L'orange
b0c644dd7d Merge pull request #1453 from mpblair/blank-profiles
Merge in mplbair/blank-profiles

Prints better error messages for erroneous profile files, and fixes #1444.
2014-02-17 15:36:02 +01:00
Matthew Blair
1df22bcc95 Fix issue 1444 - Leiningen errors if profiles.clj is blank. Push try-catch from user/load-profiles to utils/read-file, print helpful error message from utils/read-file, and bubble exception up. 2014-02-16 17:35:57 -05:00
Jean Niklas L'orange
f0e558d994 2.3.3 -> 2.4.0-SNAPSHOT.
[ci skip]
2014-02-16 01:52:44 +01:00
Jean Niklas L'orange
19b8d3bf50 Merge pull request #1443 from jcrossley3/add-profiles
Fix add-profiles so they can be merged by name
2014-02-14 17:31:31 +01:00
Phil Hagelberg
cc41da388b Revert license back to official EPL; addresses #1446. 2014-02-12 13:42:53 -08:00
Jim Crossley
77650ce3fd Fix add-profiles so they can be merged by name
I believe the :profiles metadata was introduced after this function was
written, so this update makes its comment -- "available to merge by
name" -- true again.
2014-02-09 16:07:12 -05:00
Phil Hagelberg
b15c5666d1 Propagate eval-in-project exit code in run task to lein's process. 2014-02-06 11:37:00 -08:00
Phil Hagelberg
ae15ef0034 Merge pull request #1434 from jcrossley3/patch-1
Only exit if there are errors
2014-02-02 11:31:19 -08:00
Jim Crossley
638b710acb Only exit if there are errors
Otherwise, parent processes can't continue.
2014-02-02 10:56:33 -05:00
Phil Hagelberg
c50c7ee8bc Merge pull request #1432 from jcrossley3/filespec-dirs
Filter out directories matching readme/license prefix
2014-01-31 08:24:55 -08:00
Jim Crossley
9e598e1674 Filter out directories matching readme/license prefix 2014-01-30 19:12:07 -05:00
Jean Niklas L'orange
f2008d38ca Merge pull request #1431 from hura/patch-1
Update TUTORIAL.md
2014-01-28 18:57:23 +01:00
hura
83a120d70e Update TUTORIAL.md
AOT abbreviations is now explained
2014-01-28 12:35:40 -05:00
Marshall Bockrath-Vandegrift
a38f3903cf Also expand the built-in default profiles. 2014-01-28 06:20:10 -05:00
Phil Hagelberg
195b723df8 Merge pull request #1430 from mblair/add-new-app-files
mention all files created by the project generator
2014-01-27 15:53:12 -08:00
Matt Blair
b35aa83874 mention all files created by the project generator 2014-01-27 13:17:38 -08:00
Jean Niklas L'orange
c845d45377 Merge branch 'decompose-profiles' 2014-01-27 16:33:04 +01:00
Jean Niklas L'orange
ecb7ed0e77 Decompose with-profile args not containing +/-. 2014-01-27 16:31:34 +01:00
Marshall Bockrath-Vandegrift
8bd6b8fb53 Fix #1421 by decomposing profiles into collections of atomic profiles. 2014-01-27 15:54:05 +01:00
Phil Hagelberg
22d3880e08 Fix a bug where show-profiles was stripping profile namespaces. 2014-01-24 14:54:52 -08:00
Phil Hagelberg
5458cefa51 Merge pull request #1425 from technomancy/lower-http-timeout-1096
Lower read time out for wagon-http
2014-01-24 14:45:41 -08:00
Marshall Bockrath-Vandegrift
466902da96 Handle bultitude returning full ns form instead of just symbol. 2014-01-24 13:36:21 -05:00
Max Prokopiev
49dd9536c8 Lower read time out for wagon-http
Fixes #1096
2014-01-24 22:00:05 +04:00
MerelyAPseudonym
b366c85b56 Fix "singing"/"signing" typo. 2014-01-22 16:39:13 -05:00
Jean Niklas L'orange
63ab148227 Rename sample alias to something sensible.
[ci skip]
2014-01-21 13:01:52 +01:00
Phil Hagelberg
19c49bd2ab Don't use /tmp when LEIN_FAST_TRAMPOLINE is enabled.
Fixes #1396.
2014-01-20 17:36:19 -08:00
Phil Hagelberg
5726335f6f Revert "Fall back to defn-level help summaries if ns-level are not found."
This reverts commit 0c47e54b9e.
2014-01-20 14:29:52 -08:00
Phil Hagelberg
ff403992e4 Update plugin guide. 2014-01-20 10:49:21 -08:00
Phil Hagelberg
0c47e54b9e Fall back to defn-level help summaries if ns-level are not found. 2014-01-20 10:49:14 -08:00
Phil Hagelberg
93a2ffa85d Merge remote-tracking branch 'DavidEGrayson/lein_faster'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-01-20 09:49:11 -08:00
David Grayson
bde2e864d5 Merge pull request #1 from ryantm/patch-1
update bultitude dependency to 0.2.5
2014-01-19 14:25:51 -08:00
Ryan Mulligan
8a274d9039 update bultitude dependency to 0.2.5
0.2.5 incorporates the changes to bultitude that @davidegrayson's changes depend on, so we need to have leiningen depend on that version now.
2014-01-17 18:05:11 -08:00
Phil Hagelberg
919bf67d8d Merge pull request #1413 from laurentpetit/issue-1412
Add nREPL URL to output along side the human readable message
2014-01-09 13:48:25 -08:00
Laurent Petit
672d204ddb Add nREPL URL to output along side the human readable message 2014-01-09 22:41:34 +01:00
Jean Niklas L'orange
b497494b04 Merge pull request #1408 from drewnoakes/docs/tutorial
Updated TUTORIAL.md for Leiningen 2.3.4

[ci skip]
2014-01-07 10:58:36 -08:00
Drew Noakes
9291140e2e Updated TUTORIAL.md for Leiningen 2.3.4.
Updated `project.clj` file output created by `lein new app`.

Updated references to clojure 1.4.0 with clojure 1.5.1 (current stable release.)

Updated banner text displayed by `lein repl`.

Updated output of unit tests.

Updated command required to run a single unit test as the name is different in the current `app` template.
2014-01-07 18:53:16 +00:00
Jean Niklas L'orange
06594e6fcd Merge branch 'properly-init-profiles' 2014-01-07 14:05:53 +01:00
Jean Niklas L'orange
3d50e8c9ba Properly initialize read profiles.
Fixes #1407, fixes #1376.
2014-01-07 14:02:55 +01:00
Jean Niklas L'orange
a0c65e9ec1 Properly setup profiles within project map. 2014-01-07 13:51:10 +01:00
Jean Niklas L'orange
9131b52b0b Drag out common map setup functionality. 2014-01-07 12:58:23 +01:00
Jean Niklas L'orange
a579ccd750 Remove dead :jvm-opts lookup
Coming from the 57ea876ddd cleanup
2014-01-07 02:08:21 +01:00