Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,18 @@ jobs:
matrix:
java: [8, 11, 17, 21, 25]
scala: [2.12.x, 2.13.x, 3.x]
exclude:
- java: 8
scala: 3.x
- java: 11
scala: 3.x
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
fetch-depth: 0
- uses: coursier/cache-action@v7
- uses: actions/setup-java@v5
- uses: coursier/cache-action@v8
- uses: actions/setup-java@v6
with:
distribution: temurin
java-version: ${{matrix.java}}
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,29 @@ on:
tags: ["*"]
jobs:
publish:
strategy:
matrix:
include:
- scala: 2.12.x
java: 8
- scala: 2.13.x
java: 8
- scala: 3.x
java: 17
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
with:
fetch-depth: 0
- uses: actions/setup-java@v5
- uses: actions/setup-java@v6
with:
distribution: temurin
java-version: 8
java-version: ${{matrix.java}}
- uses: sbt/setup-sbt@v1
- run: sbt versionCheck ci-release
- run: sbt "++${{matrix.scala}} versionCheck" ci-release
env:
# ci-release runs `+publishSigned` by default, this restricts it to one Scala version
CI_RELEASE: ++${{matrix.scala}} publishSigned
PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
PGP_SECRET: ${{secrets.PGP_SECRET}}
SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
Expand Down
7 changes: 7 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,17 @@ lazy val parserCombinators = crossProject(JVMPlatform, JSPlatform, NativePlatfor
Seq(
// scala/scala-parser-combinators#605
ProblemFilters.exclude[IncompatibleSignatureProblem]("scala.util.parsing.input.PagedSeq.sliding"),
// -Yfuture-lazy-vals turns the module's <clinit> from public to private, which is not an
// incompatibility. Drop once the fix for scala-garden/mima#794 is released.
ProblemFilters.exclude[DirectMissingMethodProblem]("scala.util.parsing.input.OffsetPosition.<clinit>"),
)
},
)
.jvmSettings(
Compile / compile / scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq("-release:17", "-Yfuture-lazy-vals")
case _ => Seq("-target:jvm-1.8")
}),
ScalaModulePlugin.scalaModuleOsgiSettings,
OsgiKeys.exportPackage := Seq(s"scala.util.parsing.*;version=${version.value}"),
)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.4.0")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "3.4.1")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.4.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.22.0")
Expand Down