Skip to content

Commit 83e440e

Browse files
SethTisuegourlaysama
authored andcommitted
[backport] set Scala version in a more dbuild-friendly way
having scalaVersion and crossScalaVersions set in different places was confusing dbuild needed to fix scala/community-build#215 (cherry picked from commit bde222c)
1 parent dc40a09 commit 83e440e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
1+
scalaVersion in ThisBuild := crossScalaVersions.value.head
22

33
crossScalaVersions in ThisBuild := {
44
val javaVersion = System.getProperty("java.version")
@@ -20,8 +20,8 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
2020
).
2121
settings(
2222
moduleName := "scala-parser-combinators",
23+
<<<<<<< HEAD
2324
version := "1.0.5-SNAPSHOT",
24-
scalaVersion := crossScalaVersions.value.head
2525
).
2626
jvmSettings(
2727
// important!! must come here (why?)
@@ -43,7 +43,7 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
4343
libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
4444
).
4545
settings(
46-
mimaPreviousVersion := None
46+
mimaPreviousVersion := Some("1.0.2")
4747
)
4848

4949
lazy val `scala-parser-combinatorsJVM` = `scala-parser-combinators`.jvm

0 commit comments

Comments
 (0)