luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,847 Commits 22 Branches 334 Tags 97 MiB
Commit Graph

17847 Commits

Author SHA1 Message Date
eugene yokota f1051771c7
Merge pull request #234 from eed3si9n/wip/merge-1.1.x 
merge 1.1.x
 2018-03-27 14:25:50 -04: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
Eugene Yokota 1073513b49 Merge branch '1.1.x' into wip/merge-1.1.x 2018-03-27 06:19:28 -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 070e71321a
Merge pull request #233 from eed3si9n/wip/bumpsbt 
1.1.5-SNAPSHOT
 2018-03-27 10:47:44 +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 a14b53da5b bump to 1.1.5-SNAPSHOT 2018-03-26 22:50:41 -04:00
Eugene Yokota e0eb46a99e sbt 1.1.2 2018-03-26 22:50:03 -04: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
Denys Shabalin c7dabdf19a Update to the latest travis_setup.sh for Scala Native (#825) 
[Recent PR](https://github.com/scala-native/scala-native/pull/1195) changed the location of the travis setup script within a Scala Native repo. This PR updates travis build to point to the new location.
 2018-03-26 13:27:13 +02: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 0e3a9e6e61
Merge pull request #232 from eed3si9n/wip/contraband 
bump contraband to 0.4.0
 2018-03-23 14:16:55 +00:00
Eugene Yokota a29a12054a bump contraband to 0.4.0 
Ref https://github.com/sbt/contraband/issues/119
 2018-03-23 22:21:05 +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
eugene yokota de894dfb9f
Merge pull request #230 from eed3si9n/wip/1.1.4 
bump util to 1.1.3
 2018-03-23 18:38:02 +09:00
Eugene Yokota f3b06bc18e bump util to 1.1.3 2018-03-23 18:13:59 +09: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 0f93849214
Cleanup & tweak VersionNumber 2018-03-20 09:38:54 +00:00
Dale Wijnand c6b2b626c8
Merge pull request #221 from dwijnand/cleanup/VersionNumberSpec 
Cleanup VersionNumberSpec
 2018-03-20 09:36:36 +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 4b9eb388a2
In VersionNumberSpec switch to FreeSpec, add "assert" prefix 2018-03-19 19:47:55 +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
Dale Wijnand f159846376
In VersionNumberSpec pass VersionString explicitly 2018-03-19 14:58:08 +00:00
Alexandre Archambault 61cc93db76
Merge pull request #817 from coursier/topic/cleaning 
Small cleanup
 2018-03-19 13:31:31 +01:00
Dale Wijnand 6feacbd1ec
Merge pull request #211 from exoego/1.x-eviction-summary 
Add EvictionWarningOptions.summary that tells the users to call "evicted"
 2018-03-19 11:53:43 +00:00
Alexandre Archambault 9713c4a7bb Add missing parentheses 2018-03-19 10:48:50 +01:00