From 4d264b5aeaf020a543c6d40c5525261b16ed6928 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 26 Apr 2023 16:54:39 -0700 Subject: [PATCH 01/29] reset version policy intention (#515) --- build.sbt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 352bc6ba..9c498a56 100644 --- a/build.sbt +++ b/build.sbt @@ -3,10 +3,7 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), - // next version will bump minor (because we dropped Scala 2.11 and upgraded - // Scala.js and Scala Native); we could go back to BinaryAndSourceCompatible - // once that's done - versionPolicyIntention := Compatibility.BinaryCompatible, + versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, crossScalaVersions := Seq("2.13.10", "2.12.17", "3.2.2"), scalaVersion := crossScalaVersions.value.head, ) From 82d8524c7be74d15f29f5166293d8a7c7f3641ce Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Sat, 27 May 2023 07:59:30 -1000 Subject: [PATCH 02/29] upgrade to Scala 3.3.0 and enable unused warnings (#516) --- build.sbt | 7 +++++-- .../scala/util/parsing/combinator/LongestMatchTest.scala | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 9c498a56..35f99e00 100644 --- a/build.sbt +++ b/build.sbt @@ -3,8 +3,10 @@ ThisBuild / startYear := Some(2004) val commonSettings = Seq( versionScheme := Some("early-semver"), - versionPolicyIntention := Compatibility.BinaryAndSourceCompatible, - crossScalaVersions := Seq("2.13.10", "2.12.17", "3.2.2"), + // change back to BinaryAndSourceCompatible after next minor release; + // the Scala 3.2 -> 3.3 upgrade requires a minor version bump + versionPolicyIntention := Compatibility.BinaryCompatible, + crossScalaVersions := Seq("2.13.10", "2.12.17", "3.3.0"), scalaVersion := crossScalaVersions.value.head, ) @@ -39,6 +41,7 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor // 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", ) + case Some((3, _)) => Seq("Wunused:all") case _ => Seq() }), Compile / doc / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match { diff --git a/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala b/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala index f9dca807..58ea29ed 100644 --- a/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala +++ b/shared/src/test/scala/scala/util/parsing/combinator/LongestMatchTest.scala @@ -2,7 +2,6 @@ package scala.util.parsing.combinator import java.io.StringReader -import scala.util.parsing.combinator.Parsers import scala.util.parsing.input.StreamReader import org.junit.Test From 2d14136e73ceebcb4776040fa39b8552f03597e0 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 6 Jun 2023 22:24:20 +0000 Subject: [PATCH 03/29] Update junit-plugin, junit-runtime, ... to 0.4.14 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 13f12d6d..c14d9f5f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.12") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") From 119442f85919b704066dd9e59ae6d2ac2b836869 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jun 2023 04:04:30 +0000 Subject: [PATCH 04/29] Update scala-library to 2.12.18 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 35f99e00..2a355f03 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.10", "2.12.17", "3.3.0"), + crossScalaVersions := Seq("2.13.10", "2.12.18", "3.3.0"), scalaVersion := crossScalaVersions.value.head, ) From f968a0e126649edc318ea9dbfec9a3a8632b57c1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 9 Jun 2023 04:04:33 +0000 Subject: [PATCH 05/29] Update scala-library to 2.13.11 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 35f99e00..06bfa2ec 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.10", "2.12.17", "3.3.0"), + crossScalaVersions := Seq("2.13.11", "2.12.17", "3.3.0"), scalaVersion := crossScalaVersions.value.head, ) From 10a00b8516840fef149dff55a88aee664be743e6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 24 Jun 2023 18:35:19 +0000 Subject: [PATCH 06/29] Update sbt-scalajs, scalajs-compiler, ... to 1.13.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index c14d9f5f..f1d72041 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") From b56b37949863756bd99545a571cc0d597d943286 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 7 Jul 2023 01:26:18 +0000 Subject: [PATCH 07/29] Update sbt-scala-native-crossproject, ... to 1.3.2 --- project/plugins.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f1d72041..370fffc6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.1") -addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") +addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") -addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.1") +addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") From 597aba16069194b9be707ed0b0c88c7525f700de Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Wed, 12 Jul 2023 07:57:46 +0200 Subject: [PATCH 08/29] Update sbt to 1.9.2 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 46e43a97..875b706a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.2 From ac5ad8909fd10e19f415a8f16554e47b290086d7 Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Wed, 12 Jul 2023 18:42:27 +0200 Subject: [PATCH 09/29] Update sbt-scala-module to 3.1.0 (#524) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 370fffc6..4e40da84 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.0.1") +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.13.2") From 5206b0b58c8695155fccc01c585709041df12fb1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 13 Sep 2023 02:50:56 +0000 Subject: [PATCH 10/29] Update scala-library to 2.13.12 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 766a6d52..579fd735 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.11", "2.12.18", "3.3.0"), + crossScalaVersions := Seq("2.13.12", "2.12.18", "3.3.0"), scalaVersion := crossScalaVersions.value.head, ) From 30657668d848482a0c67b4c6dfbd4b91dfe986fb Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:00:09 +0200 Subject: [PATCH 11/29] Update scala3-library, ... to 3.3.1 (#527) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 579fd735..c6333053 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.12", "2.12.18", "3.3.0"), + crossScalaVersions := Seq("2.13.12", "2.12.18", "3.3.1"), scalaVersion := crossScalaVersions.value.head, ) From b6eaa6a812389bd6aee6bd2d1d3612e1c18bd6df Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:00:19 +0200 Subject: [PATCH 12/29] Update junit-plugin, junit-runtime, ... to 0.4.15 (#526) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4e40da84..f852ff12 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.13.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.14") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") From be85da013f31a167187652a37a9cad78de240634 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 26 Sep 2023 18:54:26 +0000 Subject: [PATCH 13/29] Update sbt-scalajs, scalajs-compiler, ... to 1.14.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f852ff12..3dfa5cc0 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.13.2") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") From b381d5bb10508437070f19bc8fd917f1237d48c6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 17 Oct 2023 02:47:33 +0000 Subject: [PATCH 14/29] Update junit-plugin, junit-runtime, ... to 0.4.16 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 3dfa5cc0..e3ff481d 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.14.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.15") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") From e5c944d3fa46a66ab273299400e86f64e6f5cdca Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 1 Dec 2023 21:18:47 +0000 Subject: [PATCH 15/29] Update sbt to 1.9.7 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 875b706a..e8a1e246 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.2 +sbt.version=1.9.7 From bfd7087d5e5069b967a7acaaf8ecb39d8899f153 Mon Sep 17 00:00:00 2001 From: philippus Date: Sat, 2 Dec 2023 16:34:53 +0100 Subject: [PATCH 16/29] Update checkout and setup-java github actions to v4 --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 033cc8cc..a27d2e60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,11 @@ jobs: scala: [2.12.x, 2.13.x, 3.x] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - uses: coursier/cache-action@v6 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{matrix.java}} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5a9fad6f..57aa9dd9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,10 +6,10 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 From 7390a277d4fd59cd1ba21231533c645fd7c89fa8 Mon Sep 17 00:00:00 2001 From: philippus Date: Sat, 2 Dec 2023 16:37:18 +0100 Subject: [PATCH 17/29] Add java 21 to build matrix --- .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 033cc8cc..d70e5c09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11, 17] + java: [8, 11, 17, 21] scala: [2.12.x, 2.13.x, 3.x] runs-on: ubuntu-latest steps: From 474901fe01824affe7e2ef0eaf7078ae5077784b Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 31 Dec 2023 08:44:10 +0900 Subject: [PATCH 18/29] use new wildcard syntax --- .../parsing/combinator/PackratParsers.scala | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) 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 7eab1455..e7a1675b 100644 --- a/shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala +++ b/shared/src/main/scala/scala/util/parsing/combinator/PackratParsers.scala @@ -63,7 +63,7 @@ trait PackratParsers extends Parsers { /* * caching of intermediate parse results and information about recursion */ - private[PackratParsers] val cache = mutable.HashMap.empty[(Parser[_], Position), MemoEntry[_]] + private[PackratParsers] val cache = mutable.HashMap.empty[(Parser[?], Position), MemoEntry[?]] private[PackratParsers] def getFromCache[T2](p: Parser[T2]): Option[MemoEntry[T2]] = { cache.get((p, pos)).asInstanceOf[Option[MemoEntry[T2]]] @@ -105,28 +105,28 @@ trait PackratParsers extends Parsers { val q = super.phrase(p) new PackratParser[T] { def apply(in: Input) = in match { - case in: PackratReader[_] => q(in) + case in: PackratReader[?] => q(in) case in => q(new PackratReader(in)) } } } - private def getPosFromResult(r: ParseResult[_]): Position = r.next.pos + private def getPosFromResult(r: ParseResult[?]): Position = r.next.pos // auxiliary data structures - private case class MemoEntry[+T](var r: Either[LR,ParseResult[_]]){ + private case class MemoEntry[+T](var r: Either[LR,ParseResult[?]]){ def getResult: ParseResult[T] = r match { case Left(LR(res,_,_)) => res.asInstanceOf[ParseResult[T]] case Right(res) => res.asInstanceOf[ParseResult[T]] } } - private case class LR(var seed: ParseResult[_], var rule: Parser[_], var head: Option[Head]){ + private case class LR(var seed: ParseResult[?], var rule: Parser[?], var head: Option[Head]){ def getPos: Position = getPosFromResult(seed) } - private case class Head(var headParser: Parser[_], var involvedSet: List[Parser[_]], var evalSet: List[Parser[_]]){ + private case class Head(var headParser: Parser[?], var involvedSet: List[Parser[?]], var evalSet: List[Parser[?]]){ def getHead = headParser } @@ -152,7 +152,7 @@ trait PackratParsers extends Parsers { * In the former case, it makes sure that rules involved in the recursion are evaluated. * It also prevents non-involved rules from getting evaluated further */ - private def recall(p: super.Parser[_], in: PackratReader[Elem]): Option[MemoEntry[_]] = { + private def recall(p: super.Parser[?], in: PackratReader[Elem]): Option[MemoEntry[?]] = { val cached = in.getFromCache(p) val head = in.recursionHeads.get(in.pos) @@ -170,7 +170,7 @@ trait PackratParsers extends Parsers { h.evalSet = h.evalSet.filterNot(_==p) val tempRes = p(in) //we know that cached has an entry here - val tempEntry: MemoEntry[_] = cached.get // match {case Some(x: MemoEntry[_]) => x} + val tempEntry: MemoEntry[?] = cached.get // match {case Some(x: MemoEntry[_]) => x} //cache is modified tempEntry.r = Right(tempRes) } @@ -184,7 +184,7 @@ trait PackratParsers extends Parsers { * we modify the involvedSets of all LRs in the stack, till we see * the current parser again */ - private def setupLR(p: Parser[_], in: PackratReader[_], recDetect: LR): Unit = { + private def setupLR(p: Parser[?], in: PackratReader[?], recDetect: LR): Unit = { if(recDetect.head.isEmpty) recDetect.head = Some(Head(p, Nil, Nil)) in.lrStack.takeWhile(_.rule != p).foreach {x => @@ -272,7 +272,7 @@ to update each parser involved in the recursion. //all setupLR does is change the heads of the recursions, so the seed will stay the same recDetect match {case LR(seed, _, _) => seed.asInstanceOf[ParseResult[T]]} } - case MemoEntry(Right(res: ParseResult[_])) => res.asInstanceOf[ParseResult[T]] + case MemoEntry(Right(res: ParseResult[?])) => res.asInstanceOf[ParseResult[T]] } } } @@ -299,7 +299,7 @@ to update each parser involved in the recursion. //we're done with growing, we can remove data from recursion head rest.recursionHeads -= rest.pos rest.getFromCache(p).get match { - case MemoEntry(Right(x: ParseResult[_])) => x.asInstanceOf[ParseResult[T]] + case MemoEntry(Right(x: ParseResult[?])) => x.asInstanceOf[ParseResult[T]] case _ => throw new Exception("impossible match") } } From 886672df0bdac550b6f2c247247c3f39b43fa7f8 Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Thu, 4 Jan 2024 10:08:59 +0100 Subject: [PATCH 19/29] Extend copyright into 2024 --- NOTICE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index 3e6a6355..9810195d 100644 --- a/NOTICE +++ b/NOTICE @@ -1,6 +1,6 @@ Scala parser combinators -Copyright (c) 2002-2023 EPFL -Copyright (c) 2011-2023 Lightbend, Inc. +Copyright (c) 2002-2024 EPFL +Copyright (c) 2011-2024 Lightbend, Inc. Scala includes software developed at LAMP/EPFL (https://lamp.epfl.ch/) and From b83e8ed62c2fc15769f13865ae63a71c87c013ab Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Jan 2024 09:40:16 +0000 Subject: [PATCH 20/29] Update sbt to 1.9.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e8a1e246..abbbce5d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.7 +sbt.version=1.9.8 From 2fbdb7aa3fe5cc0811f290bba6014745882aaadf Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Jan 2024 09:40:13 +0000 Subject: [PATCH 21/29] Update sbt-scalajs, scalajs-compiler, ... to 1.15.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index e3ff481d..57411e0d 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.14.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") From b6505ec3e059d823f8bc20b611d593105ebcdc5a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 20 Jan 2024 19:10:26 +0000 Subject: [PATCH 22/29] Update junit-plugin, junit-runtime, ... to 0.4.17 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 57411e0d..bf6d70be 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.15.0") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17") From 36f60a82b1ef45397a31a9669ccc66ef5a26e14d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 24 Feb 2024 00:05:34 +0000 Subject: [PATCH 23/29] Update sbt to 1.9.9 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index abbbce5d..04267b14 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.8 +sbt.version=1.9.9 From 451bf5d57e2d367a257b4c9b14635163d5a5cc72 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 28 Feb 2024 04:52:10 +0000 Subject: [PATCH 24/29] Update scala-library to 2.12.19 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c6333053..d825c45b 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.12", "2.12.18", "3.3.1"), + crossScalaVersions := Seq("2.13.12", "2.12.19", "3.3.1"), scalaVersion := crossScalaVersions.value.head, ) From 1a64a9e82b771c3fe663d7c89f100f4107eeb54a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 28 Feb 2024 04:52:13 +0000 Subject: [PATCH 25/29] Update scala-library to 2.13.13 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c6333053..60cc7f1c 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.12", "2.12.18", "3.3.1"), + crossScalaVersions := Seq("2.13.13", "2.12.18", "3.3.1"), scalaVersion := crossScalaVersions.value.head, ) From 72603c8506079baaabf45619f40f009e64e9ad3b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Mar 2024 00:03:58 +0000 Subject: [PATCH 26/29] Update scala3-library, ... to 3.3.3 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 7fa2c0cc..8811385a 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val commonSettings = Seq( // change back to BinaryAndSourceCompatible after next minor release; // the Scala 3.2 -> 3.3 upgrade requires a minor version bump versionPolicyIntention := Compatibility.BinaryCompatible, - crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.1"), + crossScalaVersions := Seq("2.13.13", "2.12.19", "3.3.3"), scalaVersion := crossScalaVersions.value.head, ) From 06ea67fb5d4f26cfe6a659c448fdfaad6b4b21e6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 28 Mar 2024 17:38:36 +0100 Subject: [PATCH 27/29] Update sbt-scalajs, scalajs-compiler, ... to 1.16.0 (#545) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bf6d70be..5959b676 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.15.0") +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.4.17") From 895131522b8b567c1af7c02d7171d9ea266cecce Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 11 Apr 2024 18:08:05 +0000 Subject: [PATCH 28/29] Update junit-plugin, nscplugin, ... to 0.5.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 5959b676..6adbae66 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.4.17") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.0") From 1a1b2c0e79cb20039c03d08da07c851bc65f81de Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 18 Apr 2024 06:26:05 +0200 Subject: [PATCH 29/29] Update auxlib, clib, javalib, junit-plugin, ... to 0.5.1 (#551) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 6adbae66..cab847c1 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.0") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1")