From f984dd695021f1acebbb59953d07022e85b2c68e Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:04:38 +0200 Subject: [PATCH 01/17] Update sbt-assembly to 2.2.0 (#488) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8f3dd576..13e0567d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") From 46d4b5d4a05fd51ea2822b3244e022e56add9cd3 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:04:55 +0200 Subject: [PATCH 02/17] Update compilerplugin, scalapb-runtime to 0.11.17 (#489) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 13e0567d..aadf351e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,6 +8,6 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") libraryDependencies ++= List( "io.github.bonigarcia" % "webdrivermanager" % "5.8.0", - "com.thesamet.scalapb" %% "compilerplugin" % "0.11.15", + "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17", "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value ) From eb89acc41bdcd04cf3a4bb33b932185dd74adf53 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:05:04 +0200 Subject: [PATCH 03/17] Update scalacheck to 1.18.0 (#490) --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index e949e801..ee411c26 100644 --- a/build.sbt +++ b/build.sbt @@ -106,7 +106,7 @@ lazy val example = project ), libraryDependencies ++= List( "org.scalatest" %% "scalatest" % "3.2.18" % Test, - "org.scalacheck" %% "scalacheck" % "1.17.1" % Test, + "org.scalacheck" %% "scalacheck" % "1.18.0" % Test, "org.scalatestplus" %% "scalacheck-1-17" % "3.2.18.0" % Test ), test := {} // no need to run paiges tests. @@ -358,7 +358,7 @@ lazy val tests = project "org.scalameta" %% "testkit" % Version.scalameta, "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, "org.scalatest" %% "scalatest" % "3.2.18", - "org.scalacheck" %% "scalacheck" % "1.17.1", + "org.scalacheck" %% "scalacheck" % "1.18.0", "org.seleniumhq.selenium" % "selenium-java" % "4.21.0" % IntegrationTest, "org.slf4j" % "slf4j-simple" % "2.0.13" ), From fef5140e6c3f66cb211324cbed3f5d50a209d0f4 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:07:05 +0200 Subject: [PATCH 04/17] Update mtags to 1.3.5 (#502) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ee411c26..f196692d 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,7 @@ lazy val Version = new { def scala213 = scala213Versions.last def scala212 = scala212Versions.last - def mtags = "1.3.2" + def mtags = "1.3.5" // Important: this should be the exact same version as the one mtags pulls, as mtags uses some scalameta internal APIs, // and binary compatibility of these APIs isn't guaranteed. // Get this version with a command like 'cs resolve org.scalameta:mtags_2.13.14:1.3.1 | grep org.scalameta:scalameta' From ca6d33c11fc11fd6a7603e0d3d1383b3b65b3039 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:18:54 +0200 Subject: [PATCH 05/17] Update webdrivermanager to 5.9.2 (#499) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index aadf351e..3ff30ee6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,7 +7,7 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") libraryDependencies ++= List( - "io.github.bonigarcia" % "webdrivermanager" % "5.8.0", + "io.github.bonigarcia" % "webdrivermanager" % "5.9.2", "com.thesamet.scalapb" %% "compilerplugin" % "0.11.17", "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value ) From 0e826e790b9f1707f79bdf61505161b398f1a2fc Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:19:09 +0200 Subject: [PATCH 06/17] Update scalatest to 3.2.19 (#493) --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index f196692d..923bf009 100644 --- a/build.sbt +++ b/build.sbt @@ -105,7 +105,7 @@ lazy val example = project "-Xplugin-require:semanticdb" ), libraryDependencies ++= List( - "org.scalatest" %% "scalatest" % "3.2.18" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test, "org.scalacheck" %% "scalacheck" % "1.18.0" % Test, "org.scalatestplus" %% "scalacheck-1-17" % "3.2.18.0" % Test ), @@ -247,7 +247,7 @@ lazy val js = project webpackConfigFile := Some(baseDirectory.value / "webpack.config.js"), libraryDependencies ++= Seq( "org.scala-js" %%% "scalajs-dom" % "0.9.8", - "org.scalatest" %%% "scalatest" % "3.2.18" % Test + "org.scalatest" %%% "scalatest" % "3.2.19" % Test ), (Compile / npmDevDependencies) ++= Seq( "clean-webpack-plugin" -> "3.0.0", @@ -357,7 +357,7 @@ lazy val tests = project libraryDependencies ++= List( "org.scalameta" %% "testkit" % Version.scalameta, "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, - "org.scalatest" %% "scalatest" % "3.2.18", + "org.scalatest" %% "scalatest" % "3.2.19", "org.scalacheck" %% "scalacheck" % "1.18.0", "org.seleniumhq.selenium" % "selenium-java" % "4.21.0" % IntegrationTest, "org.slf4j" % "slf4j-simple" % "2.0.13" From fc9fbc9c00f64f8e5a460f35c9a11a30c5da87d9 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:19:37 +0200 Subject: [PATCH 07/17] Update selenium-java to 4.23.0 (#498) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 923bf009..eae1c8f5 100644 --- a/build.sbt +++ b/build.sbt @@ -359,7 +359,7 @@ lazy val tests = project "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, "org.scalatest" %% "scalatest" % "3.2.19", "org.scalacheck" %% "scalacheck" % "1.18.0", - "org.seleniumhq.selenium" % "selenium-java" % "4.21.0" % IntegrationTest, + "org.seleniumhq.selenium" % "selenium-java" % "4.23.0" % IntegrationTest, "org.slf4j" % "slf4j-simple" % "2.0.13" ), (IntegrationTest / compile) := { From 8f4be1ffe0c900cb9e0d648c06dd4f2225575680 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:08:54 +0200 Subject: [PATCH 08/17] Update sbt-ci-release to 1.6.1 (#507) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3ff30ee6..8b6ad948 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") libraryDependencies ++= List( "io.github.bonigarcia" % "webdrivermanager" % "5.9.2", From c6b7499ec473dfe31fc4a0cce5fed4d374a0cc6a Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:09:03 +0200 Subject: [PATCH 09/17] Update slf4j-api, slf4j-simple to 2.0.16 (#505) --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index eae1c8f5..841fb9c2 100644 --- a/build.sbt +++ b/build.sbt @@ -121,7 +121,7 @@ lazy val server = project resolvers += Resolver.sonatypeRepo("snapshots"), libraryDependencies ++= List( "io.undertow" % "undertow-core" % "2.0.30.Final", - "org.slf4j" % "slf4j-api" % "2.0.13", + "org.slf4j" % "slf4j-api" % "2.0.16", "org.jboss.xnio" % "xnio-nio" % "3.8.0.Final", "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, ("org.scalameta" %% "mtags" % Version.mtags).cross(CrossVersion.full) @@ -360,7 +360,7 @@ lazy val tests = project "org.scalatest" %% "scalatest" % "3.2.19", "org.scalacheck" %% "scalacheck" % "1.18.0", "org.seleniumhq.selenium" % "selenium-java" % "4.23.0" % IntegrationTest, - "org.slf4j" % "slf4j-simple" % "2.0.13" + "org.slf4j" % "slf4j-simple" % "2.0.16" ), (IntegrationTest / compile) := { _root_.io.github.bonigarcia.wdm.WebDriverManager.chromedriver.setup() From 1effb3f314792621e51517ea96337bcbca073241 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:20:48 +0100 Subject: [PATCH 10/17] Update sbt-buildinfo to 0.13.0 (#518) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 8b6ad948..7515f3d3 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") From b8e3a7343325e5226f9db5a37e73f2b358fa03b3 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:21:02 +0100 Subject: [PATCH 11/17] Update sbt-ci-release to 1.9.0 (#516) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7515f3d3..9d64780d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") libraryDependencies ++= List( "io.github.bonigarcia" % "webdrivermanager" % "5.9.2", From d8a15b8dffede4ca422384cfbeb4629197dceaf3 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:21:58 +0100 Subject: [PATCH 12/17] Update scalacheck to 1.18.1 (#510) --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 841fb9c2..9bd9e89e 100644 --- a/build.sbt +++ b/build.sbt @@ -106,7 +106,7 @@ lazy val example = project ), libraryDependencies ++= List( "org.scalatest" %% "scalatest" % "3.2.19" % Test, - "org.scalacheck" %% "scalacheck" % "1.18.0" % Test, + "org.scalacheck" %% "scalacheck" % "1.18.1" % Test, "org.scalatestplus" %% "scalacheck-1-17" % "3.2.18.0" % Test ), test := {} // no need to run paiges tests. @@ -358,7 +358,7 @@ lazy val tests = project "org.scalameta" %% "testkit" % Version.scalameta, "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, "org.scalatest" %% "scalatest" % "3.2.19", - "org.scalacheck" %% "scalacheck" % "1.18.0", + "org.scalacheck" %% "scalacheck" % "1.18.1", "org.seleniumhq.selenium" % "selenium-java" % "4.23.0" % IntegrationTest, "org.slf4j" % "slf4j-simple" % "2.0.16" ), From 5fb17427de2f8900dec4649bb4c1faf6cb3eccc4 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:27:29 +0100 Subject: [PATCH 13/17] Update sbt-assembly to 2.3.0 (#512) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9d64780d..65048794 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.7") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") From ad41371181b0ed3723a7790b44e34dcd28edb453 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:28:34 +0100 Subject: [PATCH 14/17] Update selenium-java to 4.23.1 (#504) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9bd9e89e..220b75d0 100644 --- a/build.sbt +++ b/build.sbt @@ -359,7 +359,7 @@ lazy val tests = project "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, "org.scalatest" %% "scalatest" % "3.2.19", "org.scalacheck" %% "scalacheck" % "1.18.1", - "org.seleniumhq.selenium" % "selenium-java" % "4.23.0" % IntegrationTest, + "org.seleniumhq.selenium" % "selenium-java" % "4.23.1" % IntegrationTest, "org.slf4j" % "slf4j-simple" % "2.0.16" ), (IntegrationTest / compile) := { From d2b554ec96df629c29df270ea242b8f33487b73a Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 4 Nov 2024 14:28:48 +0100 Subject: [PATCH 15/17] Use os-lib to handle incoming paths (#482) This is also more secure, ensuring these do not contain '..' parts --- build.sbt | 3 +- .../metabrowse/server/MetabrowseServer.scala | 44 +++++++++++-------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/build.sbt b/build.sbt index 220b75d0..66380b98 100644 --- a/build.sbt +++ b/build.sbt @@ -124,7 +124,8 @@ lazy val server = project "org.slf4j" % "slf4j-api" % "2.0.16", "org.jboss.xnio" % "xnio-nio" % "3.8.0.Final", "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, - ("org.scalameta" %% "mtags" % Version.mtags).cross(CrossVersion.full) + ("org.scalameta" %% "mtags" % Version.mtags).cross(CrossVersion.full), + "com.lihaoyi" %% "os-lib" % "0.10.1" ), (Compile / packageBin) := { import java.io.FileOutputStream diff --git a/metabrowse-server/src/main/scala/metabrowse/server/MetabrowseServer.scala b/metabrowse-server/src/main/scala/metabrowse/server/MetabrowseServer.scala index 23f0ca33..b089da96 100644 --- a/metabrowse-server/src/main/scala/metabrowse/server/MetabrowseServer.scala +++ b/metabrowse-server/src/main/scala/metabrowse/server/MetabrowseServer.scala @@ -232,10 +232,10 @@ class MetabrowseServer( .build() private def getBytes(exchange: HttpServerExchange): Array[Byte] = { - val path = exchange.getRequestPath.stripSuffix(".gz") - if (path.endsWith("index.workspace")) { + val path = os.SubPath("." + exchange.getRequestPath.stripSuffix(".gz")) + if (path.lastOpt.exists(_.endsWith("index.workspace"))) { getWorkspace.toByteArray - } else if (path.endsWith(".symbolindexes")) { + } else if (path.lastOpt.exists(_.endsWith(".symbolindexes"))) { val header = exchange.getRequestHeaders.get("Metabrowse-Symbol") if (header.isEmpty) { logger.error(s"no Metabrowse-Symbol header: $exchange") @@ -243,19 +243,19 @@ class MetabrowseServer( } else { getSymbol(header.getFirst).toByteArray } - } else if (path.endsWith(".semanticdb")) { + } else if (path.lastOpt.exists(_.endsWith(".semanticdb"))) { getSemanticdb(path).toByteArray - } else if (path.endsWith(".map")) { + } else if (path.lastOpt.exists(_.endsWith(".map"))) { // Ignore requests for sourcemaps. Array.emptyByteArray } else { - val actualPath = if (path == "/") "/index.html" else path + val actualPath = if (path == os.sub) os.sub / "index.html" else path withInputStream( Thread .currentThread() .getContextClassLoader .getResourceAsStream( - s"metabrowse/server/assets/${actualPath.stripPrefix("/")}" + (os.sub / "metabrowse" / "server" / "assets" / actualPath).toString ) ) { is => if (is == null) { @@ -301,27 +301,35 @@ class MetabrowseServer( Workspace(filenames.result().toSeq) } - private def getSemanticdb(filename: String): TextDocuments = { - val path = filename - .stripPrefix("/semanticdb/") - .stripPrefix("/") // optional '/' - .stripSuffix(".semanticdb") - logger.info(path) + private def getSemanticdb(subPath: os.SubPath): TextDocuments = { + val path = { + val subPath0 = + if (subPath.startsWith(os.sub / "semanticdb")) + subPath.relativeTo(os.sub / "semanticdb").asSubPath + else + subPath + subPath0.lastOpt match { + case Some(name) if name.endsWith(".semanticdb") => + subPath0 / os.up / name.stripSuffix(".semanticdb") + case _ => subPath0 + } + } + logger.info(path.toString) for { - text <- state.get().source(path).orElse { + text <- state.get().source(path.toString).orElse { logger.warn(s"no source file: $path") None } doc <- try { val timeout = TimeUnit.SECONDS.toMillis(10) - val textDocument = if (path.endsWith(".java")) { - val input = Input.VirtualFile(path, text) + val textDocument = if (path.lastOpt.exists(_.endsWith(".java"))) { + val input = Input.VirtualFile(path.toString, text) t.JavaMtags.index(input, includeMembers = true).index() } else { InteractiveSemanticdb.toTextDocument( global, text, - filename, + subPath.toString, timeout, List( "-P:semanticdb:synthetics:on", @@ -332,7 +340,7 @@ class MetabrowseServer( Some(textDocument) } catch { case NonFatal(e) => - logger.error(s"compile error: $filename", e) + logger.error(s"compile error: $subPath", e) None } } yield TextDocuments(List(doc.withText(text))) From 94373e4a8eb29cdb38100002cd04fbfb4c6d8054 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:31:58 +0100 Subject: [PATCH 16/17] Update scala-library to 2.12.20 (#508) Co-authored-by: Alex Archambault --- .github/workflows/ci.yml | 2 +- build.sbt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dbfb015e..a76705f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - scala: [2.12.19, 2.13.14] + scala: [2.12.20, 2.13.14] os: [ubuntu-latest] java: [11, 8] steps: diff --git a/build.sbt b/build.sbt index 66380b98..511008a8 100644 --- a/build.sbt +++ b/build.sbt @@ -13,7 +13,8 @@ lazy val Version = new { "2.12.16", "2.12.17", "2.12.18", - "2.12.19" + "2.12.19", + "2.12.20" ) def scala213 = scala213Versions.last def scala212 = scala212Versions.last From 52f4d0343cb82886b57fe72c1a91503de8f685b5 Mon Sep 17 00:00:00 2001 From: scalameta-bot <50175807+scalameta-bot@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:49:10 +0100 Subject: [PATCH 17/17] Update scala-library to 2.13.15 (#511) Co-authored-by: Alex Archambault --- .github/workflows/ci.yml | 2 +- build.sbt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a76705f5..6c9c593e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - scala: [2.12.20, 2.13.14] + scala: [2.12.20, 2.13.15] os: [ubuntu-latest] java: [11, 8] steps: diff --git a/build.sbt b/build.sbt index 511008a8..3774b80f 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,8 @@ lazy val Version = new { "2.13.11", "2.13.12", "2.13.13", - "2.13.14" + "2.13.14", + "2.13.15" ) val scala212Versions = Seq( "2.12.16",