diff options
| author | Seth Tisue <seth@tisue.net> | 2016-11-01 13:12:32 -0400 |
|---|---|---|
| committer | Adriaan Moors <adriaan@lightbend.com> | 2016-11-01 10:12:32 -0700 |
| commit | de003f7fc3a4c8a9b096249149c8d9e2a2387c16 (patch) | |
| tree | e26424083c27f2ad920b611cbb75249639c1ba91 | |
| parent | 6e89887b60bf9776cd02d9570d3b8c4cfe63a8fa (diff) | |
| download | scala-de003f7fc3a4c8a9b096249149c8d9e2a2387c16.tar.gz scala-de003f7fc3a4c8a9b096249149c8d9e2a2387c16.tar.bz2 scala-de003f7fc3a4c8a9b096249149c8d9e2a2387c16.zip | |
Bump baseVersion to 2.12.1 (#5389)
Binary version (for modules) is now 2.12,
starr is 2.12.0-RC2.
Also, drop repo_ref from jenkins.properties; It's
propagated downstream by the '-main' build flows already.
| -rw-r--r-- | build.sbt | 2 | ||||
| -rwxr-xr-x | scripts/jobs/integrate/bootstrap | 2 | ||||
| -rw-r--r-- | versions.properties | 4 |
3 files changed, 3 insertions, 5 deletions
@@ -86,7 +86,7 @@ lazy val publishSettings : Seq[Setting[_]] = Seq( // should not be set directly. It is the same as the Maven version and derived automatically from `baseVersion` and // `baseVersionSuffix`. globalVersionSettings -baseVersion in Global := "2.12.0" +baseVersion in Global := "2.12.1" baseVersionSuffix in Global := "SNAPSHOT" mimaReferenceVersion in Global := Some("2.12.0-RC1") diff --git a/scripts/jobs/integrate/bootstrap b/scripts/jobs/integrate/bootstrap index 5340bda0e1..ed1e05251a 100755 --- a/scripts/jobs/integrate/bootstrap +++ b/scripts/jobs/integrate/bootstrap @@ -317,8 +317,6 @@ scalaVerToBinary() { determineScalaVersion() { cd $WORKSPACE parseScalaProperties "versions.properties" - echo "repo_ref=2.12.x" >> $baseDir/jenkins.properties # for the -dist downstream jobs that build the actual archives - # each of the branches below defines the following vars: SCALA_VER_BASE, SCALA_VER_SUFFIX, SCALADOC_SOURCE_LINKS_VER, publishToSonatype if [ -z "$SCALA_VER_BASE" ]; then diff --git a/versions.properties b/versions.properties index 9dec7ff525..7b96071386 100644 --- a/versions.properties +++ b/versions.properties @@ -1,7 +1,7 @@ # Scala version used for bootstrapping. (This has no impact on the # final classfiles, since compiler and library are built first using # starr, then rebuilt using themselves.) -starr.version=2.12.0-RC1-1e81a09 +starr.version=2.12.0-RC2 # Set in the following way: # - After 2.x.0 is released, the binary version is 2.x. @@ -9,7 +9,7 @@ starr.version=2.12.0-RC1-1e81a09 # So the value is the full version (e.g. 2.12.0-M2). # Also determines how modules are resolved. For example, it determines which # partest artifact is being used for running the tests. -scala.binary.version=2.12.0-RC1 +scala.binary.version=2.12 # external modules shipped with distribution, as specified by scala-library-all's pom scala-xml.version.number=1.0.6 |