Skip to content

Commit 38e87b0

Browse files
authored
Merge pull request #7019 from dotty-staging/upgrade/scalac-2.13
Switch to the 2.13 standard library
2 parents a6b56a1 + 37fab22 commit 38e87b0

File tree

1,220 files changed

+2107
-83813
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,220 files changed

+2107
-83813
lines changed

.drone.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727

2828
- name: test
2929
pull: default
30-
image: lampepfl/dotty:2019-04-22
30+
image: lampepfl/dotty:2019-08-22
3131
depends_on: [ clone ]
3232
commands:
3333
- cp -R . /tmp/1/ && cd /tmp/1/
@@ -36,7 +36,7 @@ steps:
3636

3737
- name: test_bootstrapped
3838
pull: default
39-
image: lampepfl/dotty:2019-04-22
39+
image: lampepfl/dotty:2019-08-22
4040
depends_on: [ clone ]
4141
commands:
4242
- cp -R . /tmp/2/ && cd /tmp/2/
@@ -45,7 +45,7 @@ steps:
4545

4646
- name: community_build
4747
pull: default
48-
image: lampepfl/dotty:2019-04-22
48+
image: lampepfl/dotty:2019-08-22
4949
depends_on: [ clone ]
5050
commands:
5151
- cp -R . /tmp/3/ && cd /tmp/3/
@@ -54,7 +54,7 @@ steps:
5454

5555
- name: test_sbt
5656
pull: default
57-
image: lampepfl/dotty:2019-04-22
57+
image: lampepfl/dotty:2019-08-22
5858
depends_on: [ clone ]
5959
commands:
6060
- cp -R . /tmp/4/ && cd /tmp/4/
@@ -66,7 +66,7 @@ steps:
6666

6767
- name: test_java11
6868
pull: default
69-
image: lampepfl/dotty:2019-04-22
69+
image: lampepfl/dotty:2019-08-22
7070
depends_on: [ clone ]
7171
commands:
7272
- export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
@@ -80,7 +80,7 @@ steps:
8080

8181
- name: documentation
8282
pull: default
83-
image: lampepfl/dotty:2019-04-22
83+
image: lampepfl/dotty:2019-08-22
8484
depends_on:
8585
- test
8686
- test_bootstrapped
@@ -99,7 +99,7 @@ steps:
9999

100100
- name: publish_nightly
101101
pull: default
102-
image: lampepfl/dotty:2019-04-22
102+
image: lampepfl/dotty:2019-08-22
103103
depends_on:
104104
- test
105105
- test_bootstrapped
@@ -126,7 +126,7 @@ steps:
126126

127127
- name: publish_release
128128
pull: default
129-
image: lampepfl/dotty:2019-04-22
129+
image: lampepfl/dotty:2019-08-22
130130
depends_on:
131131
- test
132132
- test_bootstrapped
@@ -169,7 +169,7 @@ steps:
169169

170170
- name: publish_sbt_release
171171
pull: default
172-
image: lampepfl/dotty:2019-04-22
172+
image: lampepfl/dotty:2019-08-22
173173
depends_on:
174174
- test
175175
- test_bootstrapped

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
url = https://github.com/dotty-staging/sourcecode
4040
[submodule "community-build/community-projects/scala-xml"]
4141
path = community-build/community-projects/scala-xml
42-
url = https://github.com/scala/scala-xml
42+
url = https://github.com/dotty-staging/scala-xml
4343
[submodule "community-build/community-projects/shapeless"]
4444
path = community-build/community-projects/shapeless
4545
url = https://github.com/milessabin/shapeless

bench/src/main/scala/Benchmarks.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import org.openjdk.jmh.results.format._
1313
import java.util.concurrent.TimeUnit
1414

1515
import java.io.{File, FileOutputStream, BufferedWriter, FileWriter}
16-
import scala.collection.JavaConversions._
16+
import scala.collection.JavaConverters._
1717
import scala.io.Source
1818

1919
object Bench {
@@ -86,7 +86,7 @@ class CompilerOptions {
8686

8787
@Setup
8888
def prepare: Unit = {
89-
opts = Bench.readCompileOptions.to[Array]
89+
opts = Bench.readCompileOptions.toArray
9090
}
9191
}
9292

Submodule ScalaPB updated 382 files
Submodule algebra updated 34 files
Submodule fastparse updated 211 files
Submodule minitest updated 37 files

0 commit comments

Comments
 (0)