Skip to content

Commit 8f111ec

Browse files
tgodziktgodzik
authored
Merge pull request #2814 from scalacenter/update/scala-library-2.12.21
build(deps): Update scala-library from 2.12.20 to 2.12.21
2 parents 48dae6f + 62ac924 commit 8f111ec

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

‎backend/src/test/scala/bloop/DependencyResolutionSpec.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class DependencyResolutionSpec {
99
@Test
1010
def fallbackDownloadShouldDownloadSemanticdb(): Unit = {
1111
val logger = new RecordingLogger()
12-
val dep = coursierapi.Dependency.of("org.scalameta", "semanticdb-scalac_2.12.20", "4.13.5")
12+
val dep = coursierapi.Dependency.of("org.scalameta", "semanticdb-scalac_2.12.21", "4.14.0")
1313
val jars = DependencyResolution.fallbackDownload(dep, logger, resolveSources = false)
1414
assertTrue("No jars were downloaded by fallbackDownload", jars.nonEmpty)
1515
jars.foreach { jar =>
@@ -19,7 +19,7 @@ class DependencyResolutionSpec {
1919
@Test
2020
def fallbackDownloadShouldDownloadSemanticdbWithSources(): Unit = {
2121
val logger = new RecordingLogger()
22-
val dep = coursierapi.Dependency.of("org.scalameta", "semanticdb-scalac_2.12.20", "4.13.5")
22+
val dep = coursierapi.Dependency.of("org.scalameta", "semanticdb-scalac_2.12.21", "4.14.0")
2323
val jars = DependencyResolution.fallbackDownload(dep, logger, resolveSources = true)
2424
assertTrue("No jars were downloaded by fallbackDownload", jars.nonEmpty)
2525
jars.foreach { jar =>

‎frontend/src/test/resources/resources-test-project/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Dependencies._
22
Global / bloopConfigDir := baseDirectory.value / "bloop-config"
33

4-
ThisBuild / scalaVersion := "2.12.20"
4+
ThisBuild / scalaVersion := "2.12.21"
55
ThisBuild / version := "0.1.0-SNAPSHOT"
66
ThisBuild / organization := "com.example"
77
ThisBuild / organizationName := "example"

‎frontend/src/test/resources/scala-java-processorpath/build.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
bloopConfigDir in Global := baseDirectory.value / "bloop-config"
22

3-
ThisBuild / scalaVersion := "2.12.20"
3+
ThisBuild / scalaVersion := "2.12.21"
44
ThisBuild / version := "0.1.0-SNAPSHOT"
55
ThisBuild / organization := "com.example"
66
ThisBuild / organizationName := "example"

‎frontend/src/test/scala/bloop/BaseCompileSpec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ abstract class BaseCompileSpec extends bloop.testing.BaseSuite {
13161316
s"""|[E1] ${targetFoo}:1:15
13171317
| Unused import
13181318
| L1: import Predef.assert
1319-
| ^^^^^^^
1319+
| ^^^^^^
13201320
|""".stripMargin
13211321
)
13221322
assertDiagnosticsResult(

‎frontend/src/test/scala/bloop/bsp/BspCompileSpec.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class BspCompileSpec(
159159
| -> Msg: Compiling a (1 Scala source)
160160
| -> Data kind: compile-task
161161
|#1: a/src/Foo.scala
162-
| -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
162+
| -> List(Diagnostic(Range(Position(0,14),Position(0,20)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
163163
| -> reset = true
164164
| -> origin = test-origin
165165
|#1: task finish 1
@@ -680,7 +680,7 @@ class BspCompileSpec(
680680
| -> List(Diagnostic(Range(Position(3,6),Position(3,6)),Some(Error),Some(_),Some(_),x is already defined as value x,None,None,Some({"actions":[]})))
681681
| -> reset = true
682682
|#4: a/src/A.scala
683-
| -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
683+
| -> List(Diagnostic(Range(Position(0,21),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
684684
| -> reset = false
685685
|#4: task finish 4
686686
| -> errors 1, warnings 1, noop false
@@ -700,7 +700,7 @@ class BspCompileSpec(
700700
| -> Msg: Compiling a (1 Scala source)
701701
| -> Data kind: compile-task
702702
|#5: a/src/A.scala
703-
| -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
703+
| -> List(Diagnostic(Range(Position(0,21),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
704704
| -> reset = true
705705
|#5: task finish 5
706706
| -> errors 0, warnings 1, noop false
@@ -736,7 +736,7 @@ class BspCompileSpec(
736736
| -> Msg: Compiling a (1 Scala source)
737737
| -> Data kind: compile-task
738738
|#6: a/src/A.scala
739-
| -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
739+
| -> List(Diagnostic(Range(Position(0,21),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
740740
| -> reset = true
741741
|#6: a/src/A.scala
742742
| -> List(Diagnostic(Range(Position(1,0),Position(3,1)),Some(Error),Some(_),Some(_),object creation impossible, since value y in trait Base of type Int is not defined,None,None,Some({"actions":[]})))
@@ -760,7 +760,7 @@ class BspCompileSpec(
760760
| -> Msg: Compiling a (1 Scala source)
761761
| -> Data kind: compile-task
762762
|#7: a/src/A.scala
763-
| -> List(Diagnostic(Range(Position(0,0),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
763+
| -> List(Diagnostic(Range(Position(0,21),Position(0,26)),Some(Warning),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
764764
| -> reset = true
765765
|#7: task finish 7
766766
| -> errors 0, warnings 0, noop false
@@ -1231,7 +1231,7 @@ class BspCompileSpec(
12311231
| -> Msg: Compiling a (3 Scala sources)
12321232
| -> Data kind: compile-task
12331233
|#1: a/src/Foo.scala
1234-
| -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
1234+
| -> List(Diagnostic(Range(Position(0,14),Position(0,20)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
12351235
| -> reset = true
12361236
|#1: task finish 1
12371237
| -> errors 1, warnings 0, noop false
@@ -1287,10 +1287,10 @@ class BspCompileSpec(
12871287
| -> Msg: Compiling a (1 Scala source)
12881288
| -> Data kind: compile-task
12891289
|#3: a/src/Foo.scala
1290-
| -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
1290+
| -> List(Diagnostic(Range(Position(0,14),Position(0,20)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
12911291
| -> reset = true
12921292
|#3: a/src/Foo.scala
1293-
| -> List(Diagnostic(Range(Position(1,0),Position(1,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
1293+
| -> List(Diagnostic(Range(Position(1,14),Position(1,22)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
12941294
| -> reset = false
12951295
|#3: task finish 4
12961296
| -> errors 2, warnings 0, noop false
@@ -1305,7 +1305,7 @@ class BspCompileSpec(
13051305
| -> Msg: Compiling b (1 Scala source)
13061306
| -> Data kind: compile-task
13071307
|#3: b/src/Buzz.scala
1308-
| -> List(Diagnostic(Range(Position(0,0),Position(0,7)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
1308+
| -> List(Diagnostic(Range(Position(0,14),Position(0,20)),Some(Error),Some(_),Some(_),Unused import,None,None,Some({"actions":[]})))
13091309
| -> reset = true
13101310
|#3: task finish 5
13111311
| -> errors 1, warnings 0, noop false

‎project/Dependencies.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import sbt.Provided
66

77
object Dependencies {
88
val Scala211Version = "2.11.12"
9-
val Scala212Version = "2.12.20"
9+
val Scala212Version = "2.12.21"
1010
val Scala213Version = "2.13.18"
1111

1212
val SbtVersion = "1.5.8"
@@ -44,7 +44,7 @@ object Dependencies {
4444
val ztExecVersion = "1.12"
4545
val debugAdapterVersion = "4.2.8"
4646
val bloopConfigVersion = "2.3.3"
47-
val semanticdbVersion = "4.9.9"
47+
val semanticdbVersion = "4.14.0"
4848
val millVersion = "0.12.7"
4949
val zinc = "org.scala-sbt" %% "zinc" % zincVersion
5050
val bsp4s = "ch.epfl.scala" %% "bsp4s" % bspVersion

0 commit comments

Comments
 (0)