updates for 2.12.x branch

Author: lrytz

README.md

@@ -18,7 +18,7 @@ it'll create and upload the other packages in the above list. (Use `s3Upload::ma
 The version of Scala to package is derived from the most recent git tag,
 or you can specify it using `-Dproject.version`.
 
-This packager only works for Scala 2.11 releases (starting with M8),
+This packager only works for Scala 2.11 releases (starting with M8) or newer,
 as earlier ones did not publish the `scala-dist` artifact to maven.
 
 Due to limited resources, the native packages are quite rudimental -- we welcome new maintainers!
@@ -46,7 +46,4 @@ The specification also used to be in this repo -- it is now a part of the main r
 Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/Pull-Request-Policy)
 and sign the [CLA](http://typesafe.com/contribute/cla/scala).
 
-The branching structure mimics that of [scala/scala](https://github.com/scala/scala):
-master is the upcoming 2.11.0 release,
-and the 2.10.x branch is your target for 2.10.x features.
-
+The branching structure mimics that of [scala/scala](https://github.com/scala/scala).

conf/repositories

@@ -1,6 +1,6 @@
 [repositories]
   plugins: http://dl.bintray.com/sbt/sbt-plugin-releases/, [organisation]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
-  private-repo: http://private-repo.typesafe.com/typesafe/scala-release-temp/
+  private-repo: https://scala-ci.typesafe.com/artifactory/scala-release-temp/
   typesafe-ivy-releases: http://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   sbt-plugin-releases: http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases, [organization]/[module]/(scala_[scalaVersion]/)(sbt_[sbtVersion]/)[revision]/[type]s/[artifact](-[classifier]).[ext]
   maven-central

project/ScalaDist.scala

@@ -6,11 +6,6 @@ import com.typesafe.sbt.packager.Keys._
 
 import com.typesafe.sbt.S3Plugin.S3.upload
 
-// TODO:
-// smoke testing: make sure repl works, jline loads
-// compile a file that exercises each module (xml, parsers, akka-actor,...)
-// run the whole test suite against the scala instance we're shipping?
-
 // can't call it Universal -- that's taken by the packager
 object ScalaDist {
   def createMappingsWith(deps: Seq[(String, ModuleID, Artifact, File)],

scripts/jobs/release/website/archives

@@ -5,7 +5,7 @@ declare -a sshCharaArgs="$sshCharaArgs"
 url="http://downloads.typesafe.com/scala/$version"
 
 if [[ "$version" =~ .*-nightly ]]
-then archivesDir="~linuxsoft/archives/scala/nightly/2.11.x"
+then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x"
 else archivesDir="~linuxsoft/archives/scala"
 fi
 
@@ -26,10 +26,7 @@ echo "Expanding scala-library API docs for $version to api/$version (with subdir
 ssh "${sshCharaArgs[@]}" "cd $archivesDir && mkdir -p api/$version && tar -xvz --strip-component 2 -f scala-docs-$version.tgz -C api/$version && mv api/$version/scala-library/* api/$version/" # tar on jenkins does not support the -s option
 
 echo "Expanding the Scaladoc for other bundled modules"
-# treat scala-actors separately because it's not cross-versioned
-ssh "${sshCharaArgs[@]}" "(set -x; cd $archivesDir && mkdir -p api/$version/scala-actors && unzip \$(find api/$version/jars -name 'scala-actors-2.11*javadoc.jar' -o -name scala-actors-${version}-javadoc.jar) -d api/$version/scala-actors;)"
-
-modules="scala-actors-migration scala-continuations-library scala-parser-combinators scala-swing scala-xml"
+modules="scala-parser-combinators scala-swing scala-xml"
 for m in $modules; do 
 ssh "${sshCharaArgs[@]}" "(set -x; cd $archivesDir && mkdir -p api/$version/$m && unzip \$(find api/$version/jars -name ${m}_'*javadoc.jar' -o -name ${m}-${version}-javadoc.jar) -d api/$version/$m;)"
 done

scripts/jobs/release/website/update-api

@@ -3,14 +3,14 @@
 declare -a sshCharaArgs="$sshCharaArgs"
 
 if [[ "$version" =~ .*-nightly ]]
-then archivesDir="~linuxsoft/archives/scala/nightly/2.11.x"
+then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x"
 else archivesDir="~linuxsoft/archives/scala"
 fi
 
-echo "Symlinking $archivesDir/api/$version to $archivesDir/api/2.11.x."
+echo "Symlinking $archivesDir/api/$version to $archivesDir/api/2.12.x."
 
-ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn $version 2.11.x"
+ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn $version 2.12.x"
 
 # needs to run once on new major release:
-# ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn 2.11.x current"
+# ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn 2.12.x current"