Skip to content

Commit 83f6b3c

Browse files
committed
Upgrade to be able to release for Scala 2.11.0. Fixes codingwell#25
1 parent 3dbe96f commit 83f6b3c

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

Diff for: build.sbt

+4-7
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ libraryDependencies += "com.google.inject.extensions" % "guice-multibindings" %
1818

1919
libraryDependencies += "com.google.guava" % "guava" % "14.0.1"
2020

21-
libraryDependencies <+= scalaVersion { (v:String) =>
22-
if( v startsWith "2.8." )
23-
"org.scalatest" %% "scalatest" % "1.8" % "test"
24-
else
25-
"org.scalatest" %% "scalatest" % "1.9.1" % "test"
26-
}
21+
libraryDependencies += "org.scalatest" %% "scalatest" % "2.1.5"
22+
23+
scalaVersion := "2.11.0"
2724

28-
crossScalaVersions := Seq("2.8.2", "2.9.1", "2.9.2", "2.9.3", "2.10.2")
25+
crossScalaVersions := Seq("2.10.4", "2.11.0")
2926

3027
testListeners <<= target.map(t => Seq(new eu.henkelmann.sbt.JUnitXmlTestsListener(t.getAbsolutePath)))
3128

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.12.1
1+
sbt.version=0.13.2

Diff for: project/plugins.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.7")
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
2+
3+
addSbtPlugin("com.alpinenow" % "junit_xml_listener" % "0.5.0")

Diff for: project/project/Build.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import sbt._
22

33
object MyPlugins extends Build {
4-
lazy val root = Project("root", file(".")) dependsOn (junitXmlListener)
5-
lazy val junitXmlListener = uri("git://github.com/ijuma/junit_xml_listener.git#fe434773255b451a38e8d889536ebc260f4225ce")
4+
lazy val root = Project("root", file("."))
65
}

0 commit comments

Comments
 (0)