Skip to content

Commit 37c849a

Browse files
committed
fix compilation for Scala 2.13.0-RC1
- BufferWrapper, argument type for patchInPlace updated
1 parent 7e3a3de commit 37c849a

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

build.sbt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ scalacOptions in ThisBuild ++= Seq("-deprecation", "-feature")
1010

1111
// Map[JvmMajorVersion, List[(ScalaVersion, UseForPublishing)]]
1212
scalaVersionsByJvm in ThisBuild := Map(
13-
8 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> true),
14-
9 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
15-
10 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
16-
11 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false),
17-
12 -> List("2.11.12", "2.12.8", "2.13.0-M5").map(_ -> false)
13+
8 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> true),
14+
9 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
15+
10 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
16+
11 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false),
17+
12 -> List("2.11.12", "2.12.8", "2.13.0-RC1").map(_ -> false)
1818
)
1919

20-
scalaVersion in ThisBuild := "2.13.0-M5" // for testing
20+
scalaVersion in ThisBuild := "2.13.0-RC1" // for testing
2121

2222
OsgiKeys.exportPackage := Seq(s"scala.swing.*;version=${version.value}")
2323

@@ -29,7 +29,7 @@ shellPrompt in ThisBuild := { state => Project.extract(state).currentRef.project
2929
lazy val swing = project.in(file("."))
3030
.settings(
3131
libraryDependencies += {
32-
"org.scalatest" %% "scalatest" % "3.0.7" % Test
32+
"org.scalatest" %% "scalatest" % "3.0.8-RC2" % Test
3333
},
3434
// Adds a `src/main/scala-2.13+` source directory for Scala 2.13 and newer
3535
// and a `src/main/scala-2.13-` source directory for Scala version older than 2.13

src/main/scala-2.13+/scala/swing/BufferWrapper.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,11 @@ abstract class BufferWrapper[A] extends mutable.Buffer[A] {
4848
}
4949
}
5050

51-
override def patchInPlace(from: Int, patch: scala.collection.Seq[A], replaced: Int): this.type = {
51+
override def patchInPlace(from: Int, patch: MoreElem[A], replaced: Int): this.type = {
5252
if (replaced > 0) {
5353
remove(from, replaced)
5454
}
55-
if (patch.nonEmpty) {
56-
insertAll(from, patch)
57-
}
55+
insertAll(from, patch)
5856
this
5957
}
6058
}

0 commit comments

Comments
 (0)