Skip to content

Commit 75436e6

Browse files
adriaanmandy1138
authored andcommitted
Switch to scala-module-plugin, sbt 0.13.1
Conflicts: build.sbt project/build.properties project/plugins.sbt standard.sbt
1 parent 7cf2673 commit 75436e6

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

build.sbt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}
2-
import VersionKeys._
32

43
scalaModuleSettings
54

65
organization := "org.scala-lang.modules"
76

8-
name := "scala-swing"
7+
scalaModuleSettings
8+
9+
name := "scala-swing"
910

1011
version := "2.0.0-SNAPSHOT"
1112

@@ -18,16 +19,20 @@ scalacOptions ++= Seq("-deprecation", "-feature", "-target:jvm-1.6")
1819
snapshotScalaBinaryVersion := "2.11"
1920

2021
// important!! must come here (why?)
21-
osgiSettings
22+
scalaModuleOsgiSettings
2223

2324
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
2425

2526
MimaPlugin.mimaDefaultSettings
2627

27-
MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11.0-RC1" % "1.0.0")
28+
MimaKeys.previousArtifact := Some(organization.value % s"${name.value}_2.11.1" % "1.0.0")
2829

2930
// run mima during tests
3031
test in Test := {
3132
MimaKeys.reportBinaryIssues.value
3233
(test in Test).value
3334
}
35+
36+
37+
38+

project/build.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sbt.version=0.13.5

project/keys.scala

Lines changed: 0 additions & 11 deletions
This file was deleted.

project/plugins.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.6.0")
2-
3-
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.1")
1+
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.2")
42

53
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")

0 commit comments

Comments
 (0)