1 files changed, 9 insertions, 6 deletions
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala
index 1c2fff27b7..7c4909697f 100644
--- a/project/VersionUtil.scala
+++ b/project/VersionUtil.scala
@@ -8,8 +8,10 @@ import BuildSettings.autoImport._
 object VersionUtil {
   lazy val copyrightString = settingKey[String]("Copyright string.")
   lazy val versionProperties = settingKey[Versions]("Version properties.")
-  lazy val generateVersionPropertiesFile = taskKey[File]("Generating version properties file.")
-  lazy val generateBuildCharacterPropertiesFile = taskKey[File]("Generating buildcharacter.properties file.")
+  lazy val buildCharacterPropertiesFile = settingKey[File]("The file which gets generated by generateBuildCharacterPropertiesFile")
+  lazy val generateVersionPropertiesFile = taskKey[File]("Generate version properties file.")
+  lazy val generateBuildCharacterPropertiesFile = taskKey[File]("Generate buildcharacter.properties file.")
+  lazy val extractBuildCharacterPropertiesFile = taskKey[File]("Extract buildcharacter.properties file from bootstrap scala-compiler.")
 
   lazy val globalVersionSettings = Seq[Setting[_]](
     // Set the version properties globally (they are the same for all projects)
@@ -18,12 +20,13 @@ object VersionUtil {
   )
 
   lazy val generatePropertiesFileSettings = Seq[Setting[_]](
-    copyrightString := "Copyright 2002-2016, LAMP/EPFL",
+    copyrightString := "Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.",
     resourceGenerators in Compile += generateVersionPropertiesFile.map(file => Seq(file)).taskValue,
     generateVersionPropertiesFile := generateVersionPropertiesFileImpl.value
   )
 
   lazy val generateBuildCharacterFileSettings = Seq[Setting[_]](
+    buildCharacterPropertiesFile := ((baseDirectory in ThisBuild).value / "buildcharacter.properties"),
     generateBuildCharacterPropertiesFile := generateBuildCharacterPropertiesFileImpl.value
   )
 
@@ -101,7 +104,7 @@ object VersionUtil {
     writeProps(v.toMap ++ versionProps ++ Map(
       "maven.version.base" -> v.mavenBase,
       "maven.version.suffix" -> v.mavenSuffix
-    ), (baseDirectory in ThisBuild).value / "buildcharacter.properties")
+    ), buildCharacterPropertiesFile.value)
   }
 
   private def writeProps(m: Map[String, String], propFile: File): File = {
@@ -146,10 +149,10 @@ object VersionUtil {
   def bootstrapDep(baseDir: File, path: String, libName: String): ModuleID = {
     val sha = IO.read(baseDir / path / s"$libName.jar.desired.sha1").split(' ')(0)
     bootstrapOrganization(path) % libName % sha from
-      s"https://dl.bintray.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/$sha/$path/$libName.jar"
+      s"https://repo.lightbend.com/typesafe/scala-sha-bootstrap/org/scala-lang/bootstrap/$sha/$path/$libName.jar"
   }
 
-  /** Copy a boostrap dependency JAR that is on the classpath to a file */
+  /** Copy a bootstrap dependency JAR that is on the classpath to a file */
   def copyBootstrapJar(cp: Seq[Attributed[File]], baseDir: File, path: String, libName: String): Unit = {
     val org = bootstrapOrganization(path)
     val resolved = cp.find { a =>