Commit graph

420 commits

Author SHA1 Message Date
Hugo Duncan
bb0b132894 Fix inclusion of explicitly added profiles in jar
Closes #1701
2014-09-25 12:48:44 -04:00
Tim McCormack
5b089a024b Merge branch 'test-1676-fie-encoding' 2014-09-23 13:11:57 -04:00
Tim McCormack
225e24b2c5 Add regression test for file.encoding override 2014-09-23 09:29:26 -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
Jean Niklas L'orange
9e980b0f8a Bump nREPL version to 0.2.6 2014-09-15 01:26:18 +02: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
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
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
360e63d6b0 Fix a test. 2014-09-05 20:43:13 -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
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
00804b151d Restore previous order of dependencies in pom 2014-09-03 06:32:24 -04:00
Hugo Duncan
831d2cf0dd Add simple test for :project profile in pom 2014-09-01 13:44:01 -04:00
Hugo Duncan
a57160f432 Fix with-profile test 2014-09-01 10:14:55 -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
Florian Anderiasch
8fa694d68d Allow https links for drawbridge integration 2014-08-22 20:57:02 +02: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
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
Phil Hagelberg
2028cd7951 Revert "Check that exactly one (existing) source file is found per namespace when compiling"
This reverts commit c2cc916dc6.
2014-08-05 16:02:02 -07:00
Phil Hagelberg
0c9be93a3c Failing test for #1569. 2014-08-04 13:35:16 -07:00
Manfred Moser
e0ad0db0d6 switching to https for the central repo 2014-08-01 16:12:51 -07:00
Stuart Fehr
7b8c6a47af Fixed the testing string for the test-write-jar function 2014-07-09 19:19:54 -06:00
Stuart Fehr
87ea64dedb Added a unit test for the Main-Class warning in write-jar 2014-07-09 19:16:02 -06:00
Phil Hagelberg
0d51dc91dc Fix change task test to not be overly specific. 2014-07-04 11:00:22 -07:00
Thomas Hancock
c2cc916dc6 Check that exactly one (existing) source file is found per namespace when compiling 2014-06-19 18:55:56 +01:00
Phil Hagelberg
51930c7a04 Update new key expiry dates. 2014-06-15 18:30:32 -07:00
Phil Hagelberg
f8711c48e3 Fix splicing for partial aliases. 2014-06-08 15:12:29 -07:00
Phil Hagelberg
e3a05474d3 Remove bogus test. 2014-06-08 08:33:42 -07:00
Phil Hagelberg
1845541b31 Don't bump patch version in alpha/beta/rc bumps.
Fixes #1539.
2014-06-03 15:07:13 -07:00
Phil Hagelberg
5ddc3fd67d Clean up deploy repository aliasing to work with both :repositories entries. 2014-05-27 11:17:51 -07:00
Phil Hagelberg
ad522387f3 Move level parsing to release task function. Default to :patch. 2014-05-27 10:56:36 -07:00
Phil Hagelberg
3e6b8a1818 Merge remote-tracking branch 'waynr/deploy-repositories-aliasing'
# 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-05-27 10:38:02 -07:00
Phil Hagelberg
573ebd8481 Merge remote-tracking branch 'arr-ee/fix-1534'
# 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-05-27 09:36:34 -07:00
Wayne
07c1c7a7f8 Enable simple aliasing in :deploy-repositories. 2014-05-26 19:00:35 -07:00
Chris Truter
6f620ad317 Use existing helper instead
1. Reorganise tests a bit so loading property still checked.
2. Add explicit exception if unexpected type to `collapse-function`
3. Unrelated addition of test to show leading `:` ignored in nested paths
2014-05-26 08:05:45 +02:00
Chris Truter
fc9884b5c4 Disable problematic but non-essential test
Failure must have something to do with namespace state that
changes between running tests in REPL and running the full suite.

Test is not an important property, so just commenting out.
2014-05-26 07:55:18 +02:00
Chris Truter
93e82887bf Aggressive resolve policy for lein.change functions 2014-05-26 07:55:18 +02:00
Max Barnash
8741938311 Fixed change task to work with newlines 2014-05-26 07:29:20 +04:00
Phil Hagelberg
e0640c21a6 Merge remote-tracking branch 'crisptrutski/set-group-or-artifact-id'
Conflicts:
	src/leiningen/change.clj
2014-05-25 17:45:36 -07:00
Phil Hagelberg
d8765c978c Merge remote-tracking branch 'crisptrutski/lein-release-and-change-interop'
Conflicts:
	src/leiningen/release.clj
	test/leiningen/test/release.clj
2014-05-25 17:12:12 -07:00
Phil Hagelberg
28eb8f02c5 Make bump-version work with strings and default to bound *level*. 2014-05-25 15:05:56 -07:00
Chris Truter
b99c207340 Fix things broken by late rename
Note to self:

Always unload namespaces and test again after renaming.
2014-05-25 16:28:02 +02:00
Chris Truter
08c3ad2587 Update leiningen.change tests to use real bump-version
Not sure what you think of creating this kind of coupling in the tests.

This were useful tests for driving the previous commits, but happy to
delete them now.
2014-05-25 16:11:29 +02:00
Chris Truter
c5bd294aa5 Reappropriate bump-version function for lein.change usability
One wart to notice is that argument order is switched between
`bump-version-map` and `bump-version`. This is because the `lein.change`
semantics enforce that version-string is the first argument.

Have not added tests for this function, do you think we should?
2014-05-25 16:09:48 +02:00
Chris Truter
16e283e14f Implement artifact/group-id editability 2014-05-25 14:54:33 +02:00
Chris Truter
a1e6fa6db9 Whitespace and test group merge 2014-05-25 14:54:06 +02:00