Skip to content

Commit 00e95c9

Browse files
authored
Scala 2.13.0-M4 (sirthias#40)
1 parent 016f678 commit 00e95c9

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

build.sbt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ scalacOptions ++= Seq(
2424
"-feature",
2525
"-language:_",
2626
"-unchecked",
27-
"-Xfatal-warnings",
2827
"-Xlint:_,-missing-interpolator",
2928
"-Xfuture",
3029
"-Xsource:2.13", // new warning: deprecate assignments in argument position
31-
"-Yno-adapted-args",
3230
"-Ywarn-dead-code",
3331
"-Ywarn-inaccessible",
3432
"-Ywarn-infer-any",
@@ -42,7 +40,7 @@ scalacOptions ++= Seq(
4240
scalacOptions := {
4341
val orig = scalacOptions.value
4442
CrossVersion.partialVersion(scalaVersion.value) match {
45-
case Some((2, 12))
43+
case Some((2, v)) if v >= 12
4644
orig.map {
4745
case "-Ywarn-unused-import" "-Ywarn-unused:imports,-patvars,-privates,-locals,-implicits,-explicits"
4846
case other other
@@ -67,14 +65,14 @@ libraryDependencies ++= Seq(
6765
"com.jcraft" % "jsch.agentproxy.sshj" % "0.0.9" % "provided",
6866
"com.jcraft" % "jsch.agentproxy.connector-factory" % "0.0.9" % "provided",
6967
"ch.qos.logback" % "logback-classic" % "1.2.3" % "test",
70-
"org.scalatest" %% "scalatest" % "3.0.5" % "test"
68+
"org.scalatest" %% "scalatest" % "3.0.6-SNAP1" % "test"
7169
)
7270

7371
///////////////
7472
// publishing
7573
///////////////
7674

77-
crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.4")
75+
crossScalaVersions := Seq("2.10.6", "2.11.12", "2.12.4", "2.13.0-M4")
7876
useGpg := true
7977
publishMavenStyle := true
8078
publishArtifact in Test := false

project/build.properties

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

0 commit comments

Comments
 (0)