Commit Graph

5624 Commits

Author SHA1 Message Date
Eugene Yokota f4400ed171 zinc 1.0.0-X3 2016-09-06 23:39:34 -04:00
Dale Wijnand 1ba7bb0fb9 Merge pull request #2712 from Duhemm/fport/key-selection-build-level
Forward port #2469 & #2708
2016-09-01 09:23:01 +01:00
Dale Wijnand 472d28964a Configure scripted to do less
Particularly doesn't compile, package and publish source and doc jars.
2016-09-01 01:14:14 +01:00
Martin Duhem faf6120c93 Unspecified project axis means current project or its build 2016-08-31 10:42:32 +02:00
Eugene Yokota 9655f50c55 bumping to zinc 1.0.0-X2 2016-08-30 21:37:20 -04:00
kenji yoshida 27fe8eb6f7 remove unused imports (#2719) 2016-08-30 07:29:17 +01:00
Dale Wijnand 2df9f9492d Merge pull request #2711 from eed3si9n/wip/value_and_op
[sbt 1.0] Remove old operators `<<=`, `<+=`, and `<++=`
2016-08-30 07:17:52 +01:00
Eugene Yokota 01bd4add3c Replace the old operators with Restligeist macros
The old operators `<<=`, `<+=`, and `<++=` are now replaced with
Restligeist macros that will always fail during compile-time but can
display migration guide as the error message.

This would provide better upgrade experience than simply removing the
methods and displaying `<<= is not a member of sbt.TaskKey`.
2016-08-29 23:08:27 -04:00
Eugene Yokota 829ec4dd3a Update Defaults and scripted to := style 2016-08-29 23:02:10 -04:00
eugene yokota 9335a03837 Merge pull request #2718 from xuwei-k/JavaConverters
use JavaConverters instead of JavaConversions
2016-08-29 15:31:01 -04:00
eugene yokota 9f21bb451d [sbt 1.0] Remove .value extension method from input tasks (#2710)
* Remove .value from input tasks. Ref #2709

Calling `.value` method on an input task returns `InputTask[A]`, which
is completely unintuitive and often results to a bug.

In most cases `.evaluated` should be called, which returns `A` by
evaluating the task. Just in case `InputTask[A]` is needed,
`toInputTask` method is now provided.

* Fixed test

* Rename toInputTask to inputTaskValue
2016-08-29 21:11:32 +02:00
xuwei-k 857fc0f5da use JavaConverters instead of JavaConversions
- https://issues.scala-lang.org/browse/SI-9684
- 0c5b42d974
2016-08-30 01:31:04 +09:00
eugene yokota 57cc782db8 Cutting out openjdk7 from PR validation (#2714) 2016-08-26 23:44:05 -04:00
Martin Duhem cfdbce10da Scripted test for build level keys. 2016-08-26 08:14:28 +02:00
Martin Duhem 3da38b14db Fix key selection for build level keys
PR #2469 added build keys to tab completion, with the side effect of
considering as available candidate in key selection, thus making sbt
think that some inputs were ambiguous (e.g. `baseDirectory`): should it
apply to the current project or to the build level key?

This commit fixes this issue by improving the key selection:
 - If there's no candidate, we return the default key
 - If there's a single possible project level key, and zero or more
   build level keys, then we select the project level key.
 - If there are zero project level key, and a single build level key,
   then we select the build level key
 - If there are multiple candidates, sbt says that the input is
   ambiguous.

Fixes #2707
2016-08-26 08:14:28 +02:00
Martin Duhem 3c9d2ff57a Completion for build-level keys
sbt's shell provided completion only for keys that were relative to a
defined project, but didn't provide completion for keys that belong to
the build definition only.

This commit fixes this issue by defining a new kind of `Parser` (from
which completions are generated) which runs its input simultaneously on
distinct parsers. We now define a parser for project-level keys and
another parser for build-level keys. These two parsers are eventually
combined, and we get the completions of both parsers.

Fixes sbt/sbt#2460
2016-08-26 08:14:28 +02:00
kenji yoshida 0c086a7761 `aggregate` can now be used inside a .sbt file (#2683)
(cherry picked from commit b92e5773f7)
2016-07-27 23:35:16 +09:00
Dale Wijnand 480a2f3040 Merge pull request #2676 from eed3si9n/wip/scalariform
Check formatting with TravisCI
2016-07-19 00:29:06 +01:00
Eugene Yokota 2dce25fa66 Fix travis file 2016-07-18 12:58:30 -04:00
Dale Wijnand c5f59d4406 Check formatting with TravisCI
Fixes #2657
2016-07-18 12:58:30 -04:00
eugene yokota f221d0ab28 Merge pull request #2667 from OlegYch/fix-project-macro-error-message
Better error message from project macro
2016-07-18 11:29:26 -04:00
eugene yokota 4b0ccd2dab Merge pull request #2670 from dwijnand/remove-404-resolvers
Remove resolvers to repositories that don't exist
2016-07-18 11:10:18 -04:00
Dale Wijnand b245cf5f58 Remove resolvers to repositories that don't exist
Fixes #2195
2016-07-15 08:16:40 +01:00
eugene yokota 5abccaedd2 Merge pull request #2673 from dwijnand/leave-update-options-alone
Don't redefine updateOptions to ignore ThisBuild
2016-07-14 22:35:28 -04:00
eugene yokota 8a85d851cf Merge pull request #2672 from dwijnand/unusued
Remove unused imports, vals and defs
2016-07-14 22:32:51 -04:00
Dale Wijnand 84c611af36 Remove unused vals/defs 2016-07-12 14:31:35 +01:00
Dale Wijnand 886d95c0e5 Don't redefine updateOptions to ignore ThisBuild
Fixes #2671
2016-07-12 13:24:14 +01:00
Dale Wijnand deea82542c Remove unused imports 2016-07-12 11:55:10 +01:00
OlegYch caba7e145c Better error message from project macro 2016-07-12 01:29:24 +03:00
Dale Wijnand 798683b552 Merge pull request #2661 from dwijnand/AutoPlugin-require-JvmPlugin-by-default
AutoPlugin should require JvmPlugin by default
2016-07-08 12:53:45 +01:00
Dale Wijnand 96e086b1a1 AutoPlugin should require JvmPlugin by default
Fixes #2082
2016-07-08 10:57:55 +01:00
Dale Wijnand 06797514f8 Merge pull request #2655 from dwijnand/cocodacy
Fix #2611: Codacy issues
2016-07-07 23:46:07 +01:00
Dale Wijnand 650f080bac Update mima usage in Travis 2016-07-07 18:21:26 +01:00
Dale Wijnand f02485b54b Configure Travis for fast finishing
See https://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
2016-07-07 18:21:25 +01:00
Dale Wijnand 12c2734052 Pattern match some if/else's 2016-07-07 18:21:25 +01:00
Dale Wijnand 4c75d778b9 Group imports 2016-07-07 18:21:25 +01:00
Dale Wijnand 32760bed55 Remove some fatal exception catching 2016-07-07 18:21:25 +01:00
Dale Wijnand 387674a451 Remove some heads and tails 2016-07-07 18:21:25 +01:00
Martin Duhem 79b9dbf01b Merge pull request #2656 from eed3si9n/wip/zincbump2
bump Zinc up
2016-07-07 06:48:14 +01:00
Eugene Yokota 83f585a95b bump Zinc up 2016-07-06 22:59:50 -04:00
Dale Wijnand d77e769635 Cleanup testAgentProj 2016-07-07 01:40:01 +01:00
Dale Wijnand 222a970080 Kill some vars 2016-07-07 01:39:52 +01:00
eugene yokota c48375c294 Merge pull request #2651 from eed3si9n/wip/zincbump
Rework DefinesClass lookup + other Zinc changes
2016-06-28 20:33:41 +02:00
Eugene Yokota 4195d8aca2 Bumping Zinc to 1.0.0-M5 2016-06-28 14:53:57 +02:00
Eugene Yokota 246ec58e35 Adapting to Zinc changes 2016-06-26 03:55:37 +02:00
Grzegorz Kossakowski 824b59a3ef Adapt to changes to DefinesClass in zinc
The definition of `DefinesClass` has changed from being a function
`File => String => Boolean` to just a function `String => Boolean`. The
changes in this commit reflect that fact.

Also, this commit implements a newly introduced PerClasspathEntryLookup.
2016-06-26 03:49:55 +02:00
Grzegorz Kossakowski e8c5ff0ffe Remove use of `DefinesClass` in Load.scala
It turns out that `DefinesClass` was a dead data: it was passed around
but not used anywhere.
2016-06-26 03:49:55 +02:00
Eugene Yokota 8f29d3b724 Typo 2016-06-24 18:57:36 +02:00
Dale Wijnand 836911deab Bump to Java 7 (#2649) 2016-06-21 18:40:24 +02:00
eugene yokota 7bc9b5a875 Merge pull request #2646 from dwijnand/cleanups
Cleanups
2016-06-21 18:40:01 +02:00