Merge remote-tracking branch 'origin/2.12.x' into 2.13.x

Author: SethTisue

build.sbt

@@ -11,6 +11,11 @@ versionWithGit
 
 Versioning.settings
 
+// necessary since sbt 0.13.12 for some dark and mysterious reason
+// perhaps related to sbt/sbt#2634. details, to the extent they
+// are known/understood, at scala/scala-dist#171
+scalaVersion := version.value
+
 s3Settings
 
 host in upload := "downloads.typesafe.com.s3.amazonaws.com"

project/Wix.scala

@@ -32,6 +32,11 @@ object Wix {
   )
 
   private def makeProductConfig(stage: File, stageApi: File) = {
+
+    // there are deprecation warnings here. the methods have been undeprecated
+    // at https://github.com/sbt/sbt-native-packager/pull/909 . once we upgrade
+    // to a newer sbt-native-packager that includes that change, we could
+    // enable -Xfatal-warnings again in scalacOptions in project/plugins.sbt
     val (bin, binDirXml0) = generateComponentsAndDirectoryXml(stage / "bin")
     val (doc, docDirXml)  = generateComponentsAndDirectoryXml(stage / "doc", "doc_")
     val (lib, libDirXml)  = generateComponentsAndDirectoryXml(stage / "lib")