Skip to content

Commit 42e1f22

Browse files
authored
Merge pull request #3066 from allanrenucci/0.3.x
0.3.0-RC2
2 parents 84eda81 + 212d8bf commit 42e1f22

File tree

4 files changed

+14
-36
lines changed

4 files changed

+14
-36
lines changed

.drone.yml

+13-32
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,53 @@
1-
# After updating this file, you need to re-sign it:
2-
#
3-
# - Install [drone-cli](http://readme.drone.io/usage/getting-started-cli/)
4-
# - Copy your token from http://dotty-ci.epfl.ch/account (Click SHOW TOKEN)
5-
# - DRONE_TOKEN=your-token DRONE_SERVER=http://dotty-ci.epfl.ch drone sign lampepfl/dotty
6-
#
7-
# Please note that the signing can only be done by collaborators.
8-
91
pipeline:
102
test:
113
image: lampepfl/dotty:07-06-2017
12-
pull: true
134
commands:
145
- ./project/scripts/sbt "${CI_TEST}"
15-
when:
16-
branch:
17-
exclude: gh-pages
186

197
publish_nightly:
208
image: lampepfl/dotty:07-06-2017
21-
pull: true
9+
environment:
10+
- NIGHTLYBUILD=yes
2211
commands:
2312
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
2413
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
25-
- NIGHTLYBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
14+
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
2615
volumes:
2716
- /home/drone/keys:/keys
17+
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
2818
when:
2919
event: deployment
3020
environment: nightly
3121

3222
publish_release:
3323
image: lampepfl/dotty:07-06-2017
34-
pull: true
24+
environment:
25+
- RELEASEBUILD=yes
3526
commands:
3627
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
3728
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
38-
- RELEASEBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
29+
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";dotty-bootstrapped/publishSigned ;sonatypeRelease"
3930
volumes:
4031
- /home/drone/keys:/keys
32+
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
4133
when:
4234
event: deployment
4335
environment: release
4436

4537
publish_sbt_release:
4638
image: lampepfl/dotty:07-06-2017
47-
pull: true
39+
environment:
40+
- RELEASEBUILD=yes
4841
commands:
49-
- RELEASEBUILD="yes" ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW ";sbt-dotty/publishSigned ;sonatypeRelease"
42+
- ./project/scripts/sbtPublish "${CI_PUBLISH}" "$SONATYPE_USER" "$SONATYPE_PW" "$PGP_PW" ";sbt-dotty/publishSigned ;sonatypeRelease"
5043
volumes:
5144
- /home/drone/keys:/keys
45+
secrets: [ sonatype_user, sonatype_pw, pgp_pw ]
5246
when:
5347
event: deployment
5448
environment: sbt_release
5549

56-
documentation:
57-
image: lampepfl/dotty:07-06-2017
58-
pull: true
59-
commands:
60-
- ./project/scripts/genDocs "${CI_PUBLISH}" $BOT_PASS
61-
when:
62-
branch: master
63-
64-
slack:
65-
image: plugins/slack
66-
channel: dotty
67-
when:
68-
branch: master
69-
status: changed
50+
branches: 0.3.x
7051

7152
matrix:
7253
include:

.drone.yml.sig

-1
This file was deleted.

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

-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ class ClassfileParser(
7575
throw new IOException(s"class file '${in.file}' has wrong magic number 0x${toHexString(magic)}, should be 0x${toHexString(JAVA_MAGIC)}")
7676
val minorVersion = in.nextChar.toInt
7777
val majorVersion = in.nextChar.toInt
78-
if (majorVersion >= JAVA8_MAJOR_VERSION)
79-
Scala2UnpicklingMode |= Mode.Java8Unpickling
8078
if ((majorVersion < JAVA_MAJOR_VERSION) ||
8179
((majorVersion == JAVA_MAJOR_VERSION) &&
8280
(minorVersion < JAVA_MINOR_VERSION)))

project/Build.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ object Build {
4040
val dottyOrganization = "ch.epfl.lamp"
4141
val dottyGithubUrl = "https://github.com/lampepfl/dotty"
4242
val dottyVersion = {
43-
val baseVersion = "0.3.0-RC1"
43+
val baseVersion = "0.3.0-RC2"
4444
val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
4545
val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
4646
if (isNightly)

0 commit comments

Comments
 (0)