Skip to content

Commit e98bc3f

Browse files
committed
Update Scala and dependencies versions
1 parent e6076f5 commit e98bc3f

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

build.sbt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@ import ScalaZ3Build._
33
lazy val root = (project in file("."))
44
.settings(
55
name := "ScalaZ3",
6-
version := "3.0",
6+
version := "4.0",
77
organization := "ch.epfl.lara",
88
scalacOptions ++= Seq(
99
"-deprecation",
1010
"-unchecked",
1111
"-feature",
1212
),
13-
scalaVersion := "2.12.7",
14-
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.7"),
13+
scalaVersion := "2.12.8",
14+
crossScalaVersions := Seq("2.10.7", "2.11.12", "2.12.8"),
1515
libraryDependencies ++= Seq(
16-
"org.scalatest" %% "scalatest" % "3.0.1" % "test"
16+
"org.scalatest" %% "scalatest" % "3.0.7" % "test"
1717
),
18+
libraryDependencies ++= {
19+
CrossVersion.partialVersion(scalaVersion.value) match {
20+
// if scala 2.11+ is used, add dependency on scala-xml module
21+
case Some((2, scalaMajor)) if scalaMajor >= 11 => Seq("org.scala-lang.modules" %% "scala-xml" % "1.2.0")
22+
case _ => Seq.empty
23+
}
24+
},
1825
fork in Test := true,
1926
checksumKey := checksumTask.value,
2027
gccKey := gccTask.value,

project/build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ libraryDependencies ++= Seq(
44
"org.slf4j" % "slf4j-log4j12" % "1.7.25"
55
)
66

7+
scalacOptions ++= Seq("-deprecation", "-feature")

0 commit comments

Comments
 (0)