From bbc9f1bd797e3ee5460c96997250624d2076ddd9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 17 Apr 2024 21:50:41 -0700 Subject: [PATCH 01/46] reset version policy after 2.4.0 release --- build.sbt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 8811385a..23a5e180 100644 --- a/build.sbt +++ b/build.sbt @@ -3,9 +3,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), - // change back to BinaryAndSourceCompatible after next minor release; - // the Scala 3.2 -> 3.3 upgrade requires a minor version bump - versionPolicyIntention := Compatibility.BinaryCompatible, + versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.3"), scalaVersion := crossScalaVersions.value.head, ) From c0e03d99a19a94bc7cd2ff03cacd720fb9cc3024 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 6 May 2024 01:21:27 +0000 Subject: [PATCH 02/46] Update scala-library to 2.13.14 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 23a5e180..7371b101 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.3"), + crossScalaVersions := Seq("2.13.14", "2.12.19", "3.3.3"), scalaVersion := crossScalaVersions.value.head, ) From 56bd66cd9823b000b9d63f1fe7d66dfcfdca0115 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 8 May 2024 06:00:39 +0000 Subject: [PATCH 03/46] Update sbt to 1.10.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 04267b14..081fdbbc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 From 4603d6e6988e9f7f400ae2bd3875f66d8a2addc8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 6 Jun 2024 17:13:22 +0000 Subject: [PATCH 04/46] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index cab847c1..9a300da8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3") From 0043f2c615ae61cde160e1b7a36498a5cc52a7cf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 25 Jun 2024 02:47:40 +0000 Subject: [PATCH 05/46] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 9a300da8..66847df4 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.3") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4") From b3e36e05da3ebfff8887ffd5e205760c6872fe48 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Jul 2024 20:42:30 +0000 Subject: [PATCH 06/46] Update sbt to 1.10.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 081fdbbc..ee4c672c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 From 8597a8a439e220bf9d53d09b8f847fe7b0d1effb Mon Sep 17 00:00:00 2001 From: philippus Date: Thu, 8 Aug 2024 22:09:49 -0500 Subject: [PATCH 07/46] Skip version checks for scala.js --- build.sbt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.sbt b/build.sbt index 7371b101..85e93a5b 100644 --- a/build.sbt +++ b/build.sbt @@ -82,6 +82,8 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"), ) .jsSettings( + versionPolicyCheck / skip := true, + versionCheck / skip := true, // mystified why https://github.com/scala-js/scala-js/issues/635 would be rearing its head, // but only on sbt 1.4 + 2.13 and only in Test config?! WEIRD Test / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { From c2a90fe2fafef3f79ccc34e6bb5e3127d762d484 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 19 Aug 2024 19:53:49 +0000 Subject: [PATCH 08/46] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.5 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 66847df4..b761b908 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.4") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5") From 060bf910f655def0539362dc7e842d65dce2f097 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 16 Sep 2024 18:57:00 +0000 Subject: [PATCH 09/46] Update sbt to 1.10.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index ee4c672c..0b699c30 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 From 5e2d40660e7391c6db8c23cc0bd3bfbf911053c3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Sep 2024 18:09:05 +0000 Subject: [PATCH 10/46] Update scala-library to 2.12.20 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 85e93a5b..698c4135 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.14", "2.12.19", "3.3.3"), + crossScalaVersions := Seq("2.13.14", "2.12.20", "3.3.3"), scalaVersion := crossScalaVersions.value.head, ) From ced4b73f1e79b2252a63a1078bb10a6531e1965b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 26 Sep 2024 18:43:34 +0000 Subject: [PATCH 11/46] Update scala-library to 2.13.15 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 698c4135..20a7d205 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.14", "2.12.20", "3.3.3"), + crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.3"), scalaVersion := crossScalaVersions.value.head, ) From 0c0c247a73b205fe9070708ad7b2c2fedd223542 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 23:46:06 +0000 Subject: [PATCH 12/46] Update sbt-scalajs, scalajs-compiler, ... to 1.17.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b761b908..a8bbcd8f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5") From 5e5e6a8f6b67c1f8fd2de169bc826891e754c022 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 28 Sep 2024 23:46:08 +0000 Subject: [PATCH 13/46] Update scala3-library, ... to 3.3.4 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 698c4135..e8e8e981 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.14", "2.12.20", "3.3.3"), + crossScalaVersions := Seq("2.13.14", "2.12.20", "3.3.4"), scalaVersion := crossScalaVersions.value.head, ) From 80940d495091fbe0f3a21db80d24a91b71bc207f Mon Sep 17 00:00:00 2001 From: philippus Date: Sun, 29 Sep 2024 12:35:39 +0200 Subject: [PATCH 14/46] Silence infer any --- .../scala/util/parsing/combinator/lexical/StdLexical.scala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala b/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala index d5bdbdbf..a5f8a7ab 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala @@ -17,6 +17,7 @@ package lexical import token._ import input.CharArrayReader.EofCh +import scala.annotation.nowarn import scala.collection.mutable /** This component provides a standard lexical parser for a simple, @@ -54,6 +55,7 @@ class StdLexical extends Lexical with StdTokens { } // see `whitespace in `Scanners` + @nowarn("cat=lint-infer-any") def whitespace: Parser[Any] = rep[Any]( whitespaceChar | '/' ~ '*' ~ comment From 9b5cc10595a3b2142c1eec7638e37d1dbfa220eb Mon Sep 17 00:00:00 2001 From: philippus Date: Sun, 29 Sep 2024 12:36:35 +0200 Subject: [PATCH 15/46] Silence specific category --- .../scala/util/parsing/combinator/PackratParsersTest.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala index 3918b4f8..07df04ec 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala @@ -222,7 +222,7 @@ private object grammars3 extends StandardTokenParsers with PackratParsers { | success(Nil) ) - @annotation.nowarn // Some(xs) in pattern isn't exhaustive + @annotation.nowarn("cat=other-match-analysis") def repMany1[T](p: => Parser[T], q: => Parser[T]): Parser[List[T]] = p~opt(repMany(p,q))~q ^^ {case x~Some(xs)~y => x::xs:::(y::Nil)} From 88d238dd57972541775b1e0822e6aae0087bd49a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 20 Oct 2024 21:59:37 +0000 Subject: [PATCH 16/46] Update sbt-scala-module to 3.2.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a8bbcd8f..39bcc348 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.1.0") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") From 3c624463458536f32ef4fbbc4db749e805581cb8 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 20 Oct 2024 21:59:39 +0000 Subject: [PATCH 17/46] Update sbt, scripted-plugin to 1.10.3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 0b699c30..bc739060 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.3 From 5cfb1edfd3615a3bca4fe1f452e4b1544f2ab759 Mon Sep 17 00:00:00 2001 From: philippus Date: Mon, 21 Oct 2024 08:38:31 +0200 Subject: [PATCH 18/46] Enable SbtOsgi plugin --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 82eb198a..f17e661c 100644 --- a/build.sbt +++ b/build.sbt @@ -93,6 +93,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor // Scala.js cannot run forked tests Test / fork := false ) + .jvmEnablePlugins(SbtOsgi) .jsEnablePlugins(ScalaJSJUnitPlugin) .nativeEnablePlugins(ScalaNativeJUnitPlugin) .nativeSettings( From 9efbfcedd9182981758b77c46ec5ed6e673d7182 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 28 Oct 2024 19:38:45 +0000 Subject: [PATCH 19/46] Update sbt, scripted-plugin to 1.10.4 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index bc739060..09feeeed 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.3 +sbt.version=1.10.4 From 216c403044c125c1bacc8e4f74621b3009face96 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 6 Nov 2024 02:00:48 +0000 Subject: [PATCH 20/46] Update sbt, scripted-plugin to 1.10.5 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 09feeeed..db1723b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.4 +sbt.version=1.10.5 From 2e88b2dfafec6e76ce4ff6ff497a9d0fadcbb129 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 15 Nov 2024 20:55:34 +0000 Subject: [PATCH 21/46] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 39bcc348..d740d05b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") From 09faca984012866160ab74d5afa09c893089b79f Mon Sep 17 00:00:00 2001 From: philippus Date: Sat, 16 Nov 2024 09:46:46 +0100 Subject: [PATCH 22/46] Add build status badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 06a6b8c1..599df961 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # scala-parser-combinators +[![build](https://github.com/scala/scala-parser-combinators/workflows/test/badge.svg)](https://github.com/scala/scala-parser-combinators/actions/workflows/ci.yml?query=branch%3Amain) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.12) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.13) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_3) From 3af822b422d74062f7b806843042d0a0f1da261d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 2 Dec 2024 01:31:57 +0000 Subject: [PATCH 23/46] Update sbt, scripted-plugin to 1.10.6 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index db1723b0..e88a0d81 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6 From 320dad3cd8489386d0a353730668d91762760927 Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Mon, 16 Dec 2024 21:19:04 +0100 Subject: [PATCH 24/46] Add scala/cla-checker github action (#574) --- .github/workflows/cla.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/workflows/cla.yml diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml new file mode 100644 index 00000000..3549dedc --- /dev/null +++ b/.github/workflows/cla.yml @@ -0,0 +1,11 @@ +name: "Check Scala CLA" +on: + pull_request: +jobs: + cla-check: + runs-on: ubuntu-latest + steps: + - name: Verify CLA + uses: scala/cla-checker@v1 + with: + author: ${{ github.event.pull_request.user.login }} From 346e00be3036552cb3ba3e4e3236fdf66520b128 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Mon, 16 Dec 2024 12:19:37 -0800 Subject: [PATCH 25/46] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 599df961..ec4bc645 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_2.13) [](http://search.maven.org/#search%7Cga%7C1%7Cg%3Aorg.scala-lang.modules%20a%3Ascala-parser-combinators_3) -This was originally part of the Scala standard library, but is now community-maintained, under the guidance of the Scala team at Lightbend. If you are interested in joining the maintainers team, please contact [@Philippus](https://github.com/philippus) or [@SethTisue](https://github.com/SethTisue). +This was originally part of the Scala standard library, but is now community-maintained, under the guidance of the Scala team at Akka (formerly Lightbend). If you are interested in joining the maintainers team, please contact [@Philippus](https://github.com/philippus) or [@SethTisue](https://github.com/SethTisue). ## Choosing a parsing library From 17a025b54a3e823a9cb8e5c3fd848e68c4a87fb7 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 21 Dec 2024 21:25:26 +0000 Subject: [PATCH 26/46] Update sbt-scala-module to 3.2.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d740d05b..6b18534b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.0") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") From 552c89478951e09abf9e00936bec5540ec8ad3bd Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 22 Dec 2024 07:59:18 +0900 Subject: [PATCH 27/46] add sbt/setup-sbt action --- .github/workflows/ci.yml | 1 + .github/workflows/release.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de3aa010..a4eade85 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,5 +21,6 @@ jobs: with: distribution: temurin java-version: ${{matrix.java}} + - uses: sbt/setup-sbt@v1 - name: Test run: sbt ++${{matrix.scala}} test headerCheck versionPolicyCheck package diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 57aa9dd9..1e5360b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,7 @@ jobs: with: distribution: temurin java-version: 8 + - uses: sbt/setup-sbt@v1 - run: sbt versionCheck ci-release env: PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}} From 5e8352639b2417edebf179798e80cf8c54931609 Mon Sep 17 00:00:00 2001 From: philippus Date: Sun, 22 Dec 2024 11:07:22 +0100 Subject: [PATCH 28/46] Update headers and NOTICE for lightbend name change --- NOTICE | 4 ++-- .../main/scala/scala/util/parsing/input/PositionCache.scala | 2 +- .../main/scala/scala/util/parsing/input/PositionCache.scala | 2 +- .../main/scala/scala/util/parsing/input/PositionCache.scala | 2 +- .../util/parsing/input/ScalaVersionSpecificPagedSeq.scala | 2 +- .../util/parsing/input/ScalaVersionSpecificPagedSeq.scala | 2 +- .../scala/util/parsing/combinator/ImplicitConversions.scala | 2 +- .../scala/util/parsing/combinator/JavaTokenParsers.scala | 2 +- .../scala/scala/util/parsing/combinator/PackratParsers.scala | 2 +- .../main/scala/scala/util/parsing/combinator/Parsers.scala | 2 +- .../scala/scala/util/parsing/combinator/RegexParsers.scala | 2 +- .../scala/scala/util/parsing/combinator/SubSequence.scala | 2 +- .../scala/scala/util/parsing/combinator/lexical/Lexical.scala | 2 +- .../scala/util/parsing/combinator/lexical/Scanners.scala | 2 +- .../scala/util/parsing/combinator/lexical/StdLexical.scala | 2 +- .../parsing/combinator/syntactical/StandardTokenParsers.scala | 2 +- .../util/parsing/combinator/syntactical/StdTokenParsers.scala | 2 +- .../util/parsing/combinator/syntactical/TokenParsers.scala | 2 +- .../scala/scala/util/parsing/combinator/token/StdTokens.scala | 2 +- .../scala/scala/util/parsing/combinator/token/Tokens.scala | 2 +- .../main/scala/scala/util/parsing/input/CharArrayReader.scala | 2 +- .../scala/scala/util/parsing/input/CharSequenceReader.scala | 2 +- .../src/main/scala/scala/util/parsing/input/NoPosition.scala | 2 +- .../main/scala/scala/util/parsing/input/OffsetPosition.scala | 2 +- shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala | 2 +- .../main/scala/scala/util/parsing/input/PagedSeqReader.scala | 2 +- shared/src/main/scala/scala/util/parsing/input/Position.scala | 2 +- .../src/main/scala/scala/util/parsing/input/Positional.scala | 2 +- shared/src/main/scala/scala/util/parsing/input/Reader.scala | 2 +- .../main/scala/scala/util/parsing/input/StreamReader.scala | 2 +- .../scala/util/parsing/combinator/JavaTokenParsersTest.scala | 2 +- .../scala/util/parsing/combinator/PackratParsersTest.scala | 2 +- .../scala/util/parsing/combinator/RegexParsersTest.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/gh242.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/gh29.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/gh45.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/gh56.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/gh72.scala | 2 +- .../util/parsing/combinator/lexical/StdLexicalTest.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t0700.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t1100.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t1229.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t3212.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t4138.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t5514.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t5669.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t6067.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t6464.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t7483.scala | 2 +- .../src/test/scala/scala/util/parsing/combinator/t8879.scala | 2 +- .../scala/scala/util/parsing/input/OffsetPositionTest.scala | 2 +- shared/src/test/scala/scala/util/parsing/input/gh178.scala | 2 +- shared/src/test/scala/scala/util/parsing/input/gh64.scala | 2 +- 53 files changed, 54 insertions(+), 54 deletions(-) diff --git a/NOTICE b/NOTICE index 9810195d..8366af24 100644 --- a/NOTICE +++ b/NOTICE @@ -1,10 +1,10 @@ Scala parser combinators Copyright (c) 2002-2024 EPFL -Copyright (c) 2011-2024 Lightbend, Inc. +Copyright (c) 2011-2024 Lightbend, Inc. dba Akka Scala includes software developed at LAMP/EPFL (https://lamp.epfl.ch/) and -Lightbend, Inc. (https://www.lightbend.com/). +Akka (https://akka.io/). Licensed under the Apache License, Version 2.0 (the "License"). Unless required by applicable law or agreed to in writing, software diff --git a/js/src/main/scala/scala/util/parsing/input/PositionCache.scala b/js/src/main/scala/scala/util/parsing/input/PositionCache.scala index 35aedb66..af0be12e 100644 --- a/js/src/main/scala/scala/util/parsing/input/PositionCache.scala +++ b/js/src/main/scala/scala/util/parsing/input/PositionCache.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/jvm/src/main/scala/scala/util/parsing/input/PositionCache.scala b/jvm/src/main/scala/scala/util/parsing/input/PositionCache.scala index 5fccbd9d..ed8c60f2 100644 --- a/jvm/src/main/scala/scala/util/parsing/input/PositionCache.scala +++ b/jvm/src/main/scala/scala/util/parsing/input/PositionCache.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/native/src/main/scala/scala/util/parsing/input/PositionCache.scala b/native/src/main/scala/scala/util/parsing/input/PositionCache.scala index 818ab84f..c6da43c5 100644 --- a/native/src/main/scala/scala/util/parsing/input/PositionCache.scala +++ b/native/src/main/scala/scala/util/parsing/input/PositionCache.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala-2.13+/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala b/shared/src/main/scala-2.13+/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala index 77f90b08..752f2ed9 100644 --- a/shared/src/main/scala-2.13+/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala +++ b/shared/src/main/scala-2.13+/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala-2.13-/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala b/shared/src/main/scala-2.13-/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala index e40c006c..ed99fec0 100644 --- a/shared/src/main/scala-2.13-/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala +++ b/shared/src/main/scala-2.13-/scala/util/parsing/input/ScalaVersionSpecificPagedSeq.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/ImplicitConversions.scala b/shared/src/main/scala/scala/util/parsing/combinator/ImplicitConversions.scala index 3f852b6c..2a2ac0bc 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/ImplicitConversions.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/ImplicitConversions.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala index 70895645..b42580c2 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/JavaTokenParsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala index e7a1675b..b0423360 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala index 7b9ab5ef..e5c28b07 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala index 25c959a3..98972c09 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/RegexParsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/SubSequence.scala b/shared/src/main/scala/scala/util/parsing/combinator/SubSequence.scala index ea596512..21e5735a 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/SubSequence.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/SubSequence.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/lexical/Lexical.scala b/shared/src/main/scala/scala/util/parsing/combinator/lexical/Lexical.scala index e7c2a310..a740be6f 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/lexical/Lexical.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/lexical/Lexical.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/lexical/Scanners.scala b/shared/src/main/scala/scala/util/parsing/combinator/lexical/Scanners.scala index c7d47dfa..5cb7acbd 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/lexical/Scanners.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/lexical/Scanners.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala b/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala index a5f8a7ab..e19e86b7 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala index ac7c6dc7..b1498fc8 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StandardTokenParsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala index 5d3934fc..58b7e6a1 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/syntactical/StdTokenParsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/syntactical/TokenParsers.scala b/shared/src/main/scala/scala/util/parsing/combinator/syntactical/TokenParsers.scala index dac00ac3..683dc498 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/syntactical/TokenParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/syntactical/TokenParsers.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala b/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala index 04084902..71044111 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/token/StdTokens.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/combinator/token/Tokens.scala b/shared/src/main/scala/scala/util/parsing/combinator/token/Tokens.scala index c6f469ff..994c24a2 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/token/Tokens.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/token/Tokens.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala b/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala index f2ad5512..02b39748 100644 --- a/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/CharArrayReader.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/CharSequenceReader.scala b/shared/src/main/scala/scala/util/parsing/input/CharSequenceReader.scala index 8514b31e..7677b04c 100644 --- a/shared/src/main/scala/scala/util/parsing/input/CharSequenceReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/CharSequenceReader.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/NoPosition.scala b/shared/src/main/scala/scala/util/parsing/input/NoPosition.scala index a23a72bb..036b7f47 100644 --- a/shared/src/main/scala/scala/util/parsing/input/NoPosition.scala +++ b/shared/src/main/scala/scala/util/parsing/input/NoPosition.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala b/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala index ba6dbea1..493629a4 100644 --- a/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala +++ b/shared/src/main/scala/scala/util/parsing/input/OffsetPosition.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala b/shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala index 30dc37c3..60a1ca49 100644 --- a/shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala +++ b/shared/src/main/scala/scala/util/parsing/input/PagedSeq.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala b/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala index 4bdd7fd0..645949da 100644 --- a/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/PagedSeqReader.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/Position.scala b/shared/src/main/scala/scala/util/parsing/input/Position.scala index e2326829..69bef6d3 100644 --- a/shared/src/main/scala/scala/util/parsing/input/Position.scala +++ b/shared/src/main/scala/scala/util/parsing/input/Position.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/Positional.scala b/shared/src/main/scala/scala/util/parsing/input/Positional.scala index 85673e98..cf51a076 100644 --- a/shared/src/main/scala/scala/util/parsing/input/Positional.scala +++ b/shared/src/main/scala/scala/util/parsing/input/Positional.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/Reader.scala b/shared/src/main/scala/scala/util/parsing/input/Reader.scala index 67ee1774..c9913ffd 100644 --- a/shared/src/main/scala/scala/util/parsing/input/Reader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/Reader.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/main/scala/scala/util/parsing/input/StreamReader.scala b/shared/src/main/scala/scala/util/parsing/input/StreamReader.scala index b733ffa7..131d0eaf 100644 --- a/shared/src/main/scala/scala/util/parsing/input/StreamReader.scala +++ b/shared/src/main/scala/scala/util/parsing/input/StreamReader.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala index a0d6ece5..b2a179ef 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala index 07df04ec..af237dd3 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala index d4ad284d..fb95d702 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/RegexParsersTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/gh242.scala b/shared/src/test/scala/scala/util/parsing/combinator/gh242.scala index c4a221ea..0e75db7c 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/gh242.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/gh242.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/gh29.scala b/shared/src/test/scala/scala/util/parsing/combinator/gh29.scala index ea588f4b..2069b56b 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/gh29.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/gh29.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/gh45.scala b/shared/src/test/scala/scala/util/parsing/combinator/gh45.scala index 9a6d70dc..6d07414e 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/gh45.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/gh45.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/gh56.scala b/shared/src/test/scala/scala/util/parsing/combinator/gh56.scala index be76c23d..3258f743 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/gh56.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/gh56.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/gh72.scala b/shared/src/test/scala/scala/util/parsing/combinator/gh72.scala index d4aad888..181765ce 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/gh72.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/gh72.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/lexical/StdLexicalTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/lexical/StdLexicalTest.scala index 984af019..cea125f8 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/lexical/StdLexicalTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/lexical/StdLexicalTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t0700.scala b/shared/src/test/scala/scala/util/parsing/combinator/t0700.scala index 74a13c76..96783813 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t0700.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t0700.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t1100.scala b/shared/src/test/scala/scala/util/parsing/combinator/t1100.scala index 57eb5686..ff7d916f 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t1100.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t1100.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t1229.scala b/shared/src/test/scala/scala/util/parsing/combinator/t1229.scala index beffae6c..b0719d4a 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t1229.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t1229.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t3212.scala b/shared/src/test/scala/scala/util/parsing/combinator/t3212.scala index 8309e438..aa3559f4 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t3212.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t3212.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t4138.scala b/shared/src/test/scala/scala/util/parsing/combinator/t4138.scala index 13dbd72c..f74a9f21 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t4138.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t4138.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t5514.scala b/shared/src/test/scala/scala/util/parsing/combinator/t5514.scala index ef2d465f..2e514207 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t5514.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t5514.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t5669.scala b/shared/src/test/scala/scala/util/parsing/combinator/t5669.scala index 22408a1f..c3ba86cf 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t5669.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t5669.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t6067.scala b/shared/src/test/scala/scala/util/parsing/combinator/t6067.scala index 552c1ad8..f8607b30 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t6067.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t6067.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t6464.scala b/shared/src/test/scala/scala/util/parsing/combinator/t6464.scala index 72930db4..85654c04 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t6464.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t6464.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala b/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala index 07cfe395..9411a506 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t7483.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/combinator/t8879.scala b/shared/src/test/scala/scala/util/parsing/combinator/t8879.scala index 1bece711..ecf183bb 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/t8879.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/t8879.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/input/OffsetPositionTest.scala b/shared/src/test/scala/scala/util/parsing/input/OffsetPositionTest.scala index d31bf9a3..a8a270e7 100644 --- a/shared/src/test/scala/scala/util/parsing/input/OffsetPositionTest.scala +++ b/shared/src/test/scala/scala/util/parsing/input/OffsetPositionTest.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/input/gh178.scala b/shared/src/test/scala/scala/util/parsing/input/gh178.scala index fefc8e9f..7426da16 100644 --- a/shared/src/test/scala/scala/util/parsing/input/gh178.scala +++ b/shared/src/test/scala/scala/util/parsing/input/gh178.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). diff --git a/shared/src/test/scala/scala/util/parsing/input/gh64.scala b/shared/src/test/scala/scala/util/parsing/input/gh64.scala index ff2387c7..3d90f1c7 100644 --- a/shared/src/test/scala/scala/util/parsing/input/gh64.scala +++ b/shared/src/test/scala/scala/util/parsing/input/gh64.scala @@ -1,7 +1,7 @@ /* * Scala (https://www.scala-lang.org) * - * Copyright EPFL and Lightbend, Inc. + * Copyright EPFL and Lightbend, Inc. dba Akka * * Licensed under Apache License 2.0 * (http://www.apache.org/licenses/LICENSE-2.0). From 3bd4139104ce796d2e78af48bede7cd264237518 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 25 Dec 2024 22:24:50 +0000 Subject: [PATCH 29/46] Update sbt, scripted-plugin to 1.10.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e88a0d81..73df629a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 From 628da7e5129c504708d7918e9bb14283d080c10f Mon Sep 17 00:00:00 2001 From: philippus Date: Tue, 7 Jan 2025 11:43:10 +0100 Subject: [PATCH 30/46] Extend copyright into 2025 --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 8366af24..783cfd52 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ Scala parser combinators -Copyright (c) 2002-2024 EPFL -Copyright (c) 2011-2024 Lightbend, Inc. dba Akka +Copyright (c) 2002-2025 EPFL +Copyright (c) 2011-2025 Lightbend, Inc. dba Akka Scala includes software developed at LAMP/EPFL (https://lamp.epfl.ch/) and From 3e08ea910c3495450a7da10996f55cc1616dfe53 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 12 Jan 2025 21:01:09 +0000 Subject: [PATCH 31/46] Update sbt-scalajs, scalajs-compiler, ... to 1.18.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6b18534b..74a020d2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") From af609b5cd7aaf9c65d43a0c3932dad7ad1ec088e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 08:54:27 +0000 Subject: [PATCH 32/46] Update scala-library to 2.13.16 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index f17e661c..3a06b230 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.15", "2.12.20", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.4"), scalaVersion := crossScalaVersions.value.head, ) From 8ab2c7be89dc99689a57b8d3ac08abc3f07c638a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 25 Jan 2025 04:42:20 +0000 Subject: [PATCH 33/46] Update sbt-scalajs, scalajs-compiler, ... to 1.18.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 74a020d2..a1ed02cf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") From 1bf436917de3e2e0236266b81eea6cd59d000c96 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 4 Feb 2025 06:51:00 +0000 Subject: [PATCH 34/46] Update scala3-library, ... to 3.3.5 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3a06b230..f95e1155 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.4"), + crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.5"), scalaVersion := crossScalaVersions.value.head, ) From 4499b0d9da516072aad633d73b72437e5da75c7a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 26 Feb 2025 19:48:09 -0800 Subject: [PATCH 35/46] fix Scaladoc generation (and check it in CI) (#584) --- .github/workflows/ci.yml | 2 +- build.sbt | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4eade85..fc5c83c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,4 +23,4 @@ jobs: java-version: ${{matrix.java}} - uses: sbt/setup-sbt@v1 - name: Test - run: sbt ++${{matrix.scala}} test headerCheck versionPolicyCheck package + run: sbt ++${{matrix.scala}} test doc headerCheck versionPolicyCheck package diff --git a/build.sbt b/build.sbt index f95e1155..56407da2 100644 --- a/build.sbt +++ b/build.sbt @@ -34,8 +34,6 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor // go nearly warning-free, but only on 2.13, it's too hard across all versions Compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { case Some((2, 13)) => Seq("-Werror", "-Wunused", - // ideally we'd do something about this. `^?` is the responsible method - "-Wconf:site=scala.util.parsing.combinator.Parsers.*&cat=lint-multiarg-infix:i", // not sure what resolving this would look like? didn't think about it too hard "-Wconf:site=scala.util.parsing.combinator.lexical.StdLexical.*&cat=other-match-analysis:i", ) From 8af9562c0286d749ba68196366a8eb84b6b9a73b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 27 Feb 2025 17:41:08 +0000 Subject: [PATCH 36/46] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.7 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index a1ed02cf..7560a7b8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.6") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7") From 467180ccf12a17c27ad9192c092d3f5727e81b64 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 3 Mar 2025 20:49:22 +0000 Subject: [PATCH 37/46] Update sbt, scripted-plugin to 1.10.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 73df629a..96d8db79 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.10.9 From cf32970e106a2e0383d1b3929ad276aed782fbf4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 5 Mar 2025 22:46:22 +0000 Subject: [PATCH 38/46] Update sbt, scripted-plugin to 1.10.10 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 96d8db79..e97b2722 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.9 +sbt.version=1.10.10 From e403382daadadfdc7f71fb1e2065357ea1b00812 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 18 Mar 2025 00:14:35 +0000 Subject: [PATCH 39/46] Update sbt, scripted-plugin to 1.10.11 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e97b2722..cc68b53f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.10 +sbt.version=1.10.11 From ea977f80fe1a191083f00d717e546233a3aa4269 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 22 Apr 2025 18:32:25 +0000 Subject: [PATCH 40/46] Update sbt-scalajs, scalajs-compiler, ... to 1.19.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7560a7b8..619c19ca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.18.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7") From 20a52c0d7aa5edb10687540740ce548f17cf6ee4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 May 2025 14:04:13 +0000 Subject: [PATCH 41/46] Update scala3-library, ... to 3.3.6 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 56407da2..d178f9ab 100644 --- a/build.sbt +++ b/build.sbt @@ -4,7 +4,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.5"), + crossScalaVersions := Seq("2.13.16", "2.12.20", "3.3.6"), scalaVersion := crossScalaVersions.value.head, ) From 8040887f7051699efc2d56cf232854aa1febe917 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 24 May 2025 20:42:26 +0000 Subject: [PATCH 42/46] Update sbt, scripted-plugin to 1.11.0 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index cc68b53f..6520f698 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.11 +sbt.version=1.11.0 From f37a040aa87e235557a2daab8b19c5c14bf53105 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 3 Jun 2025 22:13:19 +0000 Subject: [PATCH 43/46] Update sbt, scripted-plugin to 1.11.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 6520f698..61c9b1cb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.0 +sbt.version=1.11.1 From c4eb48a1cc7ee19c158775ed8f2269a9bfaeeb74 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 6 Jun 2025 06:54:19 +0000 Subject: [PATCH 44/46] Update sbt-scala-module to 3.3.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 619c19ca..4aec6430 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.2.2") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.3.0") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") From 2537ab177bd65cc70ed42afcdd9bcdc4c986e060 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 7 Jun 2025 18:06:58 +0000 Subject: [PATCH 45/46] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.8 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 619c19ca..865b6e65 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8") From 3394451e0d154a7bb42cbb9e5b27f738d40a207d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 10 Jun 2025 02:21:56 +0000 Subject: [PATCH 46/46] Update sbt, scripted-plugin to 1.11.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 61c9b1cb..bbb0b608 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.11.1 +sbt.version=1.11.2