Merge branch '2.x' into provide-keys-though-autoimport

Author: Philippus

CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+all repositories in these organizations:
+
+* [scala](https://github.com/scala)
+* [scalacenter](https://github.com/scalacenter)
+* [lampepfl](https://github.com/lampepfl)
+
+are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/

README.md

@@ -1,6 +1,6 @@
 # Scala modules sbt plugin
 
-This is an sbt plugin for building Scala modules.
+This is an sbt 1.x plugin for building Scala modules.
 
 ## What modules use it?
 
@@ -24,15 +24,6 @@ release is made by pushing a tag to GitHub.  Travis-CI then stages
 artifacts on Sonatype.  Pressing "Close" and "Release" in the Sonatype
 web UI will then send the artifacts to Maven Central.
 
-## Branches and versions
-
-The main development branch is 2.x; only sbt 1 is supported there.
-
-sbt 0.13 support is on the legacy 1.x branch.
-
-Scala modules are encouraged to move to sbt 1 on their primary
-development branches as soon as reasonably possible.
-
 ## Usage
 
 Add the plugin to the `project/plugins.sbt` file:
@@ -59,7 +50,7 @@ version      := "<module version>"
 scalaVersionsByJvm in ThisBuild := {
   val v211 = "2.11.12"
   val v212 = "2.12.8"
-  val v213 = "2.13.0-M5"
+  val v213 = "2.13.0-RC1"
   // Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
   Map(
     8 -> List(v211 -> true, v212 -> true, v213 -> true),
@@ -98,7 +89,7 @@ Tag the release and add release notes to https://github.com/scala/sbt-scala-modu
 - Make sure the current `HEAD` is a tagged revision. In sbt, `version` (set by sbt-git) should be according to a tag.
 
       > version
-      [info] 1.0.13
+      [info] 2.3.4
 
 - Run `publish` in sbt. If you don't have a `~/.bintray/.credentials` file, the sbt-bintray plugin will ask you for your
   username and API key. The API key can be obtained under "Edit Profile" (https://bintray.com/profile/edit). The sbt-bintray
@@ -110,4 +101,4 @@ Tag the release and add release notes to https://github.com/scala/sbt-scala-modu
   - Search for your plugin (`sbt-scala-module`)
   - Click "Send" to send the request
 
-The above instructions are a short version of http://www.scala-sbt.org/0.13/docs/Bintray-For-Plugins.html.
+The above instructions are a short version of https://www.scala-sbt.org/1.x/docs/Bintray-For-Plugins.html.

project/plugins.sbt

@@ -1,2 +1,2 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.5")

src/main/scala/ScalaModulePlugin.scala

@@ -162,12 +162,8 @@ object ScalaModulePlugin extends AutoPlugin {
     val moduleId = ModuleID(organization, s"${name}_$scalaBinaryVersion", version)
     val depRes = IvyDependencyResolution(ivy.configuration)
     val module = depRes.wrapDependencyInModule(moduleId)
-    val reportEither = depRes.update(
-      module,
-      UpdateConfiguration() withLogging UpdateLogging.DownloadOnly,
-      UnresolvedWarningConfiguration(),
-      s.log
-    )
+    val updateConf = UpdateConfiguration() withLogging UpdateLogging.DownloadOnly
+    val reportEither = depRes.update(module, updateConf, UnresolvedWarningConfiguration(), s.log)
     reportEither.fold(_ => false, _ => true)
   }
 
@@ -179,25 +175,24 @@ object ScalaModulePlugin extends AutoPlugin {
     scalaModuleMimaPreviousVersion := None,
 
     // We're not using `%%` here in order to support both jvm and js projects (cross version `_2.12` / `_sjs0.6_2.12`)
-    mimaPreviousArtifacts := Set(organization.value % moduleName.value % scalaModuleMimaPreviousVersion.value.getOrElse("dummy") cross crossVersion.value),
+    mimaPreviousArtifacts := mimaPreviousVersion.value.map(v => organization.value % moduleName.value % v cross crossVersion.value).toSet,
 
     canRunMima := {
-      val mimaVer = scalaModuleMimaPreviousVersion.value
-      val s = streams.value
-      val ivySbt = Keys.ivySbt.value
-      if (mimaVer.isEmpty) {
-        s.log.warn("MiMa will NOT run because no mimaPreviousVersion is provided.")
-        false
-      } else if (!artifactExists(organization.value, name.value, scalaBinaryVersion.value, mimaVer.get, ivySbt, s)) {
-        s.log.warn(s"""MiMa will NOT run because the previous artifact "${organization.value}" % "${name.value}_${scalaBinaryVersion.value}" % "${mimaVer.get}" could not be resolved (note the binary Scala version).""")
-        false
-      } else {
-        true
+      val log = streams.value.log
+      mimaPreviousVersion.value match {
+        case None =>
+          log.warn("MiMa will NOT run because no mimaPreviousVersion is provided.")
+          false
+        case Some(mimaVer) =>
+          val exists = artifactExists(organization.value, name.value, scalaBinaryVersion.value, mimaVer, ivySbt.value, streams.value)
+          if (!exists)
+            log.warn(s"""MiMa will NOT run because the previous artifact "${organization.value}" % "${name.value}_${scalaBinaryVersion.value}" % "$mimaVer" could not be resolved (note the binary Scala version).""")
+          exists
       }
     },
 
     runMimaIfEnabled := Def.taskDyn({
-      if(canRunMima.value) Def.task { mimaReportBinaryIssues.value }
+      if (canRunMima.value) Def.task { mimaReportBinaryIssues.value }
       else Def.task { () }
     }).value,