Commit Graph

11744 Commits

Author SHA1 Message Date
Dmitrii Naumenko e28e451431 remove duplicates from allJars when creating ScalaInstance #5052 (#5053)
Fixes #5052
2019-09-07 16:26:13 -04:00
Brice Jaglin 17d25ccc44 Disable cached resolution for ignoreMissingUpdate (#184)
Before 7992dc9, a custom, non-cached-resolution-aware update task was
used to generate the report that the tree is based on, effectively
ignoring the cached resolution flag at the project level.

Starting 7992dc9, this plugin, when run with sbt 0.13.8 or sbt 1.2.5+,
relies on cached-resolution-backed reports for projects that have
the engine enabled via `updateOptions`. Other 1.x releases are not
directly impacted as sbt had a buggy implementation of the feature
anyway, see https://github.com/sbt/sbt/issues/3761.

Cached resolution has the side effect of generating an ivy report
with artificial module descriptors which makes it hard to reconstruct
the tree without inlining sbt internals (see below), so this
effectively ignores it *for the purpose of the tree generation*, even
if the project enabled it for the regular report.

ModuleId(
  org.scala-sbt.temp,
  temp-resolve-e2a956132f02c038285b41b374c02f5838076f37,
  1.0
)

https://github.com/sbt/librarymanagement/blob/984de6f/ivy/src/main/scala/sbt/internal/librarymanagement/ivyint/CachedResolutionResolveEngine.scala#L137
2019-09-07 14:03:56 +02:00
Ethan Atkins 946cbfe2b4
Merge pull request #5054 from eatkins/watch-deprecations
Update deprecation warnings for api changes
2019-09-06 12:55:12 -07:00
Ethan Atkins 955547e5bd Update deprecation warnings for api changes
During refactoring, these warnings got out of date. I also added
scaladoc to the watchTriggeredMessage key.

Ref: https://github.com/sbt/sbt/issues/5051.
2019-09-06 12:10:59 -07:00
eugene yokota 3181b291ba
Merge pull request #279 from eed3si9n/wip/travis
Fix -XX:MaxPermSize getting emitted for JDK 11
2019-09-05 23:45:27 -04:00
Eugene Yokota b629c92391 Fix -XX:MaxPermSize getting emitted for JDK 11
Fixes sbt/sbt#5031
2019-09-05 23:09:59 -04:00
Eugene Yokota 91b71b39d3 Reproduce JDK 11 warning
Ref https://github.com/sbt/sbt/issues/5031
2019-09-05 22:53:03 -04:00
Eugene Yokota 06cece1733 Add names to the Travis CI jobs 2019-09-05 16:03:14 -04:00
Ethan Atkins 1e25bc917c
Merge pull request #5027 from eatkins/1.3.x-merge
1.3.x merge
2019-09-05 12:35:51 -07:00
Ethan Atkins a82e7892ab Bump sbt version 2019-09-05 11:46:23 -07:00
Ethan Atkins 58b3d970d0 Merge remote-tracking branch 'origin/1.3.x' into 1.3.x-merge 2019-09-05 11:44:24 -07:00
Josh Soref c9d5cbe808 https://www.scala-sbt.org 2019-09-05 14:11:13 -04:00
Josh Soref d4cad80bc3 https://www.scala-lang.org 2019-09-05 14:11:10 -04:00
Josh Soref 5579727148 https://www.jsonrpc.org 2019-09-05 14:11:09 -04:00
Josh Soref 746405c936 https://www.apple.com 2019-09-05 14:11:07 -04:00
Josh Soref 931a2f003b https://stackoverflow.com 2019-09-05 14:11:06 -04:00
Josh Soref a348a0f849 https://jsoup.org 2019-09-05 14:11:05 -04:00
Josh Soref 5408c1021e https://github.com 2019-09-05 14:11:04 -04:00
Josh Soref 52105ab62c https://docs.scala-lang.org 2019-09-05 14:11:02 -04:00
Josh Soref 5ab94fa2ac https://developer.lightbend.com 2019-09-05 14:11:01 -04:00
Josh Soref 747416173a https://apocalisp.wordpress.com 2019-09-05 14:10:59 -04:00
Ethan Atkins a0dc3fc06a Bump sbt dogfood version 2019-09-05 10:20:24 -07:00
Ethan Atkins 7c2a1c858b 1.3.0
-----BEGIN PGP SIGNATURE-----
 
 iQEcBAABAgAGBQJdbz/aAAoJEDeJDimNmiv6Am8IAKv23f6BPIWZFeokzJLkUt8v
 DDLyzIwzE0hTFKInCNhGDCFtACFFgoD8/7t9D5gmLttQr4F9ke94DqWBEP3kbgan
 Qb4rR8uwglPUJmOhzBj2Qs3A8fAXdg3wm/6OlllQzBwCYNxFf3MhmJc3hF4vd+jO
 93JqwbY50entqha9z299+NpLPTKWtVC5R+1pAF+LwObjLOYqlxiGvAcl7jWx1qte
 VN+BabBYT4Hw43kJCutglHu8vttG68m+fqYGxjAmZXYBAbn0NPyE7GHmqkQ5baAz
 DUbc0vU2nY6tpUFNlNfu9PTPnRwHdSjSJTa9Ug7hw24z2oTg2tapNDXIpt6n6ZA=
 =onwH
 -----END PGP SIGNATURE-----

Merge tag 'v1.3.0' into 1.3.x-merge

1.3.0
2019-09-05 10:15:41 -07:00
eugene yokota 7cd29cda7b
Merge pull request #5029 from eed3si9n/wip/1.3.0
sbt 1.3.0
2019-09-04 13:28:48 -04:00
Eugene Yokota 665eb8f870 sbt 1.3.0 2019-09-04 01:24:08 -04:00
eugene yokota fbfceb5ded
Merge pull request #5028 from eed3si9n/wip/bump
bump io, lm, and zinc to 1.3.0
2019-09-04 00:36:21 -04:00
Eugene Yokota fa3a09368e bump io, lm, and zinc to 1.3.0 2019-09-03 23:51:13 -04:00
eugene yokota be1163b672
Merge pull request #5025 from eatkins/supershell-appender
Improve supershell appender management
2019-09-03 19:25:09 -04:00
Ethan Atkins 7c31e03d27 Improve supershell appender management
To avoid reliance on jvm global variables, we need to share the super
shell state with each of the console appenders that write to the console
out. We only set the progress state for the console appenders for the
screen. This prevents messages that are below the global logging level
from modifying the progress state without preventing them from being
written to other appenders.

The ability to set the ProgressState for each of the console appenders
is added in a companion util PR.

I verified that the test output of io/test was correctly written to the
streams after this change (there were no progress lines in the output).
2019-09-03 15:22:34 -07:00
eugene yokota 2086d3be5a
Merge pull request #218 from eatkins/rework-supershell-interlacing
Fix supershell position bug
2019-09-03 17:12:05 -04:00
eugene yokota aad5aa39e0
Merge pull request #219 from eed3si9n/wip/bumpio
IO 1.3.0
2019-09-03 16:44:28 -04:00
Ethan Atkins f20b275045 Fix supershell position bug
The previous implementation of supershell log line interlacing with
regular line interlacing relied on state in a global object. A somewhat
better approach is for each appender to hold a reference to a state
object. Every time tasks run, new appenders are created, so the state
should always reflect the current progress state.
2019-09-03 13:07:51 -07:00
Eugene Yokota 1aef82aedb IO 1.3.0 2019-09-03 16:00:50 -04:00
eugene yokota 4f2ffe9b36
Merge pull request #5018 from eatkins/output-file-stamp-cache
Use managedFileStampCache for dependency classpath
2019-09-02 23:17:27 -04:00
eugene yokota 26293640c6
Merge pull request #5022 from eatkins/supershell-no-color
Allow supershell in no color mode
2019-09-02 23:15:52 -04:00
eugene yokota 903571cc62
Merge pull request #5023 from eatkins/supershell-test-names
Name test tasks with the test name
2019-09-02 20:13:50 -04:00
Ethan Atkins b996675c93 Name test tasks with the test name
Ref https://github.com/sbt/sbt/issues/4911. This names each parallel
test task with the name of the task so that supershell can display it.
It only applies for parallel tests. When run sequentially, supershell
will still display executeTests.
2019-09-02 14:58:49 -07:00
eugene yokota c0146ed0ff
Merge pull request #216 from eatkins/supershell-flickering
Interlace log lines with task progress
2019-09-02 17:08:22 -04:00
Ethan Atkins 19ead4144d
Merge pull request #5014 from eatkins/fail-on-exception
Display only valid pages in scripted completions
2019-09-02 11:41:21 -07:00
Ethan Atkins a02a58dcfa Allow supershell in no color mode
Disabling supershell when color mode is disabled is a sensible default
(especially for piped output). However, I think it should still be
possible to use supershell in no color mode.

This requires a util change that also enables supershell in no color
mode.
2019-09-02 11:26:24 -07:00
Ethan Atkins 635316902d Allow supershell to work in no color mode
Supershell actually works quite well in no color mode. On the sbt side,
we still want to disable supershell automatically if the output is not a
terminal or no color is set, but this commit allows the user to force
supershell through -Dsbt.supershell or the useSuperShell setting even
when no color is set.
2019-09-02 11:10:42 -07:00
Ethan Atkins a5666e97b6 Manage progress padding
With this commit, I improved the padding management so that padding is
now added above the progress report. Whenever a line is logged at the
info or greater level, we can reduce the padding level by one since that
line has effectively filled in the padding.
2019-09-01 22:26:57 -07:00
eugene yokota 4d01ef449d
Merge pull request #5020 from eatkins/build-upgrade
Build upgrade
2019-09-02 01:05:06 -04:00
eugene yokota 183b45897a
Merge pull request #5017 from eed3si9n/wip/once
evaluate test result only once
2019-09-02 01:04:25 -04:00
eugene yokota 7018d6ebf4
Merge pull request #5019 from eatkins/task-timings
Fix task timings
2019-09-02 01:04:03 -04:00
Ethan Atkins d9fe5540f5 Interlace log lines with task progress
With the current supershell implementation, the progress display
flickers when there is heavy console logging during task evaluation.
This is because the console appender clears out the task progress and it
isn't restored until the next periodic super shell report (which
runs every 100ms by default). To remove the flickering, I reworked the
implementation to interlace the log lines with progress reports. In
order to ensure that the log lines remained contiguous, I had to apply
padding at the bottom of the supershell region whenever the new report
contained fewer lines than the old report. The report shifts down as new
log lines are appended. This isn't optimal, but I think removing
the flickering while preserving contiguous log lines is worth it.
2019-09-01 21:06:48 -07:00
Ethan Atkins 4e1074d175 Use turbo in sbt build 2019-09-01 19:20:27 -07:00
Ethan Atkins 97f59d20a0 Remove FixScalafmtPlugin
The underlying issue in https://github.com/scalameta/scalafmt/issues/1399
has supposedly been fixed in sbt-scalafmt 2.0.1 and we're on 2.0.2.
2019-09-01 19:20:13 -07:00
Ethan Atkins c8c8eb2ade Delete unnecessary flat classloader strategy setting 2019-09-01 19:17:50 -07:00
Ethan Atkins c525fa2551 Use managedFileStampCache for dependency classpath
It is redundant and slow to restamp all of the dependency classpath
files when they have likely already been stamped by a subproject.
For the classfiles of subprojects, we fill the managedFileStampCache
with the values returned by the zinc compile analysis product stamps.
This is why they are probably already in the managed cache and should be
up to date so long as zinc is working correctly.

I noticed that various outputFileStamps tasks were showing up in the
task timing report when I ran Test / definedTests in the main sbt project.
That task became about 400ms faster after this change.
2019-09-01 19:14:12 -07:00