Skip to content

Commit 449015d

Browse files
committed
Update scala-module-plugin to 1.0.8
1 parent d08c6e2 commit 449015d

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

admin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ To configure tag driven releases from Travis CI.
1717
Edit `.travis.yml` as prompted.
1818
1. Edit `.travis.yml` to use `./admin/build.sh` as the build script,
1919
and edit that script to use the tasks required for this project.
20-
1. Edit `build.sbt`'s `scalaVersionsByJvm` to select Scala and JVM version combinations that
21-
will be used for publishing.
20+
1. Edit `build.sbt`'s `scalaVersionsByJvm in ThisBuild` to select Scala and JVM version
21+
combinations that will be used for publishing.
2222

2323
It is important to add comments in `.travis.yml` to identify the name
2424
of each environment variable encoded in a `:secure` section.

admin/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
3333
echo "Not publishing $TRAVIS_TAG on Java version $currentJvmVer."
3434
exit 0
3535
fi
36-
publishScalaVersion='set every scalaVersionsByJvm := Map('$jvmVer' -> List("'$scalaVer'" -> true))'
36+
publishScalaVersion='set every ScalaModulePlugin.scalaVersionsByJvm := Map('$jvmVer' -> List("'$scalaVer'" -> true))'
3737
echo "Releasing $tagVer using Scala $scalaVer on Java version $jvmVer."
3838
else
3939
echo "Releasing $tagVer on Java version $currentJvmVer according to 'scalaVersionsByJvm' in build.sbt."

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1+
import ScalaModulePlugin._
2+
13
scalaModuleSettings
24

35
name := "scala-swing"
46
version := "1.0.3-SNAPSHOT"
57

6-
scalaVersionsByJvm := {
8+
scalaVersionsByJvm in ThisBuild := {
79
val vs = List("2.11.11", "2.10.6")
810

911
// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
1012
Map(
1113
6 -> vs.map(_ -> true),
1214
7 -> vs.map(_ -> false),
13-
8 -> vs.map(_ -> false)
14-
)
15+
8 -> vs.map(_ -> false))
1516
}
1617

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

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.6")
1+
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")

0 commit comments

Comments
 (0)