Skip to content

Commit 635d668

Browse files
authored
Merge pull request #3499 from dotty-staging/upgrade/asm-6.0
Upgrade ASM to 6.0, fix bug with very large methods
2 parents b4e8acd + 2761b63 commit 635d668

File tree

3 files changed

+142
-10
lines changed

3 files changed

+142
-10
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,37 @@ pipeline:
1515
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
1616
test_legacy:
1717
group: test
18-
image: lampepfl/dotty:2017-10-20
18+
image: lampepfl/dotty:2017-11-17
1919
commands:
2020
- cp -R . /tmp/0/ && cd /tmp/0/
2121
- ./project/scripts/sbt legacyTests
2222

2323
test:
2424
group: test
25-
image: lampepfl/dotty:2017-10-20
25+
image: lampepfl/dotty:2017-11-17
2626
commands:
2727
- cp -R . /tmp/1/ && cd /tmp/1/
2828
- ./project/scripts/sbt ";compile ;testAll"
2929
- ./project/scripts/sbtTests
3030

3131
test_bootstrapped:
3232
group: test
33-
image: lampepfl/dotty:2017-10-20
33+
image: lampepfl/dotty:2017-11-17
3434
commands:
3535
- cp -R . /tmp/2/ && cd /tmp/2/
3636
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/testAll"
3737
- ./project/scripts/sbtBootstrappedTests
3838

3939
test_optimised:
4040
group: test
41-
image: lampepfl/dotty:2017-10-20
41+
image: lampepfl/dotty:2017-11-17
4242
commands:
4343
- cp -R . /tmp/3/ && cd /tmp/3/
4444
- ./project/scripts/sbt dotty-optimised/testAll
4545

4646
test_sbt:
4747
group: test
48-
image: lampepfl/dotty:2017-10-20
48+
image: lampepfl/dotty:2017-11-17
4949
commands:
5050
- cp -R . /tmp/4/ && cd /tmp/4/
5151
- ./project/scripts/sbt sbt-dotty/scripted
@@ -55,7 +55,7 @@ pipeline:
5555

5656
# DOCUMENTATION:
5757
documentation:
58-
image: lampepfl/dotty:2017-10-20
58+
image: lampepfl/dotty:2017-11-17
5959
commands:
6060
- ./project/scripts/genDocs
6161
secrets: [ bot_pass ]
@@ -67,7 +67,7 @@ pipeline:
6767
# PUBLISHING:
6868
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
6969
publish_nightly:
70-
image: lampepfl/dotty:2017-10-20
70+
image: lampepfl/dotty:2017-11-17
7171
environment:
7272
- NIGHTLYBUILD=yes
7373
commands:
@@ -80,7 +80,7 @@ pipeline:
8080
environment: nightly
8181

8282
publish_release:
83-
image: lampepfl/dotty:2017-10-20
83+
image: lampepfl/dotty:2017-11-17
8484
environment:
8585
- RELEASEBUILD=yes
8686
commands:
@@ -106,7 +106,7 @@ pipeline:
106106
event: tag
107107

108108
publish_sbt_release:
109-
image: lampepfl/dotty:2017-10-20
109+
image: lampepfl/dotty:2017-11-17
110110
environment:
111111
- RELEASEBUILD=yes
112112
commands:

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ object Build {
435435
}.taskValue,
436436

437437
// Used by the backend
438-
libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "5.2.0-scala-2",
438+
libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "6.0.0-scala-1",
439439

440440
// set system in/out for repl
441441
connectInput in run := true,

0 commit comments

Comments
 (0)