Skip to content

Commit 5789d71

Browse files
committed
Update scala & sbt versions
1 parent 063e94a commit 5789d71

File tree

4 files changed

+13
-22
lines changed

4 files changed

+13
-22
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import PgpKeys.{publishLocalSigned, publishSigned}
22
import com.typesafe.sbt.SbtGit.GitKeys._
33

44
organization := "software.purpledragon.xml"
5-
version := "1.0.0"
5+
version := "1.0.1-SNAPSHOT"
66

7-
scalaVersion := "2.12.7"
8-
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.0-M5")
7+
scalaVersion := "2.12.8"
8+
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.13.0")
99

1010
// dependencies common for all sub-projects
1111
libraryDependencies ++= Seq(
12-
"org.scala-lang.modules" %% "scala-xml" % "1.1.1"
12+
"org.scala-lang.modules" %% "scala-xml" % "1.2.0"
1313
)
1414

1515
lazy val xmlCompare = Project("xml-compare", file("xml-compare"))

project/SettingsPlugin.scala

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ object SettingsPlugin extends AutoPlugin {
88
override def requires: Plugins = JvmPlugin
99

1010
private val javaVersion = "1.8"
11-
private val scalatestStable = "3.0.5"
12-
private val scalatestSnapshot = "3.0.6-SNAP4"
1311

1412
object autoImport {
1513
val scalatestVersion = settingKey[String]("Version of scalatest to use")
@@ -22,13 +20,8 @@ object SettingsPlugin extends AutoPlugin {
2220
version := (version in LocalRootProject).value,
2321
scalaVersion := (scalaVersion in LocalRootProject).value,
2422
crossScalaVersions := (crossScalaVersions in LocalRootProject).value,
25-
javacOptions ++= Seq("-source", javaVersion,
26-
"-target", javaVersion,
27-
"-Xlint"),
28-
scalacOptions ++= Seq(s"-target:jvm-$javaVersion",
29-
"-deprecation",
30-
"-feature",
31-
"-unchecked"),
23+
javacOptions ++= Seq("-source", javaVersion, "-target", javaVersion, "-Xlint"),
24+
scalacOptions ++= Seq(s"-target:jvm-$javaVersion", "-deprecation", "-feature", "-unchecked"),
3225
libraryDependencies ++= (libraryDependencies in LocalRootProject).value,
3326
scalafmtVersion := "1.5.1",
3427
autoAPIMappings := true,
@@ -40,12 +33,10 @@ object SettingsPlugin extends AutoPlugin {
4033
organizationName := "Michael Stringer",
4134
organizationHomepage := Some(url("https://purpledragon.software")),
4235
homepage := Some(url("https://stringbean.github.io/scala-xml-compare")),
43-
scmInfo := Some(ScmInfo(url("https://github.com/stringbean/scala-xml-compare"), "https://github.com/stringbean/scala-xml-compare.git")),
44-
scalatestVersion := {
45-
scalaVersion.value match {
46-
case "2.13.0-M5" => scalatestSnapshot
47-
case _ => scalatestStable
48-
}
49-
}
36+
scmInfo := Some(
37+
ScmInfo(
38+
url("https://github.com/stringbean/scala-xml-compare"),
39+
"https://github.com/stringbean/scala-xml-compare.git")),
40+
scalatestVersion := "3.0.8"
5041
)
5142
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.2.6
1+
sbt.version=1.2.8

xml-specs2/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name := "xml-specs2"
22

33
libraryDependencies ++= Seq(
4-
"org.specs2" %% "specs2-core" % "4.3.5" % Provided
4+
"org.specs2" %% "specs2-core" % "4.7.0" % Provided
55
)

0 commit comments

Comments
 (0)