Workaround bug in Scala runtime reflection on JDK 9

retronym · retronym · commit 4d84157461ba · 2017-02-16T14:21:56.000+10:00
The underlying bug is tracked as scala/scala-dev#304 and blocks our SBT starting on JDK 9. This commit avoids using the empty package in our build definition.
diff --git a/build.sbt b/build.sbt
@@ -32,6 +32,7 @@
  *   - to modularize the Scala compiler or library further
  */
 
+import scala.build._
 import VersionUtil._
 
 // Scala dependencies:
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 
 /** This object defines keys that should be visible with an unqualified name in all .sbt files and the command line */
diff --git a/project/GenerateAnyVals.scala b/project/GenerateAnyVals.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 /** Code generation of the AnyVal types and their companions. */
 trait GenerateAnyValReps {
   self: GenerateAnyVals =>
diff --git a/project/JarJar.scala b/project/JarJar.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import org.pantsbuild.jarjar
 import org.pantsbuild.jarjar._
 import org.pantsbuild.jarjar.util._
diff --git a/project/MiMa.scala b/project/MiMa.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 // It would be nice to use sbt-mima-plugin here, but the plugin is missing
 // at least two features we need:
 // * ability to run MiMa twice, swapping `curr` and `prev`, to detect
diff --git a/project/Osgi.scala b/project/Osgi.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import aQute.bnd.osgi.Builder
 import aQute.bnd.osgi.Constants._
 import java.util.Properties
diff --git a/project/ParserUtil.scala b/project/ParserUtil.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 import sbt.complete.Parser._
 import sbt.complete.Parsers._
diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 import sbt.complete._, Parser._, Parsers._
 
diff --git a/project/Quiet.scala b/project/Quiet.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 import Keys._
 
diff --git a/project/ScalaOptionParser.scala b/project/ScalaOptionParser.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import ParserUtil._
 import sbt._
 import sbt.complete.Parser._
diff --git a/project/ScalaTool.scala b/project/ScalaTool.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 import org.apache.commons.lang3.SystemUtils
 import org.apache.commons.lang3.StringUtils.replaceEach
diff --git a/project/ScriptCommands.scala b/project/ScriptCommands.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 import Keys._
 import BuildSettings.autoImport._
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala
@@ -1,3 +1,5 @@
+package scala.build
+
 import sbt._
 import Keys._
 import java.util.Properties

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package scala.build`
	`2`	`+`
`1`	`3`	`import sbt._`
`2`	`4`
`3`	`5`	`/** This object defines keys that should be visible with an unqualified name in all .sbt files and the command line */`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package scala.build`
	`2`	`+`
`1`	`3`	`/** Code generation of the AnyVal types and their companions. */`
`2`	`4`	`trait GenerateAnyValReps {`
`3`	`5`	`self: GenerateAnyVals =>`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package scala.build`
	`2`	`+`
`1`	`3`	`import org.pantsbuild.jarjar`
`2`	`4`	`import org.pantsbuild.jarjar._`
`3`	`5`	`import org.pantsbuild.jarjar.util._`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package scala.build`
	`2`	`+`
`1`	`3`	`// It would be nice to use sbt-mima-plugin here, but the plugin is missing`
`2`	`4`	`// at least two features we need:`
`3`	`5`	// * ability to run MiMa twice, swapping `curr` and `prev`, to detect
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package scala.build`
	`2`	`+`
`1`	`3`	`import aQute.bnd.osgi.Builder`
`2`	`4`	`import aQute.bnd.osgi.Constants._`
`3`	`5`	`import java.util.Properties`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+package scala.build`
	`2`	`+`
`1`	`3`	`import ParserUtil._`
`2`	`4`	`import sbt._`
`3`	`5`	`import sbt.complete.Parser._`