Commit Graph

6024 Commits

Author SHA1 Message Date
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 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 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 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
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
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
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
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
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 e8d1a30474
Update mimaPreviousArtifacts/sbt.version 2018-02-14 10:53:37 +00:00
Dale Wijnand 8546fc7ea6
Merge pull request #3932 from dwijnand/max-socket-length
Handle very long socket file paths on UNIX
2018-02-13 07:36:15 +00:00
eugene yokota 50b1555d94
Merge pull request #3940 from xuwei-k/readme-version
update README. s/1.0.x/1.x/
2018-02-12 21:20:16 -05:00
xuwei-k f56d5b2d90 update README. s/1.0.x/1.x/ 2018-02-13 10:00:50 +09:00
Dale Wijnand 4e038c91ce
Introduce SBT_GLOBAL_SERVER_DIR env var to override too long paths 2018-02-12 17:57:26 +00:00
Dale Wijnand ccd399e71a
Merge pull request #3937 from eed3si9n/wip/1.1.1
Merge branch 1.1.x into 1.x
2018-02-10 11:48:17 +00:00
Eugene Yokota 3db0e09b33 Merge branch '1.1.x' into wip/1.1.1
# Conflicts:
#	main/src/main/scala/sbt/internal/CommandExchange.scala
#	main/src/main/scala/sbt/internal/ConsoleProject.scala
#	notes/1.0.2/sample.md
#	notes/1.1.1/sample.md
#	notes/sample.md
#	sbt/src/test/scala/sbt/ServerSpec.scala
2018-02-09 23:55:23 -05:00
eugene yokota 2c0b953321
Merge pull request #3936 from eed3si9n/wip/notes
sbt 1.1.1 notes
2018-02-09 23:36:05 -05:00
Eugene Yokota 15018c1971 notes 2018-02-09 23:33:08 -05:00
Dale Wijnand 638dbeb84c
Merge pull request #3933 from dwijnand/ServerSpec-Codacy2
Fix another Codacy issue in ServerSpec
2018-02-09 12:38:27 +00:00
Dale Wijnand 4c765e0e93
Merge pull request #3927 from sbt/sbt-boot-lock-sysprop
Adds sbt.boot.lock sysprop to opt-out
2018-02-09 12:37:54 +00:00
Eugene Yokota 39d9927179 1.1.2-SNAPSHOT 2018-02-08 13:08:32 -05:00
Eugene Yokota 4da6a8952b 1.1.1 launchconfig 2018-02-08 13:08:21 -05:00
Dale Wijnand 74ff6aa1ce
Fix another Codacy issue in ServerSpec 2018-02-08 14:16:54 +00:00
Dale Wijnand 402378a81e
Adds sbt.boot.lock sysprop to opt-out
Adds sbt.boot.lock as a system property to opt-out of locking.

This might be useful when running on filesystems on which the locking code path would throw an exception.

Upstream issue: https://bugs.openjdk.java.net/browse/JDK-8193594
Provides a workaround for #2222, thus...
Closes #2222.
2018-02-08 13:02:39 +00:00
Dale Wijnand 8e7dfb4b20
Handle very long socket file paths on UNIX
Fixes #3930
2018-02-08 13:00:46 +00:00
Dale Wijnand d75d95d653
Merge pull request #3931 from eed3si9n/wip/bump
Zinc 1.1.1, LM 1.1.3, IO 1.1.4
2018-02-08 07:31:35 +00:00
Eugene Yokota 7df32cff84 Zinc 1.1.1, LM 1.1.3, IO 1.1.4 2018-02-08 01:06:09 -05:00
eugene yokota 4a8adbb8e0
Merge pull request #3923 from dwijnand/PluginCross-scala-versions
Upgrade Scala versions that ^^ uses
2018-02-07 22:02:10 -05:00
eugene yokota 54eb6c2d6b
Merge pull request #3929 from eed3si9n/wip/servertest2
Backport server testing as a unit test
2018-02-07 21:18:35 -05:00
eugene yokota bd1532eb4b
Merge pull request #3922 from swaldman/suppressServer
Implement a suppressServer setting for high-security builds
2018-02-07 19:25:23 -05:00
Dale Wijnand 639ee220dc Fix Codacy issue in ServerSpec 2018-02-07 18:17:00 -05:00
Eugene Yokota 23cdfd8369 improve Windows build 2018-02-07 18:16:21 -05:00