diff --git a/.travis.yml b/.travis.yml index 976395da7..0f09d5e88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ before_install: language: scala jdk: oraclejdk8 +# although this is the 2.13.x branch, we don't have any 2.13 scala-dist +# artifacts to depend on yet. so for now, just keep using 2.12.0 script: - sbt -Dproject.version=2.12.0 s3Upload::mappings diff --git a/README.md b/README.md index 49b9f5ccc..b82b7078c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# The Scala 2.12.x Distribution +# The Scala 2.13.x Distribution This project morphs the `"org.scala-lang" % "scala-dist" % $version` maven artifact into a Scala `$version` distribution (zip, tar.gz, deb, rpm, and msi). @@ -28,8 +28,6 @@ We welcome new maintainers! If you're looking for the editor configurations that used to be in the tool-support directory, please see https://github.com/scala/scala-tool-support. They were moved out because they no longer ship with the Scala distribution. (New maintainers are welcome on the scala-tool-support project!) -The specification also used to be in this repo -- it is now a part of the main repository over at [scala/scala](https://github.com/scala/scala/tree/2.11.x/spec). - ## Windows VM - install Windows 7 professional N 64-bit, ensure network access to GitHub - install Oracle Java 6 JDK @@ -47,5 +45,4 @@ Please read the [Scala Pull Request Policy](https://github.com/scala/scala/wiki/ and sign the [CLA](http://www.lightbend.com/contribute/cla/scala). The branching structure mimics that of [scala/scala](https://github.com/scala/scala): -branches for 2.11.x, 2.12.x, etc. - +branches for 2.11.x, 2.12.x, 2.13.x, etc. diff --git a/scripts/jobs/release/package/generic b/scripts/jobs/release/package/generic index 5fe5d624f..a80decc6c 100755 --- a/scripts/jobs/release/package/generic +++ b/scripts/jobs/release/package/generic @@ -1,7 +1,7 @@ # @pre current directory == repo root # must run on both windows (cygwin) and linux -# invoked from scala-release-2.11.x-[unix|windows] +# invoked from scala-release-2.13.x-[unix|windows] # uses the following env vars: # - WORKSPACE, JAVA_OPTS (jenkins standard) @@ -16,7 +16,7 @@ repositoriesFile="$WORKSPACE/conf/repositories" tags="$(git tag --points-at HEAD)" -# version is set by the scala-release-2.11.x-dist build flow, make sure it's consistent with the tag +# version is set by the scala-release-2.13.x-dist build flow, make sure it's consistent with the tag # this is also a backstop for https://github.com/sbt/sbt-git/issues/35 # ignore when there is no version (job is running outside of the flow) [[ -z $sbtDistVersionOverride ]] && [[ -n $version ]] && if [ "$tags" != "v$version" ]; then diff --git a/scripts/jobs/release/website/archives b/scripts/jobs/release/website/archives index 7166182e8..b8dac6648 100755 --- a/scripts/jobs/release/website/archives +++ b/scripts/jobs/release/website/archives @@ -5,7 +5,7 @@ declare -a sshCharaArgs="$sshCharaArgs" url="http://downloads.lightbend.com/scala/$version" if [[ "$version" =~ .*-nightly ]] -then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x" +then archivesDir="~linuxsoft/archives/scala/nightly/2.13.x" else archivesDir="~linuxsoft/archives/scala" fi diff --git a/scripts/jobs/release/website/update-api b/scripts/jobs/release/website/update-api index 9e0dfcaa0..0df0be1e8 100755 --- a/scripts/jobs/release/website/update-api +++ b/scripts/jobs/release/website/update-api @@ -3,14 +3,13 @@ declare -a sshCharaArgs="$sshCharaArgs" if [[ "$version" =~ .*-nightly ]] -then archivesDir="~linuxsoft/archives/scala/nightly/2.12.x" +then archivesDir="~linuxsoft/archives/scala/nightly/2.13.x" else archivesDir="~linuxsoft/archives/scala" fi -echo "Symlinking $archivesDir/api/$version to $archivesDir/api/2.12.x." +echo "Symlinking $archivesDir/api/$version to $archivesDir/api/2.13.x." -ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn $version 2.12.x" +ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn $version 2.13.x" # needs to run once on new major release: -# ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn 2.12.x current" - +# ssh "${sshCharaArgs[@]}" "cd $archivesDir/api/ ; [[ -d $version ]] && ln -sfn 2.13.x current"