Commit Graph

10242 Commits

Author SHA1 Message Date
Dale Wijnand 7258f5836e
Merge pull request #3988 from dwijnand/scripted-cleanups
Cleanups from my recent work in scripted
2018-03-07 09:39:40 +00:00
eugene yokota 4858c0772f
Merge pull request #3996 from itohiro73/fix-contributing
Fix #3990: Add CLA instruction to CONTRIBUTING.md
2018-03-07 01:23:06 -05:00
Hiroshi Ito 1fef1a5a6a Fix #3990: Add CLA instruction to CONTRIBUTING.md 2018-03-07 11:14:49 +09:00
Rui Gonçalves 251e5ab26e
Filter incompatible aggregates in cross switch commands 2018-03-07 00:27:22 +00:00
Maksym Fedorov 15f4498494 Add more configuration axis ScopeFilter factory methods 2018-03-06 23:01:31 +01:00
Dale Wijnand 26014a527e
Use Def.settings (bikeshed) 2018-03-06 19:20:33 +00:00
Dale Wijnand 4b36bca5ec
Fix label so it's copy-and-paste-able 2018-03-06 11:59:49 +00:00
Dale Wijnand 359a0109fd
Cleanup & simplify actions/generator 2018-03-06 11:59:48 +00:00
Dale Wijnand 3791e489b2
Use Def.settings in build.sbt 2018-03-06 11:59:27 +00:00
Dale Wijnand a69c3d6e13
Format build.sbt 2018-03-06 11:59:27 +00:00
Dale Wijnand 621ad2b553
Cleanup TaskNegSpec 2018-03-06 11:59:27 +00:00
Dale Wijnand 7b11729f8c
Cleanup State#process 2018-03-06 11:59:26 +00:00
Dale Wijnand 685b416b8e
Cleanup Main 2018-03-06 11:59:26 +00:00
Dale Wijnand 2effe0845f
Cleanup IPC 2018-03-06 11:59:26 +00:00
Dale Wijnand 89e501443c
Cleanup SbtHandler 2018-03-06 11:59:26 +00:00
Dale Wijnand 4debec0053
Cleanup ScriptedTests 2018-03-06 11:54:14 +00:00
Dale Wijnand cb2e4e67fd
Cleanup BatchScriptRunner 2018-03-06 11:54:13 +00:00
Dale Wijnand b8abf4285f
Make BatchScriptRunner.States hold StatementHandler#State 2018-03-06 11:54:13 +00:00
Dale Wijnand 9d808a389c
Update PublishBinPlugin to current sbt 2018-03-06 11:54:13 +00:00
Dale Wijnand dbbba67d36
Fix a Scaladoc error in BuildStructure 2018-03-06 11:54:13 +00:00
Dale Wijnand 82c39ec96f
Fix a "discarded non-Unit value" warning in TaskRunnerFork 2018-03-06 11:54:13 +00:00
Dale Wijnand 6f52437e95
Fix a "discarded non-Unit value" warning in FileExamplesTest 2018-03-06 11:54:12 +00:00
Dale Wijnand 78f4f56d1c
Fix 2 "discarded non-Unit value" warnings in ScriptedPlugin 2018-03-06 11:54:12 +00:00
Dale Wijnand 705eeddf5c
Cleanup & simplify actions/add-alias 2018-03-06 11:54:12 +00:00
Dale Wijnand 6038ec51c3
Cleanup & simplify actions/run-task 2018-03-06 11:54:12 +00:00
Dale Wijnand 21eb1f0f12
Cleanup Attributes 2018-03-06 11:54:12 +00:00
Dale Wijnand 9006abe9be
Cleanup ScriptedPlugin 2018-03-06 11:54:12 +00:00
Dale Wijnand 6e83d408da
Define ScriptedPlugin keys with macros 2018-03-06 11:54:11 +00:00
Dale Wijnand 8187a51d31
Cleanup local Scripted plugin 2018-03-06 11:54:11 +00:00
Dale Wijnand 41249f707a
Define local Scripted plugin keys with macros 2018-03-06 11:54:11 +00:00
Dale Wijnand b9e3d6aa2d
Define local Scripted plugin keys in Global scope 2018-03-06 11:54:11 +00:00
Dale Wijnand d26085155d
Cleanup InputWrapper imports 2018-03-06 11:54:11 +00:00
Dale Wijnand a73aa97b2c
Cleanup Extracted 2018-03-06 11:54:10 +00:00
Dale Wijnand 77abb9ee29
Cleanup InputConvert 2018-03-06 11:54:10 +00:00
Dale Wijnand 3921c45563
Document RichInitX classes 2018-03-06 10:37:42 +00:00
Jason Zaugg 0bea7e9e18 Fix race condition in non-forked, parallel tests.
Non forked tests that are run in parallel groups can call into
a single instance of TestStatusReporter concurrently.

This seems to be limited to the startGroup/endGroup/testEvent
methods called in:

  a41727fb17/testing/src/main/scala/sbt/TestFramework.scala (L100-L124)

Which itself is called within:

  a41727fb17/testing/src/main/scala/sbt/TestFramework.scala (L203-L229)

Creating the `runnables` that are run in parallel (in builds so configured):

  a6eb1260c8/main-actions/src/main/scala/sbt/Tests.scala (L222-L230)

We believe this to be the cause of the hang witnessed in
the a suite of Scalacheck-framework tests in the Scala
build:

  https://github.com/scala/scala-jenkins-infra/issues/249

This commit uses a concurrent map to support concurrent
status updates.
2018-03-05 18:23:03 +10:00
exoego 36438d2ac3 Add eviction warnings options to global 2018-03-02 14:45:56 +09:00
eugene yokota 226a543f92
Merge pull request #152 from retronym/topic/format
Performance optimizations around logging
2018-03-01 01:19:34 -05:00
Dale Wijnand 90cd60f3b9
Merge branch '1.1.x' into merge-1.1.x-into-1.x
* 1.1.x:
  Use Java's redirectInput rather than sys.process's connectInput
  Re-write toolboxClasspath to use sbt-buildinfo
  Cleanup generateToolboxClasspath
  Upgrade to sbt-buildinfo 0.8.0
  Fix how fullClasspath is defined in TestBuildInfo
  delete buildinfo.BuildInfo from sbt main

Conflicts:
	project/plugins.sbt
2018-02-28 10:30:53 +00:00
eugene yokota 27bbde810d
Merge pull request #3970 from retronym/ticket/3737
Use Java's redirectInput rather than sys.process's connectInput
2018-02-28 04:14:05 -05:00
eugene yokota 85a30fac4a
Merge pull request #155 from dwijnand/utilTesting
Kill utilTesting
2018-02-28 02:17:55 -05:00
eugene yokota 083dd8cad8
Merge pull request #3967 from dwijnand/buildinfo
Upgrade to sbt-buildinfo 0.8.0
2018-02-28 02:13:01 -05:00
Jason Zaugg b0f52510e0 Use Java's redirectInput rather than sys.process's connectInput
Fixes #3737
2018-02-26 11:30:30 +10:00
Dale Wijnand 44a2f1d92c
Kill utilTesting
No need for a 1-line, 1-class jar
2018-02-23 18:16:30 +00:00
Dale Wijnand 27fe5a6957
Re-write toolboxClasspath to use sbt-buildinfo 2018-02-23 13:20:19 +00:00
Dale Wijnand 8182741480
Cleanup generateToolboxClasspath 2018-02-23 13:19:07 +00:00
Dale Wijnand edb828a8d7
Upgrade to sbt-buildinfo 0.8.0 2018-02-23 13:19:05 +00:00
Dale Wijnand c7cc52092e
Fix how fullClasspath is defined in TestBuildInfo 2018-02-23 13:17:51 +00:00
Jason Zaugg d9b130d519 Optimize ConsoleAppender.appendLog 2018-02-23 14:52:45 +10:00
xuwei-k c1e0785a1f
delete buildinfo.BuildInfo from sbt main
sbt-buildinfo plugin have `buildInfoScopedSettings(Compile)` in default.
I think it is unnecessary. or we should set "buildinfoPackage in Compile" and "buildinfoObject in Compile"

https://github.com/sbt/sbt-buildinfo/blob/v0.7.0/src/main/scala/sbtbuildinfo/BuildInfoPlugin.scala#L11
2018-02-22 16:46:58 +00:00