Merge branch '1.0.x' into 2.0.x

Author: lrytz

admin/README.md

@@ -17,8 +17,8 @@ To configure tag driven releases from Travis CI.
      Edit `.travis.yml` as prompted.
   1. Edit `.travis.yml` to use `./admin/build.sh` as the build script,
      and edit that script to use the tasks required for this project.
-  1. Edit `build.sbt`'s `scalaVersionsByJvm` to select Scala and JVM version combinations that
-     will be used for publishing.
+  1. Edit `build.sbt`'s `scalaVersionsByJvm in ThisBuild` to select Scala and JVM version
+     combinations that will be used for publishing.
 
 It is important to add comments in `.travis.yml` to identify the name
 of each environment variable encoded in a `:secure` section.

admin/build.sh

@@ -33,7 +33,7 @@ if [[ "$TRAVIS_TAG" =~ $tagPat ]]; then
       echo "Not publishing $TRAVIS_TAG on Java version $currentJvmVer."
       exit 0
     fi
-    publishScalaVersion='set every scalaVersionsByJvm := Map('$jvmVer' -> List("'$scalaVer'" -> true))'
+    publishScalaVersion='set every ScalaModulePlugin.scalaVersionsByJvm := Map('$jvmVer' -> List("'$scalaVer'" -> true))'
     echo "Releasing $tagVer using Scala $scalaVer on Java version $jvmVer."
   else
     echo "Releasing $tagVer on Java version $currentJvmVer according to 'scalaVersionsByJvm' in build.sbt."

build.sbt

@@ -1,3 +1,5 @@
+import ScalaModulePlugin._
+
 scalaModuleSettings
 
 name    := "scala-swing"
@@ -6,7 +8,7 @@ version := "2.0.0-SNAPSHOT"
 scalacOptions      ++= Seq("-deprecation", "-feature")
 
 // Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
-scalaVersionsByJvm := Map(
+scalaVersionsByJvm in ThisBuild := Map(
   8 -> List("2.11.11", "2.12.2", "2.13.0-M1").map(_ -> true)
 )
 

project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.6")
+addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")