luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,744 Commits 29 Branches 314 Tags 76 MiB
Commit Graph

11744 Commits

Author SHA1 Message Date
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
eugene yokota a1dfe86698 Merge pull request #112 from fommil/lunix 
add support for .jvmopts to the bash launcher
 2016-08-25 16:46:47 -04:00
Sam Halliday d9da67979a -java-home should set PATH for javac usage 2016-08-25 20:16:35 +01:00
Sam Halliday 45badebcee add support for .jvmopts to the bash launcher 2016-08-25 20:16:35 +01:00
eugene yokota a6e8d62c19 Merge pull request #111 from fommil/windows 
add support for .jvmopts and .java-version to Windows launcher
 2016-08-24 16:10:41 -04:00
Sam Halliday daed09b8cd add support for .jvmopts and .java-version to Windows launcher 2016-08-24 20:55:02 +01:00
eugene yokota 18e2fa2f28 Merge pull request #110 from sbt/fix-win-path 
Upgrade to sbt-native-packager 1.1.1. Fixes #76.
 2016-08-22 11:57:32 -04:00
Dale Wijnand a1e1a570e0 Add sbt.build.version from CONTRIBUTING to Travis config 2016-08-22 12:22:29 +01:00
Dale Wijnand acc734e669 Switch Travis to Oracle JDK 7 
.. required by the newer sbt-native-packager.
 2016-08-22 12:13:27 +01:00
Dale Wijnand cffb8e0441 Upgrade to sbt-native-packager 1.1.1. Fixes #76. 
The upgrade includes this fix https://github.com/sbt/sbt-native-packager/pull/169
 2016-08-22 11:37:19 +01:00
Dale Wijnand bea3fac13e Misc email/URL updates 2016-08-22 11:25:30 +01:00
Martin Duhem 8956da53a8 Update to latest revision of sjsonnew 2016-08-21 19:56:31 +02:00
Martin Duhem cee43575ce Remove unused additional formats 2016-08-21 17:52:08 +02:00
Martin Duhem 4e233d81f9 Make Maybe's toString closer to the actual code 2016-08-21 14:24:34 +02:00
Martin Duhem 432c93b0bb Implement hashCode, equals and toString in Maybe 
This brings Maybe's behavior closer to scala's Option.
 2016-08-19 15:52:17 +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
Martin Duhem feda07b896 Adapt to recent changes to sjson-new 2016-07-24 21:42:03 +01:00
Martin Duhem 465774b13c Adapt to recent changes to sbt-datatype 2016-07-24 21:10:36 +01: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
Johannes Rudolph 546e8e2e05 Merge pull request #108 from thetristan/generate-it-report 
Generate reports for projects using IntegrationTest config
 2016-06-30 08:45:44 +02: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
Martin Duhem c395bd14a8 Add `sub` to `CacheStoreFactory` 2016-06-28 19:44:51 +02:00