Merge pull request #3066 from allanrenucci/0.3.x

0.3.0-RC2

Author: allanrenucci

.drone.yml

@@ -1,72 +1,53 @@
-# After updating this file, you need to re-sign it:
-#
-# - Install [drone-cli](http://readme.drone.io/usage/getting-started-cli/)
-# - Copy your token from http://dotty-ci.epfl.ch/account (Click SHOW TOKEN)
-# - DRONE_TOKEN=your-token DRONE_SERVER=http://dotty-ci.epfl.ch drone sign lampepfl/dotty
-#
-# Please note that the signing can only be done by collaborators.
-
 pipeline:
   test:
     image: lampepfl/dotty:07-06-2017
-    pull: true
     commands:
       - ./project/scripts/sbt "${CI_TEST}"
-    when:
-      branch:
-        exclude: gh-pages
 
   publish_nightly:
     image: lampepfl/dotty:07-06-2017
-    pull: true
+    environment:
+      - NIGHTLYBUILD=yes
     commands:
       - ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
       - ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
-      - NIGHTLYBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
+      - ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
     volumes:
       - /home/drone/keys:/keys
+    secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
     when:
       event: deployment
       environment: nightly
 
   publish_release:
     image: lampepfl/dotty:07-06-2017
-    pull: true
+    environment:
+      - RELEASEBUILD=yes
     commands:
       - ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
       - ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
-      - RELEASEBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
+      - ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
     volumes:
       - /home/drone/keys:/keys
+    secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
     when:
       event: deployment
       environment: release
 
   publish_sbt_release:
     image: lampepfl/dotty:07-06-2017
-    pull: true
+    environment:
+      - RELEASEBUILD=yes
     commands:
-      - RELEASEBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";sbt-dotty/publishSigned ;sonatypeRelease"
+      - ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";sbt-dotty/publishSigned ;sonatypeRelease"
     volumes:
       - /home/drone/keys:/keys
+    secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
     when:
       event: deployment
       environment: sbt_release
 
-  documentation:
-    image: lampepfl/dotty:07-06-2017
-    pull: true
-    commands:
-      - ./project/scripts/genDocs "${CI_PUBLISH}" $BOT_PASS
-    when:
-      branch: master
-
-  slack:
-    image: plugins/slack
-    channel: dotty
-    when:
-      branch: master
-      status: changed
+branches: 0.3.x
 
 matrix:
   include:

.drone.yml.sig

@@ -75,8 +75,6 @@ class ClassfileParser(
       throw new IOException(s"class file '${in.file}' has wrong magic number 0x${toHexString(magic)}, should be 0x${toHexString(JAVA_MAGIC)}")
     val minorVersion = in.nextChar.toInt
     val majorVersion = in.nextChar.toInt
-    if (majorVersion >= JAVA8_MAJOR_VERSION)
-      Scala2UnpicklingMode |= Mode.Java8Unpickling
     if ((majorVersion < JAVA_MAJOR_VERSION) ||
         ((majorVersion == JAVA_MAJOR_VERSION) &&
          (minorVersion < JAVA_MINOR_VERSION)))

compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala

@@ -40,7 +40,7 @@ object Build {
   val dottyOrganization = "ch.epfl.lamp"
   val dottyGithubUrl = "https://github.com/lampepfl/dotty"
   val dottyVersion = {
-    val baseVersion = "0.3.0-RC1"
+    val baseVersion = "0.3.0-RC2"
     val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
     val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
     if (isNightly)