luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3770 from xuwei-k/specs2-4 

update specs2 4.0.1
This commit is contained in:
Dale Wijnand 2017-11-26 09:15:28 +00:00 committed by GitHub
parent c517517927 6b4093dc15
commit ac5a30142a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/test/scala/sbt/internal/parser/SplitExpressionsBehavior.scala
View File

@ -20,7 +20,7 @@ trait SplitExpression {
trait SplitExpressionsBehavior extends SplitExpression { this: SpecificationLike =>
def newExpressionsSplitter(implicit splitter: SplitExpressions.SplitExpression): Unit = {
def newExpressionsSplitter(implicit splitter: SplitExpressions.SplitExpression) = {
"parse a two settings without intervening blank line" in {
val (imports, settings) = split("""version := "1.0"

4
main/src/test/scala/sbt/internal/server/SettingQueryTest.scala
View File

@ -51,7 +51,7 @@ object SettingQueryTest extends org.specs2.mutable.Specification {
def apply[T](lockFile: File, run: Callable[T]) = run.call()
}
lazy val structure: BuildStructure = {
lazy val buildStructure: BuildStructure = {
val projectSettings: Seq[Setting[_]] = Seq(scalaVersion := "2.12.1")
val appConfig: AppConfiguration = new AppConfiguration {
@ -180,7 +180,7 @@ object SettingQueryTest extends org.specs2.mutable.Specification {
def query(setting: String): String = {
import sbt.protocol._
val req: SettingQuery = sbt.protocol.SettingQuery(setting)
val rsp: SettingQueryResponse = server.SettingQuery.handleSettingQuery(req, structure)
val rsp: SettingQueryResponse = server.SettingQuery.handleSettingQuery(req, buildStructure)
val bytes: Array[Byte] = Serialization serializeEventMessage rsp
val payload: String = new String(bytes, java.nio.charset.StandardCharsets.UTF_8)
payload

2
project/Dependencies.scala
View File

@ -103,7 +103,7 @@ object Dependencies {
val jline = "jline" % "jline" % "2.14.4"
val scalatest = "org.scalatest" %% "scalatest" % "3.0.1"
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4"
val specs2 = "org.specs2" %% "specs2" % "2.4.17"
val specs2 = "org.specs2" %% "specs2-junit" % "4.0.1"
val junit = "junit" % "junit" % "4.11"
val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1"