*: Upgrade sbt to 1.5.3

Problem

sbt supports Scala 3 natively in the recent versions (e.g. 1.5.x) and I want the
build to be ready for Scala 3.

Solution

Updating sbt from 1.3.10 to 1.5.3

Result

sbt is updated to 1.5.3 and most warnings addressed (i.e. auto-reloading, unused
settings, and migration to slash-syntax for settings)

Signed-off-by: Moses Nakamura <[email protected]>

Differential Revision: https://phabricator.twitter.biz/D680505

build.sbt

@@ -1,5 +1,8 @@
 import scoverage.ScoverageKeys
 
+Global / onChangedBuildSource := ReloadOnSourceChanges
+Global / excludeLintKeys += scalacOptions // might be actually unused in util-doc module but not sure
+
 // All Twitter library releases are date versioned as YY.MM.patch
 val releaseVersion = "21.6.0-SNAPSHOT"
 
@@ -86,19 +89,19 @@ val baseSettings = Seq(
   version := releaseVersion,
   organization := "com.twitter",
   // Workaround for a scaladoc bug which causes it to choke on empty classpaths.
-  unmanagedClasspath in Compile += Attributed.blank(new java.io.File("doesnotexist")),
+  Compile / unmanagedClasspath += Attributed.blank(new java.io.File("doesnotexist")),
   libraryDependencies ++= Seq(
     "org.scala-lang.modules" %% "scala-collection-compat" % "2.1.2",
     // See https://www.scala-sbt.org/0.13/docs/Testing.html#JUnit
     "com.novocode" % "junit-interface" % "0.11" % "test",
     "org.scalatest" %% "scalatest" % "3.1.2" % "test",
     "org.scalatestplus" %% "junit-4-12" % "3.1.2.0" % "test"
   ),
-  fork in Test := true, // We have to fork to get the JavaOptions
+  Test / fork := true, // We have to fork to get the JavaOptions
   // Workaround for cross building HealthyQueue.scala, which is not compatible between
   // 2.12- with 2.13+.
-  unmanagedSourceDirectories in Compile += {
-    val sourceDir = (sourceDirectory in Compile).value
+  Compile / unmanagedSourceDirectories += {
+    val sourceDir = (Compile / sourceDirectory).value
     CrossVersion.partialVersion(scalaVersion.value) match {
       case Some((2, n)) if n >= 13 => sourceDir / "scala-2.13+"
       case _ => sourceDir / "scala-2.12-"
@@ -121,20 +124,20 @@ val baseSettings = Seq(
   // Note: Use -Xlint rather than -Xlint:unchecked when TestThriftStructure
   // warnings are resolved
   javacOptions ++= Seq("-Xlint:unchecked", "-source", "1.8", "-target", "1.8"),
-  javacOptions in doc := Seq("-source", "1.8"),
+  doc / javacOptions := Seq("-source", "1.8"),
   javaOptions ++= Seq(
     "-Djava.net.preferIPv4Stack=true",
     "-XX:+AggressiveOpts",
     "-server"
   ),
   javaOptions ++= gcJavaOptions,
-  javaOptions in Test ++= travisTestJavaOptions,
+  Test / javaOptions ++= travisTestJavaOptions,
   // -a: print stack traces for failing asserts
   testOptions += Tests.Argument(TestFrameworks.JUnit, "-a"),
   // This is bad news for things like com.twitter.util.Time
-  parallelExecution in Test := false,
+  Test / parallelExecution := false,
   // Sonatype publishing
-  publishArtifact in Test := false,
+  Test / publishArtifact := false,
   pomIncludeRepository := { _ => false },
   publishMavenStyle := true,
   publishConfiguration := publishConfiguration.value.withOverwrite(true),
@@ -172,7 +175,7 @@ val baseSettings = Seq(
 val sharedSettings = defaultProjectSettings ++ baseSettings
 
 lazy val noPublishSettings = Seq(
-  skip in publish := true
+  publish / skip := true
 )
 
 lazy val util = Project(
@@ -184,7 +187,7 @@ lazy val util = Project(
     sharedSettings ++
       noPublishSettings ++
       Seq(
-        unidocProjectFilter in (ScalaUnidoc, unidoc) := inAnyProject -- inProjects(utilBenchmark)
+        ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject -- inProjects(utilBenchmark)
       )
   ).aggregate(
     utilApp,
@@ -303,7 +306,7 @@ lazy val utilCore = Project(
     name := "util-core",
     // Moved some code to 'concurrent-extra' to conform to Pants' 1:1:1 principle (https://www.pantsbuild.org/build_files.html#target-granularity)
     // so that util-core would work better for Pants projects in IntelliJ.
-    unmanagedSourceDirectories in Compile += baseDirectory.value / "concurrent-extra",
+    Compile / unmanagedSourceDirectories += baseDirectory.value / "concurrent-extra",
     libraryDependencies ++= Seq(
       caffeineLib % "test",
       scalacheckLib,
@@ -313,7 +316,7 @@ lazy val utilCore = Project(
       "org.scalatestplus" %% "mockito-3-3" % "3.1.2.0" % "test",
       "org.scalatestplus" %% "scalacheck-1-14" % "3.1.2.0" % "test"
     ),
-    resourceGenerators in Compile += Def.task {
+    Compile / resourceGenerators += Def.task {
       val projectName = name.value
       val file = resourceManaged.value / "com" / "twitter" / projectName / "build.properties"
       val buildRev = scala.sys.process.Process("git" :: "rev-parse" :: "HEAD" :: Nil).!!.trim
@@ -323,10 +326,10 @@ lazy val utilCore = Project(
       IO.write(file, contents)
       Seq(file)
     }.taskValue,
-    sources in (Compile, doc) := {
+    Compile / doc / sources := {
       // Monitors.java causes "not found: type Monitor$" (CSL-5034)
       // so exclude it from the sources used for scaladoc
-      val previous = (sources in (Compile, doc)).value
+      val previous = (Compile / doc / sources).value
       previous.filterNot(file => file.getName() == "Monitors.java")
     }
   ).dependsOn(utilFunction)
@@ -339,8 +342,8 @@ lazy val utilDoc = Project(
   ).settings(
     sharedSettings ++
       noPublishSettings ++ Seq(
-      scalacOptions in doc ++= Seq("-doc-title", "Util", "-doc-version", version.value),
-      includeFilter in Sphinx := ("*.html" | "*.png" | "*.svg" | "*.js" | "*.css" | "*.gif" | "*.txt")
+      doc / scalacOptions ++= Seq("-doc-title", "Util", "-doc-version", version.value),
+      Sphinx / includeFilter := ("*.html" | "*.png" | "*.svg" | "*.js" | "*.css" | "*.gif" | "*.txt")
     ))
 
 lazy val utilFunction = Project(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.10
+sbt.version=1.5.3

project/plugins.sbt

@@ -2,6 +2,5 @@ resolvers += Classpaths.sbtPluginReleases
 resolvers += Resolver.sonatypeRepo("snapshots")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC13")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.0")

sbt

@@ -1,21 +1,23 @@
 #!/bin/bash
 
-sbtver=1.3.10
-sbtjar=sbt-launch.jar
-sbtsha128=f49861befe36746728182ea7efb30096c724b0d7
+set -eo pipefail
+
+sbtver="1.5.3"
+sbtjar="sbt-launch-$sbtver.jar"
+sbtsha128="1ca2d0ee419a1f82f512f2aa8556d6e262b37961"
 
 sbtrepo="https://repo1.maven.org/maven2/org/scala-sbt/sbt-launch"
 
-if [ ! -f $sbtjar ]; then
+if [ ! -f "sbt-launch.jar" ]; then
   echo "downloading $PWD/$sbtjar" 1>&2
-  if ! curl --location --silent --fail --remote-name $sbtrepo/$sbtver/$sbtjar; then
+  if ! curl --location --silent --fail -o "sbt-launch.jar" "$sbtrepo/$sbtver/$sbtjar"; then
     exit 1
   fi
 fi
 
-checksum=`openssl dgst -sha1 $sbtjar | awk '{ print $2 }'`
+checksum=`openssl dgst -sha1 sbt-launch.jar | awk '{ print $2 }'`
 if [ "$checksum" != $sbtsha128 ]; then
-  echo "bad $PWD/$sbtjar.  delete $PWD/$sbtjar and run $0 again."
+  echo "bad $PWD/sbt-launch.jar.  delete $PWD/sbt-launch.jar and run $0 again."
   exit 1
 fi
 
@@ -24,4 +26,4 @@ fi
 java -ea                          \
   $SBT_OPTS                       \
   $JAVA_OPTS                      \
-  -jar $sbtjar "$@"
+  -jar "sbt-launch.jar" "$@"