Commit Graph

11930 Commits

Author SHA1 Message Date
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
exoego 9c53ad3905 Drop "final" modifier from private case classes, to prevent false positive.
Refer https://issues.scala-lang.org/browse/SI-4440
2018-02-22 20:53:03 +09:00
eugene yokota e078c126d1
Merge pull request #3964 from sbt/1.1.x
1.1.x
2018-02-21 15:12:44 -05:00
eugene yokota 9a5b7bcf6d
Merge pull request #3960 from eed3si9n/wip/contributing
update CONTRIBUTING
2018-02-21 15:09:09 -05:00
Eugene Yokota 0e1823d730 cleanCache 2018-02-21 15:08:10 -05:00
Eugene Yokota 594738bb9c add publishLocalAllModule command 2018-02-21 02:28:33 -05:00
Eugene Yokota 72f3289b55 update CONTRIBUTING
Fixes #3950
2018-02-21 00:25:47 -05:00
Dale Wijnand c9f3a73c3b
Merge pull request #3955 from dwijnand/fix-validID
Fix validID & expand tests
2018-02-19 21:00:30 +00:00
Deokhwan Kim 94b27fcefa Confirm a user's intent if the current dir doesn't look like an sbt dir
Fixes #212
2018-02-19 14:24:18 -05:00
Dale Wijnand fc73203d0b
Fix validID & expand tests
Make sure that we generate valid ID (according to matches(ID, s)) so
that we properly test the new validID implementation.

And that's what led to the bug fix. :)
2018-02-19 18:42:24 +00:00
Dale Wijnand b393631c90
Merge pull request #3952 from jrudolph/jr/speedup-validId
Speedup Parsers.validID
2018-02-19 15:53:41 +00:00
Dale Wijnand d66d0e34a9
Add prop-based test for the validID re-impl 2018-02-19 15:00:21 +00:00
Dale Wijnand 85f7d807e1
Merge pull request #153 from jrudolph/jr/optimize-initStringCodecs
In initStringCodecs avoid reflect universe initialization
2018-02-19 10:11:49 +00:00
Dale Wijnand 311bb7022c
Merge pull request #220 from ForNeVeR/feature/quotes
Fix quotes in sbt.bat
2018-02-19 10:06:55 +00:00
Johannes Rudolph 0ebb7a5662
In initStringCodecs avoid reflect universe initialization
This showed up in profiling. It's known that TypeTags are expensive. Even
more so if the reflect universe is accessed during startup when the
class loading and JIT compiler are busy enough with other stuff.
2018-02-19 09:19:31 +01:00
Johannes Rudolph 9370a2adf0
Speedup Parsers.validID
It turned up in profiling sessions. Previously, it used parser combinators
which are somewhat slow especially when the JVM is still cold.

The grammar for ID is simple enough to afford this handwritten parser.
2018-02-19 09:13:12 +01:00
eugene yokota bde197f2fc
Merge pull request #3951 from jonas/patch-1
Fix typo in the 1.1.1 notes
2018-02-18 04:41:15 -05:00
Jonas Fonseca be43c43783
Fix typo in the 1.1.1 notes 2018-02-17 13:41:00 -05:00
Friedrich von Never 3019b94da0
Fix quotes in sbt.bat 2018-02-17 21:56:09 +07:00
Jason Zaugg b68071a488 Cache evidence params for hot method 2018-02-17 14:59:36 +10:00
Dale Wijnand 35072a62b0
Merge pull request #219 from eed3si9n/wip/test-mac
more portable jdk_version function
2018-02-16 09:57:17 +00:00
Eugene Yokota 21cf71e384 more portable jdk_version function
I've reimplemented java version detection as a bash function.
This no longer uses grep.
Also this no longer uses `?` in sed, which doesn't work on macOS.

Fixes https://github.com/sbt/sbt/issues/3873
2018-02-15 23:04:43 -05:00
Eugene Yokota 66b8670c59 Add macOS testing 2018-02-15 23:04:35 -05:00
Dale Wijnand 31b42c0e18
Merge pull request #216 from eed3si9n/wip/travis
cross JVM testing
2018-02-15 07:42:28 +00:00
Eugene Yokota 6f1e6c36d9 cross JVM testing
This continues to use Oracle JDK 8 for building, but adds test jobs using oraclejdk8, oraclejdk9, and oraclejdk10.
2018-02-15 00:42:01 -05:00
Dale Wijnand 78f7658a67
Merge pull request #3945 from dwijnand/merge-1.1.x-into-1.x
Merge 1.1.x into 1.x
2018-02-14 16:51:31 +00:00
Dale Wijnand 20367938b1
version := "1.2.0-SNAPSHOT" 2018-02-14 14:38:25 +00:00
Dale Wijnand 76e2f550ec
Merge branch '1.1.x' into merge-1.1.x-into-1.x
* 1.1.x:
  Update mimaPreviousArtifacts/sbt.version
  Introduce SBT_GLOBAL_SERVER_DIR env var to override too long paths
  Handle very long socket file paths on UNIX

Conflicts:
	project/build.properties
2018-02-14 14:38:07 +00:00
Dale Wijnand 7dcb311301
Merge pull request #3944 from dwijnand/versions
Update mimaPreviousArtifacts/sbt.version
2018-02-14 14:37:06 +00:00
Dale Wijnand 9891f07bda
Merge pull request #150 from dwijnand/merge-1.1.x-into-1.x
Merge 1.1.x into 1.x
2018-02-14 14:23:59 +00:00
Dale Wijnand b50cc6f342
Merge pull request #215 from 2m/wip-no-decimals-2m
Use only integers for versions
2018-02-14 14:21:06 +00:00
Martynas Mickevičius 5a0bde442d
Use only integers for versions 2018-02-14 14:00:36 +02:00
Dale Wijnand 130ec14c99
Merge branch '1.1.x' into merge-1.1.x-into-1.x
* 1.1.x:
  Update version/sbt.version
  Add version 1.1.2 to mimaPreviousArtifacts

 Conflicts:
	project/build.properties
2018-02-14 11:01:16 +00:00
Dale Wijnand 9f12566a51
Merge pull request #149 from dwijnand/versions
Update version/sbt.version
2018-02-14 10:54:06 +00:00