Merge pull request #4432 from djspiewak/build/sonatype

Author: djspiewak

build.sbt

@@ -15,7 +15,6 @@
  */
 
 import java.io.File
-import java.util.concurrent.TimeUnit
 
 import com.typesafe.tools.mima.core._
 import com.github.sbt.git.SbtGit.GitKeys._
@@ -46,7 +45,6 @@ ThisBuild / tlUntaggedAreSnapshots := false
 
 ThisBuild / organization := "org.typelevel"
 ThisBuild / organizationName := "Typelevel"
-ThisBuild / tlSonatypeUseLegacyHost := false
 
 ThisBuild / startYear := Some(2020)
 
@@ -331,18 +329,31 @@ val CoopVersion = "1.2.0"
 
 val MacrotaskExecutorVersion = "1.1.1"
 
-tlReplaceCommandAlias("ci", CI.AllCIs.map(_.toString).mkString)
-addCommandAlias("release", "tlRelease")
+Global / tlCommandAliases ++= Map(
+  CI.JVM.commandAlias,
+  CI.Native.commandAlias,
+  CI.JS.commandAlias,
+  CI.Firefox.commandAlias,
+  CI.Chrome.commandAlias
+)
+
+Global / tlCommandAliases ++= Map(
+  "ci" -> CI.AllCIs.flatMap(_.commands)
+)
 
-addCommandAlias(CI.JVM.command, CI.JVM.toString)
-addCommandAlias(CI.Native.command, CI.Native.toString)
-addCommandAlias(CI.JS.command, CI.JS.toString)
-addCommandAlias(CI.Firefox.command, CI.Firefox.toString)
-addCommandAlias(CI.Chrome.command, CI.Chrome.toString)
+Global / tlCommandAliases ++= Map(
+  "release" -> List("tlRelease")
+)
 
-tlReplaceCommandAlias(
-  "prePR",
-  "; root/clean; +root/headerCreate; root/scalafixAll; scalafmtSbt; +root/scalafmtAll")
+Global / tlCommandAliases ++= Map(
+  "prePR" -> List(
+    "root/clean",
+    "+root/headerCreate",
+    "root/scalafixAll",
+    "scalafmtSbt",
+    "+root/scalafmtAll"
+  )
+)
 
 val jsProjects: Seq[ProjectReference] =
   Seq(

project/CI.scala

@@ -23,24 +23,25 @@ sealed abstract class CI(
     scaladoc: Boolean,
     suffixCommands: List[String]) {
 
-  override val toString: String = {
-    val commands =
-      (List(
-        "scalafmtSbtCheck",
-        s"project $rootProject",
-        jsEnv.fold("")(env => s"set Global / useJSEnv := JSEnv.$env"),
-        "headerCheck",
-        "scalafmtCheckAll",
-        "javafmtCheckAll",
-        "clean"
-      ) ++ testCommands ++ List(
-        jsEnv.fold("")(_ => s"set Global / useJSEnv := JSEnv.NodeJS"),
-        if (mimaReport) "mimaReportBinaryIssues" else "",
-        if (scaladoc) "doc" else ""
-      )).filter(_.nonEmpty) ++ suffixCommands
+  val commands: List[String] =
+    (List(
+      s"project $rootProject",
+      jsEnv.fold("")(env => s"set Global / useJSEnv := JSEnv.$env"),
+      "headerCheck",
+      "scalafmtSbtCheck",
+      "scalafmtCheckAll",
+      "javafmtCheckAll",
+      "clean"
+    ) ++ testCommands ++ List(
+      jsEnv.fold("")(_ => s"set Global / useJSEnv := JSEnv.NodeJS"),
+      if (mimaReport) "mimaReportBinaryIssues" else "",
+      if (scaladoc) "doc" else ""
+    )).filter(_.nonEmpty) ++ suffixCommands
 
+  val commandAlias: (String, List[String]) = command -> commands
+
+  override val toString: String =
     commands.mkString("; ", "; ", "")
-  }
 }
 
 object CI {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.7
+sbt.version=1.11.2

project/plugins.sbt

@@ -1,6 +1,6 @@
 libraryDependencies += "org.scala-js" %% "scalajs-env-selenium" % "1.1.1"
 
-addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.5")
+addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.0")
 
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")