Skip to content

Commit 49b29fb

Browse files
committed
Disable MiMa, minor cleanups in build.sbt
1 parent deabbbb commit 49b29fb

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build.sbt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
22

33
scalaModuleSettings
44

5-
name := "scala-swing"
5+
name := "scala-swing"
66

7-
version := "2.0.0-SNAPSHOT"
7+
version := "2.0.0-SNAPSHOT"
88

99
scalaVersion := "2.11.1"
1010

@@ -13,9 +13,9 @@ scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.6")
1313
// important!! must come here (why?)
1414
scalaModuleOsgiSettings
1515

16-
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
16+
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
1717

18-
mimaPreviousVersion := Some("1.0.1")
18+
mimaPreviousVersion := None
1919

2020
// set the prompt (for this build) to include the project id.
2121
shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project + "> " }
@@ -25,15 +25,15 @@ lazy val swing = project.in( file(".") )
2525
lazy val examples = project.in( file("examples") )
2626
.dependsOn(swing)
2727
.settings(
28-
scalaVersion := "2.11.1",
28+
scalaVersion := (scalaVersion in swing).value,
2929
fork in run := true,
3030
fork := true
3131
)
3232

3333
lazy val uitest = project.in( file("uitest") )
3434
.dependsOn(swing)
3535
.settings(
36-
scalaVersion := "2.11.1",
36+
scalaVersion := (scalaVersion in swing).value,
3737
fork in run := true,
3838
fork := true
3939
)

0 commit comments

Comments
 (0)