From 842a7b1bbebe586c019bba296caba13c15380dda Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Mon, 5 Dec 2022 16:48:21 -0800 Subject: Bump Scala (#2578) --- .github/workflows/test.yml | 4 ++-- build.sbt | 4 ++-- build.sc | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 85e5bde6..98389764 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - scala: [2.13.7, 2.12.15] + scala: [2.13.10, 2.12.17] steps: - name: Checkout @@ -51,7 +51,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - scala: [2.13.7, 2.12.15] + scala: [2.13.10, 2.12.17] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/build.sbt b/build.sbt index 0bea52a0..4c6c2456 100644 --- a/build.sbt +++ b/build.sbt @@ -4,8 +4,8 @@ enablePlugins(SiteScaladocPlugin) lazy val commonSettings = Seq( organization := "edu.berkeley.cs", - scalaVersion := "2.12.15", - crossScalaVersions := Seq("2.13.7", "2.12.15") + scalaVersion := "2.12.17", + crossScalaVersions := Seq("2.13.10", "2.12.17") ) lazy val isAtLeastScala213 = Def.setting { diff --git a/build.sc b/build.sc index a4f86211..5e2ab3ef 100644 --- a/build.sc +++ b/build.sc @@ -10,7 +10,7 @@ import mill.contrib.buildinfo.BuildInfo import java.io.IOException -object firrtl extends mill.Cross[firrtlCrossModule]("2.12.15", "2.13.7") +object firrtl extends mill.Cross[firrtlCrossModule]("2.12.17", "2.13.10") class firrtlCrossModule(val crossScalaVersion: String) extends CrossSbtModule -- cgit v1.2.3