From 2ba130a58062d96199ee2c048f6453c9992a42c1 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 19 Sep 2019 13:31:02 +0200 Subject: [PATCH 1/3] Upgrade to scala-library 2.13.1 This allows us to revert 3d13696b48f616d4eeda6df9061e0f5a5b9b988e and 71a022c1d13262995d5e117fd64f22a931d70776. --- compiler/src/dotty/tools/dotc/ast/Trees.scala | 5 +---- project/Build.scala | 4 ++-- tests/{disabled => }/run/matchonstream.scala | 0 3 files changed, 3 insertions(+), 6 deletions(-) rename tests/{disabled => }/run/matchonstream.scala (100%) diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala index a52ed768d63c..5df9e1d0bc3e 100644 --- a/compiler/src/dotty/tools/dotc/ast/Trees.scala +++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala @@ -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 } diff --git a/project/Build.scala b/project/Build.scala index d13fbab70ba7..fbb43d4e2f4d 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -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" diff --git a/tests/disabled/run/matchonstream.scala b/tests/run/matchonstream.scala similarity index 100% rename from tests/disabled/run/matchonstream.scala rename to tests/run/matchonstream.scala From 0f06ad45030bf8c97c2328b67dd12294ffd6e054 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 19 Sep 2019 13:33:38 +0200 Subject: [PATCH 2/3] Upgrade sbt-pgp to 2.0.0 --- project/Build.scala | 2 +- project/plugins.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index fbb43d4e2f4d..28c4e9380ccb 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -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._ diff --git a/project/plugins.sbt b/project/plugins.sbt index d647080d7e75..b95473016f71 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") From 09f014d417e6fa2b7f95c2f9a03b243bd229cc45 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Thu, 19 Sep 2019 14:12:49 +0200 Subject: [PATCH 3/3] .drone.yml: Update CI cache --- .drone.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index f1ccdace55a9..253af05d6679 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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/ @@ -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/ @@ -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/ @@ -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/ @@ -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" @@ -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 @@ -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 @@ -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 @@ -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