From 3f86386eac42efda16c3445e19d3e6ce816ee04f Mon Sep 17 00:00:00 2001 From: Kit Langton Date: Mon, 11 Apr 2022 13:27:22 -0400 Subject: [PATCH] bump versions --- .github/workflows/ci.yml | 2 +- project/BuildHelper.scala | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fdca76d4..02cded45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: fail-fast: false matrix: java: ['adopt@1.8', 'adopt@1.11'] - scala: ['2.11.12', '2.12.15', '2.13.7', '3.1.0'] + scala: ['2.11.12', '2.12.15', '2.13.8', '3.1.1'] platform: ['JVM', 'JS', 'Native'] steps: - name: Checkout current branch diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index d9f8071f..95d83b40 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -14,7 +14,7 @@ object BuildHelper { private val Scala211 = "2.11.12" private val Scala212 = "2.12.15" private val Scala213 = "2.13.8" - val ScalaDotty = "3.1.1" + val Scala3 = "3.1.1" val SilencerVersion = "1.7.8" @@ -133,22 +133,22 @@ object BuildHelper { } val dottySettings = Seq( - crossScalaVersions += ScalaDotty, + crossScalaVersions += Scala3, scalacOptions ++= { - if (scalaVersion.value == ScalaDotty) + if (scalaVersion.value == Scala3) Seq("-noindent") else Seq() }, scalacOptions --= { - if (scalaVersion.value == ScalaDotty) + if (scalaVersion.value == Scala3) Seq("-Xfatal-warnings") else Seq() }, Compile / doc / sources := { val old = (Compile / doc / sources).value - if (scalaVersion.value == ScalaDotty) { + if (scalaVersion.value == Scala3) { Nil } else { old @@ -156,7 +156,7 @@ object BuildHelper { }, Test / parallelExecution := { val old = (Test / parallelExecution).value - if (scalaVersion.value == ScalaDotty) { + if (scalaVersion.value == Scala3) { false } else { old @@ -189,7 +189,7 @@ object BuildHelper { ThisBuild / scalaVersion := Scala213, scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value, optimize = !isSnapshot.value), libraryDependencies ++= { - if (scalaVersion.value == ScalaDotty) + if (scalaVersion.value == Scala3) Seq( "com.github.ghik" % s"silencer-lib_$Scala213" % SilencerVersion % Provided ) @@ -199,7 +199,7 @@ object BuildHelper { compilerPlugin("com.github.ghik" % "silencer-plugin" % SilencerVersion cross CrossVersion.full) ) }, - semanticdbEnabled := scalaVersion.value != ScalaDotty, // enable SemanticDB + semanticdbEnabled := scalaVersion.value != Scala3, // enable SemanticDB semanticdbOptions += "-P:semanticdb:synthetics:on", semanticdbVersion := scalafixSemanticdb.revision, // use Scalafix compatible version ThisBuild / scalafixScalaBinaryVersion := CrossVersion.binaryScalaVersion(scalaVersion.value), @@ -232,7 +232,7 @@ object BuildHelper { def macroDefinitionSettings = Seq( scalacOptions += "-language:experimental.macros", libraryDependencies ++= { - if (scalaVersion.value == ScalaDotty) Seq() + if (scalaVersion.value == Scala3) Seq() else Seq( "org.scala-lang" % "scala-reflect" % scalaVersion.value % "provided",