Skip to content

Commit 0bb1569

Browse files
authored
Merge pull request #7 from 3tty0n/bump-to-2.12.0
Bump to Scala 2.12.0
2 parents 81200ee + a1eed20 commit 0bb1569

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

project/Build.scala

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import Keys._
33

44
object BuildDef extends Build {
55

6-
val scalaTest = "org.scalatest" %% "scalatest" % "2.2.6"
6+
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.0"
77

88
lazy val scalaFRP = Project("scala-frp", file("."))
99
//project settings
1010
.settings(
1111
organization := "io.dylemma",
12-
version := "1.2",
13-
scalaVersion := "2.11.8",
14-
crossScalaVersions := Seq("2.10.6", "2.11.8"),
12+
version := "1.3",
13+
scalaVersion := "2.12.0",
14+
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.0"),
1515
libraryDependencies += scalaTest % "test",
1616
scalacOptions in (Compile, doc) += "-implicits"
1717
)
@@ -50,4 +50,4 @@ object BuildDef extends Build {
5050
</developers>
5151
)
5252
)
53-
}
53+
}

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 0.13.11
1+
sbt.version = 0.13.13

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
22

3-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")

0 commit comments

Comments
 (0)