Commit graph

872 commits

Author SHA1 Message Date
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
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
Jean Niklas L'orange
9e980b0f8a Bump nREPL version to 0.2.6 2014-09-15 01:26:18 +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
2c8c5dcb5f Fix erroneous shell command form, fixes #1683. 2014-09-13 16:11:59 +02: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
9a0448041a Rename :core-default to :leiningen/default. 2014-09-09 16:24:12 -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
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
58df6c31ad Merge branch 'profiles-from-plugins' 2014-09-06 10:54:47 -07: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
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
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
Phil Hagelberg
e9c9ff4883 Document in-plugin profiles. 2014-09-04 19:25:58 -07:00
Jean Niklas L'orange
f95a10d79b Use warn instead of println for warnings.
For classpath in lein-core.
2014-09-04 19:19:56 +02:00
Colin Jones
6fb558ad19 Bump nREPL & REPLy versions (to 0.2.5 & 0.3.5)
closes #1658
2014-09-04 09:42:39 -05:00
Phil Hagelberg
c12f9df081 Allow profiles to be loaded out of plugins.
Still needs testing.

Fixes #1672.
2014-09-02 18:52:35 -07:00
Hugo Duncan
fe1be7d2dc Apply profiles from middleware in main
When loading the project, ensure that profiles contributed by middleware
are correctly applied.
2014-09-01 07:29:23 -04:00
Hugo Duncan
7b8c1521ff Add a :project profile
The :project profile is not un-merged when building a jar or generating
a pom, so can be used to alter the basic layout of a project.

This allows plugins such as cljx and cljsbuild to provide profiles that
the project can choose to use to set source-paths, etc, leading to less
error-prone configuration in common use cases.

Fixes #1665
2014-09-01 07:03:58 -04:00
Hugo Duncan
8389a0b928 Fix pom with non-default :default profile
Unmerge expanded its profiles based on the profiles in the project
map (which don't include :default), rather than profiles in the
:profiles metadata.

The :default keys were also hard coded in the pom generation, so ignored
any additions.

This is in support of https://github.com/lynaghk/cljx/pull/48
2014-08-30 16:56:07 -04:00
Phil Hagelberg
2803647bc4 Move :pedantic setting to default map; displace it.
Fixes #1653.
2014-08-21 10:54:19 -07:00
Nelson Morris
fc6cb17002 Bump pedantic version
I've redone some of the internals of the pedantic library, so it should
be more efficent and has better documentation.

Fixes #1491
2014-08-16 18:01:40 -05:00
Jean Niklas L'orange
d3304f6ea4 Don't read git files if they are unreadable.
Also print warnings if the file is not readable. Fixes #1585.
2014-08-09 01:42:09 +02:00
Phil Hagelberg
6d79dcfedc Bump version number up to 2.4.4-SNAPSHOT. 2014-08-05 16:21:34 -07:00
Phil Hagelberg
983847276d Release 2.4.3 2014-08-05 16:03:18 -07:00
Phil Hagelberg
8b9d66cd7c Allow implicit hooks/middleware to be disabled.
Fixes #1621.
2014-08-05 15:35:00 -07:00
Manfred Moser
e0ad0db0d6 switching to https for the central repo 2014-08-01 16:12:51 -07:00
Hugo Duncan
eaffda3082 Add LEIN_NO_USER_PROFILES to avoid user profiles
When set, this environment var will prevent user level profiles from
loading.
2014-08-01 11:18:43 -04:00
Roger Allen
80f1418110 Fix for issue 1607
Instead of always using a regex to try to match the native-names keys
when doing a get-os or get-arch call, use a get-with-pattern-fallback
function to first try the exact match and only if that fails, use
get-by-pattern.  This prevents matching "x86_64" with "x86" when
"x86_64" is the better match.
2014-07-21 22:52:33 -07:00
Gary Fredericks
94601082e4 Fix the test that's been failing on Travis
The problem was something to do with the project map being too
bare. Switching to `defproject` fixes it.
2014-07-07 13:28:43 -05:00
Phil Hagelberg
8b98d68cdd Default to warning when version ranges are present.
Fixes #1374.
2014-07-04 10:51:24 -07:00
Phil Hagelberg
0621161473 Merge pull request #1584 from MichaelBlume/report-bad-filename
when opening a JarFile, report name of file in any errors
2014-07-02 22:15:51 -07:00
Mike Blume
71e5e95e13 when opening a JarFile, report name of file in any errors
java.util.JarFile. can fail without reporting the name of the file it's
operating on. If you have a jarfile that isn't a valid zip, this can be
confusing.
2014-07-02 16:15:19 -07:00
Phil Hagelberg
3e6d3876ad Better message when task ns exists, but not task function. Fixes #1299. 2014-06-17 13:19:27 -07:00
Phil Hagelberg
4b6eb01cf1 Fix LEIN_FAST_TRAMPOLINE path. Fixes #1562. 2014-06-16 13:05:27 -07:00
Phil Hagelberg
e6b620cabe Fix bad eval test. 2014-06-15 17:24:55 -07:00
Phil Hagelberg
e738fec65c Bump version to 2.4.3-SNAPSHOT. 2014-06-15 17:24:48 -07:00