Merge pull request #8 from scala-steward/update/main-1.4.0-RC1

Update main to 1.4.0-RC1
rtimush · Sep 7, 2020 · 3102b36 · 3102b36
2 parents 7ccbc52 + 8029d7d
commit 3102b36
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,15 +39,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - { sbt: 1_0_0,    java: 8  }
-          - { sbt: 1_1_0,    java: 8  }
-          - { sbt: 1_2_0,    java: 8  }
-          - { sbt: 1_3_13,   java: 8  }
-          - { sbt: 1_4_0-M2, java: 8  }
-          - { sbt: 1_3_13,   java: 11 }
-          - { sbt: 1_4_0-M2, java: 11  }
-          - { sbt: 1_3_13,   java: 14 }
-          - { sbt: 1_4_0-M2, java: 14  }
+          - { sbt: 1_0_0,     java: 8  }
+          - { sbt: 1_1_0,     java: 8  }
+          - { sbt: 1_2_0,     java: 8  }
+          - { sbt: 1_3_13,    java: 8  }
+          - { sbt: 1_4_0-RC1, java: 8  }
+          - { sbt: 1_3_13,    java: 11 }
+          - { sbt: 1_4_0-RC1, java: 11  }
+          - { sbt: 1_3_13,    java: 14 }
+          - { sbt: 1_4_0-RC1, java: 14  }
       fail-fast: false
     name: test (java ${{ matrix.java }}, sbt ${{ matrix.sbt }})
     steps:

diff --git a/build.sbt b/build.sbt
@@ -12,12 +12,12 @@ ThisBuild / scalacOptions := Seq("-deprecation", "-unchecked", "-feature")
 
 Global / scriptedLaunchOpts += s"-Dsbt.rewarn.version=${version.value}"
 
-lazy val `sbt-1.x`      = SbtAxis("1.x", "1.1.5")
-lazy val `sbt-1.4.0-M2` = SbtAxis("1.4.0-M2")
-lazy val `sbt-1.3.13`   = SbtAxis("1.3.13")
-lazy val `sbt-1.2.0`    = SbtAxis("1.2.0")
-lazy val `sbt-1.1.0`    = SbtAxis("1.1.0")
-lazy val `sbt-1.0.0`    = SbtAxis("1.0.0")
+lazy val `sbt-1.x`       = SbtAxis("1.x", "1.1.5")
+lazy val `sbt-1.4.0-RC1` = SbtAxis("1.4.0-RC1")
+lazy val `sbt-1.3.13`    = SbtAxis("1.3.13")
+lazy val `sbt-1.2.0`     = SbtAxis("1.2.0")
+lazy val `sbt-1.1.0`     = SbtAxis("1.1.0")
+lazy val `sbt-1.0.0`     = SbtAxis("1.0.0")
 
 lazy val publishSettings = Seq(
   publishMavenStyle := false,
@@ -48,7 +48,7 @@ lazy val `sbt-rewarn-adapter-bsp` = (project in file("adapters/bsp"))
   .disablePlugins(GitVersioningPlugin)
   .settings(
     scalaVersion := `sbt-1.x`.scalaVersion,
-    libraryDependencies += "org.scala-sbt" %% "main" % `sbt-1.4.0-M2`.fullVersion % Provided,
+    libraryDependencies += "org.scala-sbt" %% "main" % `sbt-1.4.0-RC1`.fullVersion % Provided,
     publish / skip := true
   )
 
@@ -67,7 +67,7 @@ lazy val `sbt-rewarn` = (projectMatrix in file("plugin"))
   .sbtScriptedRow(`sbt-1.1.0`, `sbt-1.x`)
   .sbtScriptedRow(`sbt-1.2.0`, `sbt-1.x`)
   .sbtScriptedRow(`sbt-1.3.13`, `sbt-1.x`)
-  .sbtScriptedRow(`sbt-1.4.0-M2`, `sbt-1.x`)
+  .sbtScriptedRow(`sbt-1.4.0-RC1`, `sbt-1.x`)
 
 lazy val root = project
   .withId("sbt-rewarn")