luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,384 Commits 29 Branches 314 Tags 72 MiB
Commit Graph

9384 Commits

Author SHA1 Message Date
Alistair Johnson cbb953279c Intial implementation of CompositeProject 2018-03-31 20:28:09 +02:00
Eugene Yokota 88f50ce35d Fix console, JLine issue 
Fixes #3482
 2018-03-30 23:09:01 -04:00
Ethan Atkins fff32db7ce Use MacOSXWatchService instead of PollingWatchService 
This watch service should be more responsive and significantly reduce
the disk overhead of the polling based service for large repos.
 2018-03-28 17:11:30 -07:00
eugene yokota 06c934235d
Merge pull request #4050 from hvesalai/tmp/update-jline-fix-emacs 
Update to Jline 2.14.6
 2018-03-28 17:32:57 -04:00
Heikki Vesalainen b4c7dc50ac
Merge branch '1.x' into tmp/update-jline-fix-emacs 2018-03-28 18:49:18 +03:00
Dale Wijnand 289077a405
Re-introduce Command.process 
This was an unnecessary removal in
e83564a6b7.
 2018-03-28 16:37:07 +01:00
Dale Wijnand 26c267e29e
Merge pull request #4043 from dwijnand/cleanup/ParseKey 
Cleanup test/ParseKey
 2018-03-28 16:10:03 +01:00
Dale Wijnand af3eec7c31
Merge pull request #4045 from dwijnand/Deprecate-Scope.transformTaskName 
Deprecate Scope.transformTaskName
 2018-03-28 16:09:39 +01:00
Heikki Vesalainen e30c0fbd1e Update to Jline 2.14.6 
This version of Jline fixes three things for Emacs users:
- ANSI colors are now enabled for Emacs.
- Terminal echo is now disabled for Emacs.
- History is enabled for all dump terminals.
 2018-03-28 14:31:21 +00:00
eugene yokota 02acf9380e
Merge pull request #4042 from dwijnand/Reuse-Scoped.scoped-methods 
Re-use Scoped.scoped* methods
 2018-03-28 09:41:09 -04:00
eugene yokota fa56cf394b
Merge pull request #4046 from eed3si9n/wip/bumpsbt 
bump to 1.1.3-SNAPSHOT
 2018-03-28 09:11:19 -04:00
eugene yokota 4c480f613d
Merge pull request #4047 from eed3si9n/wip/merge-1.1.x 
merge 1.1.x
 2018-03-28 09:10:46 -04:00
Dale Wijnand 25988d2256
Cleanup test/ParseKey 2018-03-28 09:04:12 +01:00
Dale Wijnand 2e86eed151
Split BuildSettingsInstances out of SlashSyntaxSpec.scala 2018-03-27 16:32:34 +01:00
Eugene Yokota c2837c7714 Merge branch 'wip/bumpsbt' into wip/merge-1.1.x 2018-03-27 10:16:10 -04:00
Dale Wijnand 165aac858e
Merge pull request #4040 from dwijnand/dedup/SlashSyntaxSpec 
Dedup keys in SlashSyntaxSpec
 2018-03-27 14:54:59 +01:00
Eugene Yokota 1b77b35333 bump to 1.1.3-SNAPSHOT 2018-03-27 06:53:05 -04:00
Eugene Yokota f607b6c73f sbt 1.1.2 2018-03-27 06:52:32 -04:00
Eugene Yokota a4ac891289 Merge branch 'wip/bumpsbt' into wip/merge-1.1.x 2018-03-27 06:36:33 -04:00
Dale Wijnand 93d2b77922
Merge pull request #157 from eed3si9n/wip/merge-1.1.x 
merge 1.1.x
 2018-03-27 10:49:14 +01:00
Dale Wijnand 35decb6ee5
Deprecate Scope.transformTaskName 2018-03-27 09:59:07 +01:00
Dale Wijnand d19329666a
Re-use Scoped.scoped* methods 2018-03-27 09:24:12 +01:00
Dale Wijnand 3c66f39744
Allow SlashSyntaxSpec to be Scalafmt formatted 
Previously:

    [warn] /d/sbt/main-settings/src/test/scala/sbt/SlashSyntaxSpec.scala:44: error: illegal start of simple expression
    [warn] )
    [warn]     ^
 2018-03-27 09:22:07 +01:00
Dale Wijnand 42b61a4f8e
Dedup keys in SlashSyntaxSpec 2018-03-27 09:22:06 +01:00
Dale Wijnand 51ff72872b
De-generalise expectValue in SlashSyntaxSpec 2018-03-27 09:22:06 +01:00
Dale Wijnand 006527d246
Re-order SlashSyntaxSpec arbitraries 2018-03-27 09:22:06 +01:00
Eugene Yokota 0c26b55882 Merge branch '1.1.x' into wip/merge-1.1.x 2018-03-26 22:46:04 -04:00
eugene yokota a3bf5bd0ce
Merge pull request #156 from eed3si9n/wip/bumpsbt 
bump to 1.1.4-SNAPSHOT
 2018-03-26 22:44:23 -04:00
Eugene Yokota 4791b38adf bump to 1.1.4-SNAPSHOT 2018-03-26 21:19:59 -04:00
Eugene Yokota 770977a0bb sbt 1.1.2 2018-03-26 21:13:51 -04:00
Dale Wijnand b0f9fe77b6
Merge pull request #4036 from eed3si9n/wip/fix-startup-log 
Fixes -error not suppressing startup logs
 2018-03-26 15:28:50 +01:00
eugene yokota cd40d1ac77
Merge pull request #4031 from eed3si9n/wip/bump 
bump modules
 2018-03-26 10:26:25 -04:00
Eugene Yokota 25ab94d96a Fixes -error not suppressing startup logs 
Fixes #3849

This brings back the 0.13 logic:

```scala
  def setGlobalLogLevel(s: State, level: Level.Value): State = {
    s.globalLogging.full match {
      case a: AbstractLogger => a.setLevel(level)
      case _                 => ()
    }
    s.put(BasicKeys.explicitGlobalLogLevels, true).put(Keys.logLevel.key, level)
  }
```
 2018-03-25 14:56:00 -04:00
Dale Wijnand 131c2a7a68
Merge pull request #4033 from eed3si9n/wip/new-mess 
Fixes new command leaving behind target directory
 2018-03-24 22:57:41 +00:00
Eugene Yokota b111b05d5f Fixes new command leaving target directory 
Fixes #2835

This fixes `new` command creating `target` directory by moving the `target` to a staging directory in the command itself.
 2018-03-24 13:45:35 -04:00
Eugene Yokota 67e1e4a9ff improve server testing 
previously I was using separate thread in a forked test to test the server, but that is not enough isolation to run multiple server tests.
This adds `RunFromSourceMain.fork(workingDirectory: File)`, which allows us to run a fresh sbt on the given working directory. Next, I've refactored the stateful client-side buffer to a class `TestServer`.
 2018-03-24 12:09:41 -04:00
Eugene Yokota 9d2d81645b bump modules 2018-03-24 11:02:40 +09:00
Dale Wijnand a43c18e4f9
Merge pull request #4030 from eatkins/vector-1.1 
Vector 1.1
 2018-03-23 11:50:34 +00:00
Ethan Atkins 9b24e9f9eb Use ConcurrentLinkedDeque for EventHandler 
ArrayList::add is not thread safe. I ran into cases where async tests
using utests would fail even when all of the individual tests passed.
This was because multiple threads called back into the handle method of
the handler instance variable, which just delegated to eventList::add.
When this happened, one of the events would get added to the list as a
null reference, which would manifest as an NPE upstream on the master
process. After this change, my tests stopped failing.
 2018-03-21 10:50:30 -07:00
Ethan Atkins 8eb2d7389d Add test for async utest TestSuites 
Sometimes when utest runs async tests (i.e. tests that return a future)
the test suite will fail even when none of the individual tests do. This
is due to a data race in sbt. Most, but not all, of the time, this test
will induce that race.
 2018-03-21 10:41:41 -07:00
Dale Wijnand ca874d5d5f
Merge pull request #4017 from dwijnand/cleanup/CommandChannel 
Cleanup CommandChannel
 2018-03-20 11:05:16 +00:00
Dale Wijnand 00ce32f102
Cleanup CommandChannel 2018-03-20 09:17:55 +00:00
Dale Wijnand fe418c92a7
Merge pull request #4016 from dwijnand/cleanup/Watched 
Make Watched use State#handleError
 2018-03-20 08:54:18 +00:00
Dale Wijnand b23980ce1b
Merge pull request #4018 from dwijnand/cleanup/NetworkChannel 
Cleanup NetworkChannel
 2018-03-20 08:54:04 +00:00
Dale Wijnand 9c0ac90ee9
Make Watched use State#handleError 2018-03-19 15:21:15 +00:00
Dale Wijnand 6ceed00f48
Cleanup NetworkChannel 2018-03-19 15:11:39 +00:00
Eugene Yokota 862ae293ba include only scala-library into the boot classpath during run 
Fixes https://github.com/sbt/sbt/issues/3405
Ref https://github.com/scala/scala-xml/issues/195

sbt's `run` is emulated using a classloader trick that includes ScalaInstance as the parent classloader under the classpath. The problem is the ScalaInstance classloader currently contains both compiler, library, and their transitive JARs:

```scala
res0: Array[java.io.File] = Array(scala-library.jar, scala-compiler.jar, jline.jar, scala-reflect.jar, scala-xml_2.12.jar)
```

This could have been causing various issues, but most recently it showed up as wrong version of scala-xml getting prioritized over what's passed by the user.

1. new field loaderLibraryOnly is added to xsbti.ScalaInstance.
2. it is initialized to the library loader if the launcher creates it, otherwise create layered loader here.

This aims to isolate the library loader, and retain the perf.
 2018-03-19 18:45:42 +09:00
Dale Wijnand c6df309073
Merge pull request #4025 from tiqwab/fix-parsing-id 
Fix handling id in jsonrpc model
 2018-03-18 16:35:44 +00:00
Naohisa Murakami 9d01bdff68
Merge pull request #1 from eed3si9n/wip/fix-parsing-id 
Add test case for number id in JSON-RPC
 2018-03-18 07:38:25 +09:00
Eugene Yokota e5d2588927 Add test case for number id in JSON-RPC 2018-03-18 02:11:23 +09:00