Commit graph

3939 commits

Author SHA1 Message Date
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
Tim McCormack
b5ded1a524 Allow LEIN_JVM_OPTS to override -Dfile.encoding.
This allows the JVM to be run with an encoding other than UTF-8; my
own use-case for this is running tests to check if I'm forgetting to
specify UTF-8 in any character encoding/decoding calls.
2014-09-05 09:49:49 -04:00
Phil Hagelberg
e9c9ff4883 Document in-plugin profiles. 2014-09-04 19:25:58 -07:00
Hugo Duncan
a83aefe6cc Expand builtin profile docs in README 2014-09-04 15:20:08 -04: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
Jean Niklas L'orange
c8c193bc6b Make LEIN_SILENT suppress compile messages.
Fixes #1675.
2014-09-04 19:18:04 +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
Hugo Duncan
5b4cda662a Add :project profile to PROFILES.md 2014-09-04 08:43:50 -04:00
Hugo Duncan
00804b151d Restore previous order of dependencies in pom 2014-09-03 06:32:24 -04: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
Phil Hagelberg
d0b7cd7984 Remove :scope from sample.project.clj. 2014-09-02 18:52:11 -07:00
Phil Hagelberg
d0cb4c2a63 Merge pull request #1671 from hugoduncan/feature/warn-if-classifier-sets-dependencies
Add warning if classifier specifies :dependencies
2014-09-02 13:16:22 -07:00
Hugo Duncan
f3c6719774 Add warning if classifier specifies :dependencies
An artifact with a classifier can not have different dependencies to the
project's main artifact.
2014-09-02 12:54:27 -04:00
Hugo Duncan
831d2cf0dd Add simple test for :project profile in pom 2014-09-01 13:44:01 -04:00
Hugo Duncan
a19633f341 Fix pom for case with added profiles 2014-09-01 10:15:18 -04:00
Hugo Duncan
a57160f432 Fix with-profile test 2014-09-01 10:14:55 -04: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
d5d44a6f7e Merge pull request #1626 from tihancock/unique-file-per-namespace
Ensure that there are not multiple source files for a namespace
2014-08-23 17:28:13 -07:00
Tom Hancock
60e3ae3c66 Prioritise compilation of namespaces backed by files 2014-08-22 21:10:43 +01:00
Jean Niklas L'orange
554861505c Merge pull request #1659 from winks/issue-1518-https
Allow https links for drawbridge integration
2014-08-22 22:05:29 +02:00
Florian Anderiasch
8fa694d68d Allow https links for drawbridge integration 2014-08-22 20:57:02 +02:00
Phil Hagelberg
9df08bac93 Merge pull request #1651 from winks/issue-1518
Allow 'repl :connect' to read args from file
2014-08-22 09:50:03 -07:00
Florian Anderiasch
2a2adb2aad Allow 'repl :connect' to read args from file
This basically works like in curl, you specify @filename and then the
contents of the file are literally used as if written on the CLI.

@TODO this will not work:
lein repl :connect @./some/file
because there is no realpath resolution
but this works:
lein repl :connect @/full/path
and this as well:
lein repl :connect @some/file
2014-08-22 18:06:23 +02:00
Phil Hagelberg
2803647bc4 Move :pedantic setting to default map; displace it.
Fixes #1653.
2014-08-21 10:54:19 -07:00
Phil Hagelberg
ad65195f40 Add lein deps :implicits subtask. 2014-08-21 10:22:47 -07:00
Phil Hagelberg
004f8a24a6 Merge pull request #1649 from MarcoPolo/sequential-fix-in-relativize
seq? -> sequential? to be able to handle vectors in pom/relativize
2014-08-20 20:14:27 -07:00
Marco Munizaga
90c13d91fe seq? -> sequential? to be able to handle vectors in pom/relativize
The current implementation would break if a middleware plugin emitted a vector for any of the keys in L20 .

It wraps the output in a vec, so it's reasonable to assume it could take a vec as well.
2014-08-18 22:42:35 -07:00
Jean Niklas L'orange
be909c8f45 Check if mktemp is available before using it.
Fixes #1514.
2014-08-18 20:52:57 +02:00
Jean Niklas L'orange
c5568e8ccf Merge pull request #1648 from jgdavey/zsh
Zsh completion
2014-08-18 20:36:15 +02:00
Joshua Davey
2f25510edc Check if in a lein project before ns completion 2014-08-18 13:26:53 -05:00
Joshua Davey
8c990e535a Fix up namespace completion
* Complete even when test dir is missing
* Remove trailing parentheses
* Use only one invocation of awk
2014-08-18 11:20:52 -05:00
Joshua Davey
3ff6a1fe96 Update zsh tasks from latest leiningen release 2014-08-18 10:55:31 -05:00
Jean Niklas L'orange
b9dced16d5 Clarify what "last one" means for profile override
Re: #1646
[ci-skip]
2014-08-17 23:43:14 +02: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
Phil Hagelberg
77e35035fb Merge pull request #1640 from phalphalak/separate-control-flow-from-version-parsing
Extract version parsing function out of parse-semantic-version.
2014-08-14 15:03:36 -07:00
Roman Flammer
9920681736 Extract version parsing function out of parse-semantic-version.
Enables parsing of the semantic version without triggering an abort
in case of a parse failure.

Fix typo.
2014-08-13 14:06:31 +02:00
Jean Niklas L'orange
651370487d Fix grammar and print exit code from http client. 2014-08-11 09:59:04 +02:00