@@ -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}
0 commit comments