luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,724 Commits 29 Branches 318 Tags 96 MiB
Commit Graph

4724 Commits

Author SHA1 Message Date
eugene yokota c223dccb54 Merge pull request #2854 from ashleymercer/0.13-junit-skipped 
JUnitXmlTestsListener now correctly flags ignored, skipped and pending tests
 2016-11-30 18:03:04 -05:00
eugene yokota 5141a4524a Merge pull request #2855 from eed3si9n/wip/buildkey_fix 
Add build-level keys to the tab completion
 2016-11-30 14:00:51 -05:00
Eugene Yokota 00bab7b743 Add build-level keys to the tab completion 
Fixes #2460
Fixes #2851
Ref #2707, #2708, #2469

Unlike the previous attempts at fixing the handling of build-level
keys, this change does not change the main parsing logic, which uses
`getKey` to retrieve the key from the key map.
The fact that shell worked pre-0.13.11 means that the parsing was ok.

What this changes is just the "example" keys supplied to the parser so
the tab completion works.
 2016-11-30 02:33:05 -05:00
Ashley Mercer 26bc85cb67 JUnitXmlTestsListener now correctly flags ignored, skipped and pending tests 
Fixes #2198 Ref #PULL

Generated Junit-style XML reports now include a count of ignored,
skipped and pending tests; and individual tests are correctly flagged
with the <skipped/> element.
 2016-11-29 23:08:51 +00:00
Eugene Yokota 49809056fc Revert "Completion for build-level keys" 
This reverts commit e35f9bb11e.
 2016-11-29 05:59:33 -05:00
Eugene Yokota 612d9555d0 Revert "Unspecified project axis means current project or its build" 
This reverts commit 4fea604759.
 2016-11-29 05:59:18 -05:00
Eugene Yokota 33330c9d62 Revert "Address problems reported by Codacy" 
This reverts commit 1bda41fc31.
 2016-11-29 05:59:06 -05:00
Eugene Yokota 3e653f73b3 Revert "Fix key selection for build level keys" 
This reverts commit 60bcc58852.
 2016-11-29 05:57:43 -05:00
Paul Draper da1bdba0f8 Improve performance for DefaultParsers.validID(String) 
KeyIndex can call this method hundreds of thousands of times, so this
change makes a significant difference in loading time.
 2016-11-18 22:03:47 +00:00
eugene yokota a58b184195 Merge pull request #2828 from eed3si9n/wip/thedude 
Apply binary version conflict check to Compile related configs
 2016-11-11 20:11:25 -05:00
eugene yokota 85f9189d60 Merge pull request #2827 from eed3si9n/wip/mediator_fix 
Apply scalaVersion enforcement to Compile related configs
 2016-11-11 20:11:12 -05:00
Eugene Yokota 7d6c56e391 Apply binary version conflict check to Compile related configs 
Fixes #1466 Ref #2786

Even after fixing the mediator issue, we still have spurious binary
version conflict warning that does not account for sandbox
configurations.

This change follows the scalaVersionConfigs work.
 2016-11-11 15:44:05 -05:00
Eugene Yokota 07e2a9a799 Bump up Ivy 
Fixes #2015
 2016-11-11 14:42:48 -05:00
Eugene Yokota 8d0e4d2ef0 Apply scalaVersion enforcement to Compile related configs 
Fixes #2786. Ref #2634.

sbt 0.13.12 added Ivy mediator that enforces scalaOrganization and
scalaVersion for Scala toolchain artifacts.
This turns out to be a bit too aggressive because Ivy configurations
can be used as an independent dependency graph that does not rely on
the scalaVersion used by Compile configuration. By enforcing
scalaVersion in those graph causes runtime failure.

This change checks if the configuration extends Default, Compile,
Provided, or Optional before enforcing scalaVersion.
 2016-11-11 05:15:58 -05:00
eugene yokota 55e2b56af9 Merge pull request #2826 from vpetro/bump-giter8resolver-version 
Use sbt-giter8-resolver 0.1.2
 2016-11-09 11:39:18 -05:00
Petro Verkhogliad 08951436f0
Use sbt-giter8-resolver 0.1.2 2016-11-08 15:31:29 -05:00
Petro Verkhogliad 29a524e18d
Use sbt-giter8-resolver 0.1.1 2016-11-06 17:25:56 -05:00
Dale Wijnand 109cb4a762
Set version to 0.13.14-SNAPSHOT 2016-10-28 13:20:40 +01:00
Dale Wijnand 9d3bda71ea
Merge branch '0.13.13' into 0.13 
* 0.13.13:
  Set version in launchconfig to 0.13.13 (automatic)
  Temporarily disable control/io for Scala 2.12
  Set version to 0.13.13
 2016-10-28 13:20:05 +01:00
Dale Wijnand 673e89d087
Set version in launchconfig to 0.13.13 (automatic) 2016-10-28 13:15:32 +01:00
Dale Wijnand 1af8aab2d2
Temporarily disable control/io for Scala 2.12 2016-10-28 12:51:03 +01:00
Dale Wijnand 6dcba49934
Set version to 0.13.13 2016-10-28 12:02:36 +01:00
eugene yokota bbc70632d0 Merge pull request #2767 from avdv/fix-2766-sourceFile-null 
Fix #2766 sourceFile null causes NPE
 2016-10-25 13:40:48 -04:00
Eugene Yokota 462ee042ad Cross publishing to 2.12 2016-10-25 13:37:48 -04:00
eugene yokota 47a71c0ff5 Merge pull request #2794 from dwijnand/212 
Cross build io (+ control) for playframework/playframework#6110
 2016-10-24 13:38:33 -04:00
Dale Wijnand d32454c6e7
Cross build io (+ control) for playframework/playframework#6110 2016-10-20 22:07:33 +01:00
Eugene Yokota a3357af540 notes 2016-10-14 21:22:34 -04:00
Eugene Yokota bd4ba31544 launchconfig 2016-10-14 21:08:52 -04:00
Eugene Yokota cb5cf8dd54 notes 2016-10-14 21:08:39 -04:00
eugene yokota 38cfb622f7 Merge pull request #2764 from dwijnand/deprecate-tuple-enrich 
Deprecate tuple enrichments. Fixes #2763
 2016-10-14 20:13:22 -04:00
eugene yokota af2056b000 Merge pull request #2784 from eed3si9n/wip/show_dep 
Show deprecations in build.sbt
 2016-10-14 17:39:41 -04:00
Dale Wijnand 6ad39b1069
Deprecate tuple enrichments. Fixes #2763 2016-10-14 21:28:51 +01:00
eugene yokota 2a4e955e77 Merge pull request #2782 from bantonsson/lazily-concatenate-failed-errors 
Lazily concatenate failed errors for completion
 2016-10-14 16:17:08 -04:00
Eugene Yokota 620a49bb0c Improve deprecation message 2016-10-14 14:42:38 -04:00
Eugene Yokota cfac453c07 Add "-deprecattion" flag to metabuild 
Fixes #2783
Ref #2716

`build.sbt` is treated a Scala source of metabuild, so to enable
deprecation flag on build.sbt we set the option here.
 2016-10-14 14:19:53 -04:00
Eugene Yokota 81284081e2 Use non-deprecated constructor 2016-10-14 14:15:05 -04:00
Eugene Yokota 6ad545efea Move deprecation warnings to macro body 
Ref #2783
 2016-10-14 14:12:37 -04:00
eugene yokota a6cfb528c9 Merge pull request #2780 from eed3si9n/wip/template_resolver 
Safer template resolver
 2016-10-13 22:29:40 -04:00
Eugene Yokota f1055c79df Remove unused match 2016-10-13 18:15:54 -04:00
Eugene Yokota 4e09e9ef68 Refactoring per review 2016-10-13 18:12:40 -04:00
Björn Antonsson 127c164f81 Lazily concatenate failed errors for completion 
* Fixes [sbt/sbt#2781]
* When using `<TAB>` completion the failed errors were always
  computed for mathcing projects even if there was no failure,
  leading to excessive computation of Levenshtein distances
  and a large lag (seconds) on builds with many matching
  projects.
 2016-10-13 16:20:18 +02:00
Eugene Yokota 9430a1e1f8 Machine formatting fix 2016-10-13 00:50:42 -04:00
Eugene Yokota a1d972bb66 Remove dependencyOverrides 2016-10-13 00:49:06 -04:00
Eugene Yokota 6f3bbed47e Safer template resolver 
Fixes #2761

With sbt 0.13.13-RC1 rediscovered that the dependency pulled in from
Giter8 was affecting the plugins. To avoid this, this change splits up
the template resolver implementation to another module called
sbt-giter8-resolver, and it will be downloaded using Ivy into
`~/.sbt/0.13/templates/`, and then launched reflectively using Java as
the interface.
 2016-10-12 20:06:10 -04:00
Claudio Bley ec27d65fcb Fix #2766 sourceFile and sourcePath can be `null` 2016-10-01 15:12:24 +02:00
Miles Sabin 0dfd40972d Added CrossVersion.patch which strips off -bin-suffix. (#2757) 2016-09-29 01:42:59 +01:00
Dale Wijnand f860d5ef31 Recycle classloaders to be anti-hostile to JIT: Notes (#2756) 2016-09-27 23:26:24 +01:00
eugene yokota 9598884104 Merge pull request #2755 from dwijnand/show-seq-0.13 
[0.13.13] Improve `show` when key returns a `Seq`
 2016-09-27 18:08:31 -04:00
Eugene Yokota 272ada1e74
Improve `show` when key returns a `Seq` 
This changes the output to:

```
> show externalDependencyClasspath
[info] Updating {file:/xxx/hello/}root...
[info] Resolving jline#jline;2.12.1 ...
[info] Done updating.
[info] *
Attributed(/Users/xxx/.sbt/boot/scala-2.11.8/lib/scala-library.jar)
[info] *
Attributed(/Users/xxx/.ivy2/cache/commons-io/commons-io/jars/commons-io-
2.4.jar)
```
 2016-09-27 14:23:53 +01:00
eugene yokota b4bc9f13fb Merge pull request #2754 from retronym/ticket/SD-232-2 
SD-232 Recycle classloaders to be anti-hostile to JIT
 2016-09-26 18:53:12 -04:00