Skip to content

Commit c50c164

Browse files
authored
Merge pull request #3268 from dotty-staging/upgrade/asm-5.2
Upgrade scala-asm to 5.2.0-scala-1
2 parents 7004d07 + f62ca16 commit c50c164

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ pipeline:
33
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
44
test_legacy:
55
group: test
6-
image: lampepfl/dotty:2017-09-27
6+
image: lampepfl/dotty:2017-10-05
77
commands:
88
- cp -R . /tmp/0/ && cd /tmp/0/
99
- ./project/scripts/sbt legacyTests
1010

1111
test:
1212
group: test
13-
image: lampepfl/dotty:2017-09-27
13+
image: lampepfl/dotty:2017-10-05
1414
commands:
1515
- cp -R . /tmp/1/ && cd /tmp/1/
1616
- ./project/scripts/sbt testAll
1717
- ./project/scripts/sbt ";dotty-bench/jmh:run 1 1 tests/run/arrays.scala"
1818

1919
test_bootstrapped:
2020
group: test
21-
image: lampepfl/dotty:2017-09-27
21+
image: lampepfl/dotty:2017-10-05
2222
commands:
2323
- cp -R . /tmp/2/ && cd /tmp/2/
2424
- ./project/scripts/sbt dotty-bootstrapped/testAll
2525
- ./project/scripts/sbt ";dotty-bench-bootstrapped/jmh:run 1 1 tests/run/arrays.scala"
2626

2727
test_optimised:
2828
group: test
29-
image: lampepfl/dotty:2017-09-27
29+
image: lampepfl/dotty:2017-10-05
3030
commands:
3131
- cp -R . /tmp/3/ && cd /tmp/3/
3232
- ./project/scripts/sbt dotty-optimised/testAll
3333

3434
test_sbt:
3535
group: test
36-
image: lampepfl/dotty:2017-09-27
36+
image: lampepfl/dotty:2017-10-05
3737
commands:
3838
- cp -R . /tmp/4/ && cd /tmp/4/
3939
- ./project/scripts/sbt sbt-dotty/scripted
@@ -43,7 +43,7 @@ pipeline:
4343

4444
# DOCUMENTATION:
4545
documentation:
46-
image: lampepfl/dotty:2017-09-27
46+
image: lampepfl/dotty:2017-10-05
4747
commands:
4848
- ./project/scripts/genDocs
4949
secrets: [ bot_pass ]
@@ -55,7 +55,7 @@ pipeline:
5555
# PUBLISHING:
5656
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
5757
publish_nightly:
58-
image: lampepfl/dotty:2017-09-27
58+
image: lampepfl/dotty:2017-10-05
5959
environment:
6060
- NIGHTLYBUILD=yes
6161
commands:
@@ -68,7 +68,7 @@ pipeline:
6868
environment: nightly
6969

7070
publish_release:
71-
image: lampepfl/dotty:2017-09-27
71+
image: lampepfl/dotty:2017-10-05
7272
environment:
7373
- RELEASEBUILD=yes
7474
commands:
@@ -81,7 +81,7 @@ pipeline:
8181
environment: release
8282

8383
publish_sbt_release:
84-
image: lampepfl/dotty:2017-09-27
84+
image: lampepfl/dotty:2017-10-05
8585
environment:
8686
- RELEASEBUILD=yes
8787
commands:

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ object Build {
421421
}.taskValue,
422422

423423
// Used by the backend
424-
libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "5.1.0-scala-2",
424+
libraryDependencies += "org.scala-lang.modules" % "scala-asm" % "5.2.0-scala-1",
425425

426426
// set system in/out for repl
427427
connectInput in run := true,

0 commit comments

Comments
 (0)