Commit Graph

17940 Commits

Author SHA1 Message Date
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
Alexandre Archambault 1af1c6b11d Replace some uses of java.io with NIO 2018-03-19 10:48:50 +01:00
Alexandre Archambault 817d6b6d44 Remove now unnecessary helper functions
They were useful on Java 6, and aren't anymore now that we require Java >= 8
2018-03-19 10:48:50 +01:00
Alexandre Archambault e1800e74a9 Remove milestone from MIMA checks
And ensure the ones to come aren't added either
2018-03-19 10:48:49 +01: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
Shani Elharrar db2a871391 Print: use roots when rendering reverse graph (#808)
* Print: use roots when rendering reverse graph

* Print: Refactored to be able to return Tree data structure

* SBT: Refactored code and added coursierWhatDependsOn Task (?)

* SBT: Added tests to the new coursierWhatDependsOn task

* Tasks: Another try to fix the build

* Tree: Restored Apply[A] for binary compatibility

* Print.scala: Fix the build

* sbt-coursier: Refined what depends on check to check correctness

* PrintTests: Added test for reverseTree

* CR Fixes...

1. changed gotVersion to reconciledVersion
2. Moved AppliedTree to tests project
3. Changed message (wanted version, got version) to X -> Y
2018-03-18 23:45:11 +01: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
eugene yokota 73bce6fa5a
Merge pull request #228 from eed3si9n/wip/managed-checksums2
Adds null check for 'sbt.managedChecksums' in ivySettings file
2018-03-18 17:45:29 +09:00