diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3bb8504a..080c7b449 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0-M2, 3.0.0-M3, 2.11.12, 2.12.13, 2.13.3] + scala: [3.0.0-M2, 3.0.0-M3, 2.12.13, 2.13.4] java: [adopt@1.8, adopt@1.11] platform: [jvm] workers: [1, 4] @@ -45,20 +45,18 @@ jobs: - workers: 1 os: ubuntu-latest java: adopt@1.8 - scala: 2.13.3 + scala: 2.13.4 platform: js - workers: 1 os: ubuntu-latest java: adopt@1.8 - scala: 2.11.12 + scala: 2.12.13 platform: native - pluginversion: 0.3.9 - workers: 1 os: ubuntu-latest java: adopt@1.8 - scala: 2.11.12 + scala: 2.13.4 platform: native - pluginversion: 0.4.0 runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -93,7 +91,6 @@ jobs: - name: Run the build script env: PLATFORM: ${{ matrix.platform }} - PLUGIN_VERSION: ${{ matrix.pluginversion }} TRAVIS_SCALA_VERSION: ${{ matrix.scala }} WORKERS: ${{ matrix.workers }} run: ./tools/travis-script.sh @@ -103,7 +100,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.3] + scala: [2.13.4] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: @@ -139,7 +136,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [3.0.0-M2, 3.0.0-M3, 2.11.12, 2.12.13, 2.13.3] + scala: [3.0.0-M2, 3.0.0-M3, 2.12.13, 2.13.4] java: [adopt@1.8] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 03df0c2f9..50c567dae 100644 --- a/build.sbt +++ b/build.sbt @@ -4,13 +4,12 @@ val scalaMajorVersion = SettingKey[Int]("scalaMajorVersion") scalaVersionSettings -val Scala211 = "2.11.12" val Scala212 = "2.12.13" -val Scala213 = "2.13.3" +val Scala213 = "2.13.4" val DottyOld = "3.0.0-M2" val DottyNew = "3.0.0-M3" -ThisBuild / crossScalaVersions := Seq(DottyOld, DottyNew, Scala211, Scala212, Scala213) +ThisBuild / crossScalaVersions := Seq(DottyOld, DottyNew, Scala212, Scala213) ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.last ThisBuild / githubWorkflowPublishTargetBranches := Seq() @@ -29,20 +28,20 @@ ThisBuild / githubWorkflowBuildMatrixAdditions += "platform" -> List("jvm") ThisBuild / githubWorkflowBuildMatrixAdditions += "workers" -> List("1", "4") ThisBuild / githubWorkflowBuildMatrixInclusions ++= - crossScalaVersions.value.filterNot(Set(Scala211)) map { scala => + crossScalaVersions.value map { scala => MatrixInclude( Map("os" -> PrimaryOS, "java" -> Java8, "scala" -> scala), Map("platform" -> "js", "workers" -> "1")) } ThisBuild / githubWorkflowBuildMatrixInclusions ++= - Seq("0.3.9", "0.4.0") map { v => + crossScalaVersions.value.filter(_.startsWith("2.")) map { scala => MatrixInclude( Map( "os" -> PrimaryOS, - "scala" -> Scala211, + "scala" -> scala, "java" -> Java8), - Map("platform" -> "native", "pluginversion" -> v, "workers" -> "1")) + Map("platform" -> "native", "workers" -> "1")) } ThisBuild / githubWorkflowBuildPreamble += @@ -57,7 +56,6 @@ ThisBuild / githubWorkflowBuild := Seq( name = Some("Run the build script"), env = Map( "PLATFORM" -> "${{ matrix.platform }}", - "PLUGIN_VERSION" -> "${{ matrix.pluginversion }}", "TRAVIS_SCALA_VERSION" -> "${{ matrix.scala }}", "WORKERS" -> "${{ matrix.workers }}"))) @@ -161,13 +159,11 @@ lazy val sharedSettings = MimaSettings.settings ++ scalaVersionSettings ++ Seq( (n: Int) => if (r.contains(n)) strs else Seq.empty val groups: Seq[Int => Seq[String]] = Seq( - mk(11 to 11)("-Xlint"), - mk(11 to 12)("-Ywarn-inaccessible", "-Ywarn-nullary-override", + mk(12 to 12)("-Ywarn-inaccessible", "-Ywarn-nullary-override", "-Ywarn-nullary-unit", "-Xfuture", "-Xfatal-warnings", "-deprecation", "-Ywarn-infer-any", "-Ywarn-unused-import"), - mk(11 to 13)("-encoding", "UTF-8", "-feature", "-unchecked", - "-Ywarn-dead-code", "-Ywarn-numeric-widen"), - mk(12 to 13)("-Xlint:-unused", + mk(12 to 13)("-encoding", "UTF-8", "-feature", "-unchecked", + "-Ywarn-dead-code", "-Ywarn-numeric-widen", "-Xlint:-unused", "-Ywarn-unused:-patvars,-implicits,-locals,-privates,-explicits")) val n = scalaMajorVersion.value @@ -245,11 +241,7 @@ lazy val js = project.in(file("js")) .settings( Global / scalaJSStage := FastOptStage, libraryDependencies += - ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).withDottyCompat(scalaVersion.value), - - scalacOptions ++= { - if (scalaVersion.value == "3.0.0-M1") Seq("-Yskip:explicitJSClasses") else Nil - }, + ("org.scala-js" %% "scalajs-test-interface" % scalaJSVersion).withDottyCompat(scalaVersion.value) ) .enablePlugins(ScalaJSPlugin) @@ -276,8 +268,8 @@ lazy val native = project.in(file("native")) .settings(sharedSettings: _*) .settings( Compile / doc := (jvm / Compile / doc).value, - scalaVersion := "2.11.12", - crossScalaVersions := Seq("2.11.12"), + scalaVersion := Scala212, + crossScalaVersions := Seq(Scala212, Scala213), // TODO: re-enable MiMa for native once published mimaPreviousArtifacts := Set(), libraryDependencies ++= Seq( diff --git a/project/plugin.sbt b/project/plugin.sbt index 1825e4f32..7884b0996 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -14,14 +14,7 @@ def printAndDie(msg: String): Nothing = { sys.error(msg) } -// Update SCALANATIVE_VERSION in release.sh, as well -val scalaNativeVersion = env("SCALANATIVE_VERSION") match { - case Some("0.3.9") | Some("") | None => "0.3.9" - case Some("0.4.0") => "0.4.0" - case Some(v) => printAndDie(s"unsupported scala native version: $v") -} - -addSbtPlugin("org.scala-native" % "sbt-scala-native" % scalaNativeVersion) +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0") addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0") diff --git a/release.sh b/release.sh index 13f6bd757..0c0885da6 100755 --- a/release.sh +++ b/release.sh @@ -55,7 +55,5 @@ runsbt "+ jvm/$CMD" # step 4b: js releases runsbt "+ js/$CMD" -# step 4c: native releases (clean versions) -SCALANATIVE_VERSION="0.3.9" runsbt "+ native/$CMD" -runsbt "+ native/clean" -SCALANATIVE_VERSION="0.4.0" runsbt "+ native/$CMD" +# step 4c: native releases +runsbt "+ native/$CMD" diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 3c1f5306a..9f316adf6 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -1,8 +1,6 @@ #!/bin/bash set -evu -export SCALANATIVE_VERSION="$PLUGIN_VERSION" - sbt_cmd=(sbt ++$TRAVIS_SCALA_VERSION) if [[ "$PLATFORM" == "js" ]]; then