Commit graph

3827 commits

Author SHA1 Message Date
Fabio Tudone
bd6d25b323 Implemented non-map manifest and sections 2014-09-18 21:01:36 +02:00
Hugo Duncan
caa28570df Revert "Grant non-project profile access to with-profile"
This reverts commit 3a2cf94324.
2014-09-16 09:20:18 -04:00
Hugo Duncan
c2cc98e660 Add tests for with-profile 2014-09-16 09:16:13 -04:00
Hugo Duncan
d684019b46 Factor out default-project
Pulls the default project used when not in a directory into a separate
function, so it can be used in tests.
2014-09-16 09:16:12 -04:00
Hugo Duncan
dbf375f678 with-project returns values for all profile groups
with-profile was discarding return values for the result of each profile
group application.
2014-09-16 09:16:02 -04:00
Tim McCormack
ef4e459824 Use SimpleDateFormat instead of #inst (flaky)
#inst was failing when run as `lein test`, but not if I ran
`lein test leiningen.test.keys`. Something's screwy with
data-readers.
2014-09-15 17:02:40 -04:00
Hugo Duncan
1e1e5bcd32 Revert "Fix aliasing recursion with with-profile"
This reverts commit 0334cc8efa.
2014-09-15 17:01:48 -04:00
Phil Hagelberg
c78a8110a8 Release 2.5.0 2014-09-14 21:26:56 -07:00
Phil Hagelberg
7cca27e54a Depend directly on nrepl/clojure-complete.
[ci skip]
2014-09-14 20:52:09 -07:00
Phil Hagelberg
284c79c24c Merge pull request #1688 from hugoduncan/fix-jar-refactoring
Fix jar task broken by 87c3499
2014-09-14 20:34:23 -07:00
Jean Niklas L'orange
9e980b0f8a Bump nREPL version to 0.2.6 2014-09-15 01:26:18 +02:00
Jean Niklas L'orange
c6cfe88db7 Merge pull request #1689 from hugoduncan/fix-with-profile-aliases
Fix aliasing recursion with with-profile
2014-09-15 01:03:31 +02:00
Jean Niklas L'orange
11c0364302 Remove base dependencies for lein checkouts.
Closes #1629.
2014-09-14 15:07:00 +02:00
Jean Niklas L'orange
c362ae4bc2 Merge pull request #1691 from technomancy/fix-erroneous-shell-command-form
Fix negation in shell-command form.
2014-09-14 01:29:15 +02:00
Jean Niklas L'orange
fb33a9506e Set env var if .lein-fast-trampoline exists.
Makes it possible to just use LEIN_FAST_TRAMPOLINE in the Lein process,
to check if the user is using fast trampolining. Strictly speaking, one
previously had to check whether LEIN_FAST_TRAMPOLINE was set or check
that .lein-fast-trampoline existed inside Lein.
2014-09-14 01:22:31 +02:00
Hugo Duncan
0334cc8efa Fix aliasing recursion with with-profile
If an alias uses with-profile, then the alias was not being handled
correctly, causing a stack overflow.

e.g

    {:user {"plz" ["with-profile" "+plz" "plz"]}
     :plz {:plugins [[lein-plz "0.2.1"]]}}

    lein plz
2014-09-13 15:49:36 -04:00
Jean Niklas L'orange
2c8c5dcb5f Fix erroneous shell command form, fixes #1683. 2014-09-13 16:11:59 +02:00
Hugo Duncan
4a86c4f687 Fix jar task broken by 87c3499
The :provided scope profiles were not being captured before un-merging
profiles.
2014-09-13 08:49:29 -04:00
Phil Hagelberg
87c3499d3a Merge remote-tracking branch 'hugoduncan/fix-classifier-jars' 2014-09-12 17:24:47 -07:00
Phil Hagelberg
a625cf4f1a Release lein-pprint 1.1.2, allows running outside projects. 2014-09-12 10:37:53 -07:00
Phil Hagelberg
27c2e6fb24 Allow update-in task to run outside projects.
Fixes #1687.
2014-09-12 10:36:31 -07:00
Phil Hagelberg
23a772bfc2 Uberjar profile needs to be leaky too. 2014-09-10 16:25:25 -07:00
Hugo Duncan
bcb4e5af21 Propagate metadata on composite profiles
When metadata is specified on a composite profile, propagate the
metadata to the profiles it is composed of.
2014-09-10 07:00:36 -04:00
Phil Hagelberg
9def660852 Bump to 2.5.0-SNAPSHOT. 2014-09-09 16:26:47 -07:00
Phil Hagelberg
3f373ee918 A few documentation changes. 2014-09-09 16:25:46 -07:00
Phil Hagelberg
9a0448041a Rename :core-default to :leiningen/default. 2014-09-09 16:24:12 -07:00
Phil Hagelberg
60bb8e406e Merge remote-tracking branch 'hugoduncan/feature/annotated-profiles' 2014-09-09 15:43:40 -07:00
Hugo Duncan
2da05e6356 Add profile metadata
Adds :leaky and :pom-scope metadata for profiles.  The :dev, :test,
:base and :provided profiles are implemented in terms of these.

Profiles with :leaky metadata affect the pom and jar creation.

Profiles with a :pom-scope metadata of :test or :provided also affect
the dependencies of a pom.
2014-09-09 13:27:49 -04:00
Jean Niklas L'orange
400ad40c44 Test higher order aliases. 2014-09-09 02:13:26 +02:00
Jean Niklas L'orange
66926d3b5d Implement higher order aliases, closes #1678. 2014-09-09 02:13:18 +02:00
Phil Hagelberg
e13ccd7a5c Use plugin name for reading profiles for now.
This is for consistency with reading middleware/hooks. In the future it
might be nice to honor the group-id as well.
2014-09-08 11:17:09 -07:00
Phil Hagelberg
a206b0b1a2 Call load-plugins twice to fix chicken/egg problem.
Need to do this in order to support loading profiles from plugins but
also loading plugins from the :user and :system profiles.

fixes #1679
2014-09-08 11:01:39 -07:00
Phil Hagelberg
c8806ff12e Revert addition of :downstream profile.
We need to revisit this in a way that doesn't involve hard-coding
profile names into the jar and pom tasks. The question of whether the
profile should be visible to downstream consumers should be determined
by data that's part of the profile (or metadata).
2014-09-08 10:05:21 -07:00
Phil Hagelberg
df3f67269f Merge pull request #1676 from timmc/alt-jvm-encoding
Allow $LEIN_JVM_OPTS to override -Dfile.encoding
2014-09-08 09:51:06 -07:00
Tim McCormack
6696f11341 Allow JVM file.encoding to be overridden by anything.
This allows profiles to set a -Dfile.encoding. Later, perhaps in 3.0,
JVM_OPTS should perhaps be moved farther down the list (along with
:jvm-opts?) -- but that could be a breaking change. (Environment is
sometimes set locally, sometimes set globally.)
2014-09-08 09:17:06 -04:00
Tim McCormack
74ec14fb20 Move $LEIN_JVM_OPTS farther down (override all but cp and lein*) 2014-09-08 09:07:40 -04:00
Nelson Morris
c142b24598 Show pedantic warnings and use profile merging to let deps :tree warn correctly 2014-09-07 20:42:48 -05:00
Phil Hagelberg
0184e5c84d Update bin/release with more checks.
[ci skip]
2014-09-06 15:14:57 -07:00
Phil Hagelberg
23f14ddfe8 Update NEWS.md file.
[ci skip]
2014-09-06 15:12:19 -07:00
Phil Hagelberg
58df6c31ad Merge branch 'profiles-from-plugins' 2014-09-06 10:54:47 -07:00
Phil Hagelberg
a2592ba13c Move :auto-clean to jar task.
Fixes #1642.
2014-09-06 10:54:25 -07:00
Jean Niklas L'orange
1b9f5d0705 Merge pull request #1599 from samuelbosch/master
use call to run wget and curl
2014-09-06 15:58:40 +02:00
Phil Hagelberg
577e34919b Merge remote-tracking branch 'hugoduncan/fix-unmerge-with-meta-profiles' into profiles-from-plugins
Conflicts:
	src/leiningen/pom.clj
2014-09-05 20:47:02 -07:00
Phil Hagelberg
360e63d6b0 Fix a test. 2014-09-05 20:43:13 -07:00
Phil Hagelberg
a9cf70e160 Revert "Apply profiles from middleware in main"
This reverts commit fe1be7d2dc.

Conflicts:
	leiningen-core/src/leiningen/core/main.clj
	leiningen-core/src/leiningen/core/project.clj
2014-09-05 20:28:17 -07:00
Phil Hagelberg
e434741df3 Improve docs for default profiles. 2014-09-05 20:24:29 -07:00
Phil Hagelberg
6a7a35d062 Make leiningen.core.project/read init the project.
Add a raw-read alternative that reads without initializing.

This solves a certain chicken/egg problem with wanting to read profiles
from plugins before the plugins had been loaded.
2014-09-05 20:24:20 -07:00
Phil Hagelberg
0a8c0aaee6 Rename :project profile to :downstream. 2014-09-05 20:24:06 -07:00
Phil Hagelberg
e13312d344 Merge remote-tracking branch 'hugoduncan/feature/add-project-profile' into profiles-from-plugins 2014-09-05 19:29:35 -07:00
Phil Hagelberg
ec01608956 Fix loading profiles from plugins.
This does it too late in the process for plugin profiles to be
referenced from :default, but it's a start.
2014-09-05 09:24:33 -07:00