summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Koenig2021-09-17 13:15:34 -0700
committerGitHub2021-09-17 13:15:34 -0700
commit958904cb2f2f65d02b2ab3ec6d9ec2e06d04e482 (patch)
treed9d6ced3934aa4a8be3dec19ddcefe50a7a93d5a
parenta692b6d230189191defff45c85bc15ce705c471c (diff)
Update Scala and publish plugin for more minor versions (#2130)
-rw-r--r--.github/workflows/test.yml4
-rw-r--r--build.sbt7
2 files changed, 7 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 48300189..abce6d13 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
matrix:
system: ["ubuntu-20.04"]
jvm: ["adopt@1.8"]
- scala: ["2.13.6", "2.12.14"]
+ scala: ["2.13.6", "2.12.15"]
verilator: ["4.204"]
espresso: ["2.4"]
runs-on: ${{ matrix.system }}
@@ -67,7 +67,7 @@ jobs:
- name: Cache Scala
uses: coursier/cache-action@v5
- name: Documentation (Scala 2.12 only)
- if: matrix.scala == '2.12.14'
+ if: startsWith(matrix.scala, '2.12')
run: sbt ++${{ matrix.scala }} docs/mdoc
- name: Test
run: sbt ++${{ matrix.scala }} test noPluginTests/test
diff --git a/build.sbt b/build.sbt
index 4084eecd..ec4cda13 100644
--- a/build.sbt
+++ b/build.sbt
@@ -17,7 +17,7 @@ lazy val commonSettings = Seq (
version := "3.5-SNAPSHOT",
autoAPIMappings := true,
scalaVersion := "2.13.6",
- crossScalaVersions := Seq("2.13.6", "2.12.14"),
+ crossScalaVersions := Seq("2.13.6", "2.12.15"),
scalacOptions := Seq("-deprecation", "-feature"),
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
// Macros paradise is integrated into 2.13 but requires a scalacOption
@@ -105,12 +105,15 @@ lazy val pluginScalaVersions = Seq(
"2.12.11",
"2.12.12",
"2.12.13",
+ "2.12.14",
+ "2.12.15",
"2.13.0",
"2.13.1",
"2.13.2",
"2.13.3",
"2.13.4",
- "2.13.5"
+ "2.13.5",
+ "2.13.6"
)
lazy val plugin = (project in file("plugin")).