Update STARR to freshly bootstrapped build

As built in https://scala-ci.typesafe.com/view/scala-2.12.x/job/scala-2.12.x-integrate-bootstrap/326/console

To pick this up in PR validation, I've configured SBT to use the extra
resolver. Once we gain some more confidence about the new STARR candidate,
we'll tag it and have the bootstrap script publish it to Sonatype, at
which time we can drop this change.

Author: retronym

build.xml

@@ -307,6 +307,7 @@ TODO:
 
       <artifact:remoteRepository id="sonatype-release" url="https://oss.sonatype.org/content/repositories/releases"/>
       <artifact:remoteRepository id="extra-repo" url="${extra.repo.url}"/>
+      <artifact:remoteRepository id="scala-release-temp" url="https://scala-ci.typesafe.com/artifactory/scala-release-temp/"/>
 
       <!-- prepare, for each of the names below, the property "@{name}.cross", set to the
            necessary cross suffix (usually something like "_2.11.0-M6". -->
@@ -330,12 +331,14 @@ TODO:
           -->
         <artifact:remoteRepository refid="sonatype-release"/>
         <artifact:remoteRepository refid="extra-repo"/>
+        <artifact:remoteRepository refid="scala-release-temp"/>
         <dependency groupId="org.scala-lang.modules" artifactId="scala-partest${partest.cross}" version="${partest.version.number}" />
       </artifact:dependencies>
       <copy-deps project="partest"/>
 
       <artifact:dependencies pathId="scalacheck.classpath" filesetId="scalacheck.fileset" versionsId="scalacheck.versions">
         <artifact:remoteRepository refid="extra-repo"/>
+        <artifact:remoteRepository refid="scala-release-temp"/>
         <dependency groupId="org.scalacheck"         artifactId="scalacheck${scalacheck.cross}"    version="${scalacheck.version.number}" />
       </artifact:dependencies>
 
@@ -348,6 +351,7 @@ TODO:
            must specify sourcesFilesetId, javadocFilesetId to download these types of artifacts -->
       <artifact:dependencies pathId="external-modules.deps.classpath" sourcesFilesetId="external-modules.sources.fileset" javadocFilesetId="external-modules.javadoc.fileset">
         <artifact:remoteRepository refid="extra-repo"/>
+        <artifact:remoteRepository refid="scala-release-temp"/>
         <dependency groupId="org.scala-lang.modules" artifactId="scala-xml${scala-xml.cross}" version="${scala-xml.version.number}"/>
         <dependency groupId="org.scala-lang.modules" artifactId="scala-parser-combinators${scala-parser-combinators.cross}" version="${scala-parser-combinators.version.number}"/>
         <dependency groupId="org.scala-lang.modules" artifactId="scala-swing${scala-swing.cross}" version="${scala-swing.version.number}"/>
@@ -376,6 +380,7 @@ TODO:
       <echo message="Using Scala ${starr.version} for STARR."/>
       <artifact:dependencies pathId="starr.compiler.path" filesetId="starr.fileset">
         <artifact:remoteRepository refid="extra-repo"/>
+        <artifact:remoteRepository refid="scala-release-temp"/>
         <dependency groupId="org.scala-lang" artifactId="scala-library" version="${starr.version}"/>
         <dependency groupId="org.scala-lang" artifactId="scala-reflect" version="${starr.version}"/>
         <dependency groupId="org.scala-lang" artifactId="scala-compiler" version="${starr.version}"/>

scripts/common

@@ -18,8 +18,18 @@ IVY_CACHE="$WORKSPACE/.ivy2"
 mkdir -p $IVY_CACHE
 rm -rf $IVY_CACHE/cache/org.scala-lang
 
+cat >$SBT_HOME/repositories <<EOF
+[repositories]
+  local
+  typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  maven-central
+  sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots
+  private-repo: https://scala-ci.typesafe.com/artifactory/scala-release-temp/
+EOF
+
 SBT_CMD=${sbtCmd-sbt}
 SBT_CMD="$SBT_CMD -sbt-version 0.13.9"
+SBT_CMD="$SBT_CMD -Dsbt.repository.config=$SBT_HOME/repositories"
 
 # temp dir where all 'non-build' operation are performed
 TMP_ROOT_DIR=$(mktemp -d -t pr-scala.XXXX)

versions.properties

@@ -8,7 +8,7 @@
 # The scala version used for bootstrapping. This has no impact on the final classfiles:
 # there are two stages (locker and quick), so compiler and library are always built
 # with themselves. Stability is ensured by building a third stage (strap).
-starr.version=2.12.0-M3
+starr.version=2.12.0-3ecc141-nightly
 
 # These are the versions of the modules that go with this release.
 # These properties are used during PR validation and in dbuild builds.
@@ -19,7 +19,7 @@ starr.version=2.12.0-M3
 #  - After 2.x.0 is released, the binary version is 2.x.
 #  - During milestones and RCs, modules are cross-built against the full version.
 #    So the value is the full version (e.g. 2.12.0-M2).
-scala.binary.version=2.12.0-M3
+scala.binary.version=2.12.0-3ecc141-nightly
 
 # external modules shipped with distribution, as specified by scala-library-all's pom
 scala-xml.version.number=1.0.5