From e162008eba95cf3fd31ef965e3b2f4cfa9c39049 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 24 Aug 2021 22:42:06 +0200 Subject: [PATCH 01/14] Update scalapb-json4s to 0.12.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b787c50d..4485aeaf 100644 --- a/build.sbt +++ b/build.sbt @@ -184,7 +184,7 @@ lazy val cli = project } }, libraryDependencies ++= List( - "com.thesamet.scalapb" %% "scalapb-json4s" % "0.11.1", + "com.thesamet.scalapb" %% "scalapb-json4s" % "0.12.0", "com.github.alexarchambault" %% "case-app" % "2.0.0-M9", "com.github.pathikrit" %% "better-files" % "3.9.1" ), From 06d3b1e86b048471b5fba2d1e37bf6116d224195 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 20 Sep 2021 19:34:46 +0200 Subject: [PATCH 02/14] Update scala to 2.12.15 --- .github/workflows/launchers.yml | 1 + native/build.sc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml index 1bc9e321..2e34d195 100644 --- a/.github/workflows/launchers.yml +++ b/.github/workflows/launchers.yml @@ -19,6 +19,7 @@ jobs: - 2.12.12 - 2.12.13 - 2.12.14 + - 2.12.15 - 2.13.1 - 2.13.2 - 2.13.3 diff --git a/native/build.sc b/native/build.sc index e99be303..2d4b7f30 100644 --- a/native/build.sc +++ b/native/build.sc @@ -11,7 +11,7 @@ import mill._ import scala.util.Properties -def scala212Versions = (8 to 14).map("2.12." + _) +def scala212Versions = (8 to 15).map("2.12." + _) def scala213Versions = (1 to 6).map("2.13." + _) def scalaVersions = scala212Versions ++ scala213Versions From a28eef9f5269127d7265d8dce01e269f6291a1fb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 Sep 2021 22:57:19 +0200 Subject: [PATCH 03/14] Update scala-library to 2.12.15 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b787c50d..6bc4b540 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ import sbtcrossproject.{crossProject, CrossType} lazy val Version = new { def scala213 = "2.13.6" - def scala212 = "2.12.14" + def scala212 = "2.12.15" def scalameta = "4.4.24" } From c93be96ad592d4abf8f3013ed110f228ab57fe2b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 Sep 2021 22:57:23 +0200 Subject: [PATCH 04/14] Update mtags to 0.10.7 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index b787c50d..aa97ceae 100644 --- a/build.sbt +++ b/build.sbt @@ -101,7 +101,7 @@ lazy val server = project "org.slf4j" % "slf4j-api" % "1.8.0-beta4", "org.jboss.xnio" % "xnio-nio" % "3.8.0.Final", "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, - ("org.scalameta" %% "mtags" % "0.10.5").cross(CrossVersion.full) + ("org.scalameta" %% "mtags" % "0.10.7").cross(CrossVersion.full) ), (Compile / packageBin) := { import java.io.FileOutputStream From d711ce784573f2e7a816337b8b5f5e4f9629ecc9 Mon Sep 17 00:00:00 2001 From: Tomasz Godzik Date: Fri, 24 Sep 2021 10:44:49 +0200 Subject: [PATCH 05/14] Update scalameta and scalajs --- .github/workflows/ci.yml | 2 +- build.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0c65dbd3..73ecc4b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - scala: [2.12.10] + scala: [2.12.15] os: [ubuntu-latest] java: [11, 8] steps: diff --git a/build.sbt b/build.sbt index 55202c3c..240dd746 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ import sbtcrossproject.{crossProject, CrossType} lazy val Version = new { def scala213 = "2.13.6" def scala212 = "2.12.15" - def scalameta = "4.4.24" + def scalameta = "4.4.28" } inThisBuild( diff --git a/project/plugins.sbt b/project/plugins.sbt index 20b0f82d..27f5f7d2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.4") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3") From 20d9ee5349d0aed3bb9057a988924025ec0f5d0d Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sat, 9 Oct 2021 16:37:05 +0200 Subject: [PATCH 06/14] Publish server and cli modules with full cross version suffix So that downstream users don't risk running into class path issues because of a mismatch between the Scala version used by metabrowse and theirs. --- .github/workflows/ci.yml | 13 +++++++++++++ build.sbt | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73ecc4b8..f47c4eeb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,19 @@ on: - main pull_request: jobs: + compile: + name: Compile + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: true + - uses: olafurpg/setup-scala@v12 + with: + java-version: "adopt@1.8" + - run: sbt +test:compile # ensuring metabrowse compiles for all Scala versions + unit: name: Tests runs-on: ${{ matrix.os }} diff --git a/build.sbt b/build.sbt index 240dd746..adca1a45 100644 --- a/build.sbt +++ b/build.sbt @@ -3,8 +3,10 @@ import scalajsbundler.util.JSON._ import sbtcrossproject.{crossProject, CrossType} lazy val Version = new { - def scala213 = "2.13.6" - def scala212 = "2.12.15" + val scala213Versions = (0 to 6).map(p => s"2.13.$p") + val scala212Versions = (8 to 15).map(p => s"2.12.$p") + def scala213 = scala213Versions.last + def scala212 = scala212Versions.last def scalameta = "4.4.28" } @@ -51,6 +53,11 @@ inThisBuild( (publish / skip) := true crossScalaVersions := Nil +lazy val fullCrossVersionSettings = Def.settings( + crossVersion := CrossVersion.full, + crossScalaVersions := Version.scala213Versions ++ Version.scala212Versions +) + def addPaigesLikeSourceDirs(config: Configuration, srcName: String) = Def.settings( config / unmanagedSourceDirectories ++= { @@ -94,6 +101,7 @@ lazy val server = project .in(file("metabrowse-server")) .settings( moduleName := "metabrowse-server", + fullCrossVersionSettings, resolvers += Resolver.sonatypeRepo("releases"), resolvers += Resolver.sonatypeRepo("snapshots"), libraryDependencies ++= List( @@ -173,6 +181,7 @@ lazy val cli = project .in(file("metabrowse-cli")) .settings( moduleName := "metabrowse-cli", + fullCrossVersionSettings, (assembly / mainClass) := Some("metabrowse.cli.MetabrowseCli"), (assembly / assemblyJarName) := "metabrowse.jar", scalacOptions ++= { @@ -317,6 +326,7 @@ lazy val tests = project .in(file("metabrowse-tests")) .configs(IntegrationTest) .settings( + fullCrossVersionSettings, (publish / skip) := true, Defaults.itSettings, run / baseDirectory := (ThisBuild / baseDirectory).value, From a284985c8a025503fbcab674c6c87a3cb8fca293 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sat, 9 Oct 2021 17:25:58 +0200 Subject: [PATCH 07/14] Fix 2.13 tests --- .../scala/metabrowse/tests/MetabrowseCliSuite.scala | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/metabrowse-tests/src/test/scala/metabrowse/tests/MetabrowseCliSuite.scala b/metabrowse-tests/src/test/scala/metabrowse/tests/MetabrowseCliSuite.scala index b6d1e525..2ada954c 100644 --- a/metabrowse-tests/src/test/scala/metabrowse/tests/MetabrowseCliSuite.scala +++ b/metabrowse-tests/src/test/scala/metabrowse/tests/MetabrowseCliSuite.scala @@ -51,12 +51,18 @@ class MetabrowseCliSuite extends BaseMetabrowseCliSuite { } .sorted .mkString("\n") - val extra = + val extraLazyListStuff = if (is212) """org/typelevel/paiges/ScalaVersionCompat.LazyList# |org/typelevel/paiges/ScalaVersionCompat.LazyList. |""".stripMargin else "" + val extraPi213Stuff = + if (is212) "" + else + """org/typelevel/paiges/ColorTest#TwoPi. + |org/typelevel/paiges/ColorTest#TwoThirdsPi. + |""".stripMargin val expected = s"""|org/typelevel/paiges/Chunk. |org/typelevel/paiges/Chunk.best(). @@ -66,7 +72,7 @@ class MetabrowseCliSuite extends BaseMetabrowseCliSuite { |org/typelevel/paiges/Chunk.makeIndentStr(). |org/typelevel/paiges/ColorTest# |org/typelevel/paiges/ColorTest#Quote. - |org/typelevel/paiges/ColorTest#``(). + |${extraPi213Stuff}org/typelevel/paiges/ColorTest#``(). |org/typelevel/paiges/ColorTest#bg(). |org/typelevel/paiges/ColorTest#fg(). |org/typelevel/paiges/ColorTest#fromAngle(). @@ -317,7 +323,7 @@ class MetabrowseCliSuite extends BaseMetabrowseCliSuite { |org/typelevel/paiges/PaigesTest.slowRenderTrim(). |org/typelevel/paiges/PaigesTest.twoRightAssociated(). |org/typelevel/paiges/ScalaVersionCompat. - |${extra}org/typelevel/paiges/ScalaVersionCompat.lazyListFromIterator(). + |${extraLazyListStuff}org/typelevel/paiges/ScalaVersionCompat.lazyListFromIterator(). |org/typelevel/paiges/Style# |org/typelevel/paiges/Style#`++`(). |org/typelevel/paiges/Style#``(). From 287e20a532c507c616a5354ae8857ad56f9f61d6 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Sat, 9 Oct 2021 17:02:46 +0200 Subject: [PATCH 08/14] Run tests for 2.13.6 too --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f47c4eeb..9e74efb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - scala: [2.12.15] + scala: [2.12.15, 2.13.6] os: [ubuntu-latest] java: [11, 8] steps: From a5a5f4dbb6659b17f5be1fe2b20f6d553af0d4c3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 23 Nov 2021 01:15:50 +0100 Subject: [PATCH 09/14] Update mtags to 0.10.9 --- build.sbt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index adca1a45..89b78e04 100644 --- a/build.sbt +++ b/build.sbt @@ -109,7 +109,7 @@ lazy val server = project "org.slf4j" % "slf4j-api" % "1.8.0-beta4", "org.jboss.xnio" % "xnio-nio" % "3.8.0.Final", "org.scalameta" % "semanticdb-scalac-core" % Version.scalameta cross CrossVersion.full, - ("org.scalameta" %% "mtags" % "0.10.7").cross(CrossVersion.full) + ("org.scalameta" %% "mtags" % "0.10.9").cross(CrossVersion.full) ), (Compile / packageBin) := { import java.io.FileOutputStream @@ -118,7 +118,8 @@ lazy val server = project import java.util.zip._ import scala.collection.JavaConverters._ val base = (Compile / packageBin).value - val updated = base.getParentFile / s"${base.getName.stripSuffix(".jar")}-with-resources.jar" + val updated = + base.getParentFile / s"${base.getName.stripSuffix(".jar")}-with-resources.jar" val fos = new FileOutputStream(updated) val zos = new ZipOutputStream(fos) From 04c21ffbbe3a27f4cff17bb6b56089e0ca3a3a1d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 23 Nov 2021 01:16:11 +0100 Subject: [PATCH 10/14] Update scalameta, semanticdb-scalac, ... to 4.4.30 --- build.sbt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index adca1a45..e25cdf2a 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ lazy val Version = new { val scala212Versions = (8 to 15).map(p => s"2.12.$p") def scala213 = scala213Versions.last def scala212 = scala212Versions.last - def scalameta = "4.4.28" + def scalameta = "4.4.30" } inThisBuild( @@ -118,7 +118,8 @@ lazy val server = project import java.util.zip._ import scala.collection.JavaConverters._ val base = (Compile / packageBin).value - val updated = base.getParentFile / s"${base.getName.stripSuffix(".jar")}-with-resources.jar" + val updated = + base.getParentFile / s"${base.getName.stripSuffix(".jar")}-with-resources.jar" val fos = new FileOutputStream(updated) val zos = new ZipOutputStream(fos) From d1aad9e64422a8f23dbd806c4b22b072f4a95144 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 Dec 2021 02:42:37 +0100 Subject: [PATCH 11/14] Update sbt-protoc to 1.0.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 27f5f7d2..46710e1f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.20.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0") -addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.4") +addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.5") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3") From 9619d47c90c610460ce18986da4eca77f052af71 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 23 Dec 2021 02:43:34 +0100 Subject: [PATCH 12/14] Update scalameta, semanticdb-scalac, ... to 4.4.31 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 8af27837..56406d9d 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ lazy val Version = new { val scala212Versions = (8 to 15).map(p => s"2.12.$p") def scala213 = scala213Versions.last def scala212 = scala212Versions.last - def scalameta = "4.4.30" + def scalameta = "4.4.31" } inThisBuild( From ff15a66c6aefb3ba144357951ec94c0eb42efaf6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 22 Jan 2022 02:54:54 +0100 Subject: [PATCH 13/14] Update scalameta, semanticdb-scalac, ... to 4.4.33 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 56406d9d..15d4a6f5 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ lazy val Version = new { val scala212Versions = (8 to 15).map(p => s"2.12.$p") def scala213 = scala213Versions.last def scala212 = scala212Versions.last - def scalameta = "4.4.31" + def scalameta = "4.4.33" } inThisBuild( From 4ed3e1629708f885af77a1e473b0abce8512f230 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 27 Jul 2022 14:04:45 +0200 Subject: [PATCH 14/14] Back to master branch --- .github/workflows/launchers.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml index 2e34d195..6c7d59a8 100644 --- a/.github/workflows/launchers.yml +++ b/.github/workflows/launchers.yml @@ -2,8 +2,7 @@ name: Launchers on: push: branches: - - main - - server-bin + - master pull_request: jobs: generate-launchers: