Skip to content

Upgrade to scala-library 2.13.1 #7263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ steps:

- name: test
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on: [ clone ]
commands:
- cp -R . /tmp/1/ && cd /tmp/1/
Expand All @@ -36,7 +36,7 @@ steps:

- name: test_bootstrapped
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on: [ clone ]
commands:
- cp -R . /tmp/2/ && cd /tmp/2/
Expand All @@ -45,7 +45,7 @@ steps:

- name: community_build
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on: [ clone ]
commands:
- cp -R . /tmp/3/ && cd /tmp/3/
Expand All @@ -55,7 +55,7 @@ steps:

- name: test_sbt
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on: [ clone ]
commands:
- cp -R . /tmp/4/ && cd /tmp/4/
Expand All @@ -67,7 +67,7 @@ steps:

- name: test_java11
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on: [ clone ]
commands:
- export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
Expand All @@ -81,7 +81,7 @@ steps:

- name: documentation
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on:
- test
- test_bootstrapped
Expand All @@ -100,7 +100,7 @@ steps:

- name: publish_nightly
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on:
- test
- test_bootstrapped
Expand All @@ -127,7 +127,7 @@ steps:

- name: publish_release
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on:
- test
- test_bootstrapped
Expand Down Expand Up @@ -170,7 +170,7 @@ steps:

- name: publish_sbt_release
pull: default
image: lampepfl/dotty:2019-09-10
image: lampepfl/dotty:2019-09-19
depends_on:
- test
- test_bootstrapped
Expand Down
5 changes: 1 addition & 4 deletions compiler/src/dotty/tools/dotc/ast/Trees.scala
Original file line number Diff line number Diff line change
Expand Up @@ -362,16 +362,13 @@ object Trees {
val nameStart =
if (point != span.start) point
else {
// Use an immutable ArraySeq to work around https://github.com/scala/bug/issues/11708
val content = collection.immutable.ArraySeq.unsafeWrapArray(source.content())

// Point might be too far away from start to be recorded. In this case we fall back to scanning
// forwards from the start offset for the name.
// Note: This might be inaccurate since scanning might hit accidentally the same
// name (e.g. in a comment) before finding the real definition.
// To make this behavior more robust we'd have to change the trees for definitions to contain
// a fully positioned Ident in place of a name.
val idx = content.indexOfSlice(realName, point)
val idx = source.content().indexOfSlice(realName, point)
if (idx >= 0) idx
else point // use `point` anyway. This is important if no source exists so scanning fails
}
Expand Down
6 changes: 3 additions & 3 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import java.io.File
import java.nio.file._

import Modes._
import com.typesafe.sbt.pgp.PgpKeys
import com.jsuereth.sbtpgp.PgpKeys
import sbt.Keys._
import sbt._
import complete.DefaultParsers._
Expand Down Expand Up @@ -77,8 +77,8 @@ object Build {
* scala-library.
*/
def stdlibVersion(implicit mode: Mode): String = mode match {
case NonBootstrapped => "2.13.0"
case Bootstrapped => "2.13.0"
case NonBootstrapped => "2.13.1"
case Bootstrapped => "2.13.1"
}

val dottyOrganization = "ch.epfl.lamp"
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M8")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.6")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0")

addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.10.1")

Expand Down
File renamed without changes.