Update Scala to 2.13 (#1522)

Update Scala to 2.13

.travis.yml

@@ -16,12 +16,18 @@ jobs:
     - env: TEST="2.12"
       jdk: openjdk8
       script: sbt ci-test
+    - env: TEST="2.13"
+      jdk: openjdk8
+      script: sbt ci-test
     - env: TEST="2.11"
       jdk: openjdk11
       script: sbt ci-test
     - env: TEST="2.12"
       jdk: openjdk11
       script: sbt ci-test
+    - env: TEST="2.13"
+      jdk: openjdk11
+      script: sbt ci-test
     - stage: release
       jdk: openjdk8
       script: sbt ci-release docs/docusaurusPublishGhpages

build.sbt

@@ -3,6 +3,7 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
 def scala211 = "2.11.12"
 def scala212 = "2.12.8"
+def scala213 = "2.13.1"
 
 inThisBuild(
   List(
@@ -19,8 +20,8 @@ inThisBuild(
         url("https://geirsson.com")
       )
     ),
-    scalaVersion := scala212,
-    crossScalaVersions := List(scala212, scala211),
+    scalaVersion := scala213,
+    crossScalaVersions := List(scala213, scala212, scala211),
     resolvers += Resolver.sonatypeRepo("releases"),
     libraryDependencies ++= List(
       scalatest.value % Test,
@@ -36,7 +37,8 @@ skip in publish := true
 commands += Command.command("ci-test") { s =>
   val scalaVersion = sys.env.get("TEST") match {
     case Some("2.11") => scala211
-    case _ => scala212
+    case Some("2.12") => scala212
+    case _ => scala213
   }
   val docsTest = if (scalaVersion == scala212) "docs/run" else "version"
   s"++$scalaVersion" ::
@@ -89,17 +91,26 @@ lazy val core = crossProject(JVMPlatform)
   .in(file("scalafmt-core"))
   .settings(
     moduleName := "scalafmt-core",
-    addCompilerPlugin(
-      "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full
-    ),
     buildInfoSettings,
+    scalacOptions ++= scalacJvmOptions.value,
     libraryDependencies ++= Seq(
       metaconfig.value,
       scalameta.value,
       // scala-reflect is an undeclared dependency of fansi, see #1252.
       // Scalafmt itself does not require scala-reflect.
       "org.scala-lang" % "scala-reflect" % scalaVersion.value
-    )
+    ),
+    libraryDependencies ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) => Seq.empty
+        case _ =>
+          Seq(
+            compilerPlugin(
+              "org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full
+            )
+          )
+      }
+    }
   )
   // .jsSettings(
   //   libraryDependencies ++= List(
@@ -122,6 +133,7 @@ import sbtassembly.AssemblyPlugin.defaultUniversalScript
 val scalacJvmOptions = Def.setting {
   CrossVersion.partialVersion(scalaVersion.value) match {
     case Some((2, 11)) => Seq("-target:jvm-1.8")
+    case Some((2, 13)) => Seq("-Ymacro-annotations")
     case _ => Seq.empty
   }
 }
@@ -141,6 +153,15 @@ lazy val cli = project
       // undeclared transitive dependency of coursier-small
       "org.scala-lang.modules" %% "scala-xml" % "1.2.0"
     ),
+    libraryDependencies ++= {
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) =>
+          Seq(
+            "org.scala-lang.modules" %% "scala-parallel-collections" % "0.2.0"
+          )
+        case _ => Seq.empty
+      }
+    },
     scalacOptions ++= scalacJvmOptions.value
   )
   .dependsOn(coreJVM, dynamic)
@@ -151,7 +172,10 @@ lazy val tests = project
     skip in publish := true,
     libraryDependencies ++= Seq(
       // Test dependencies
-      "com.lihaoyi" %% "scalatags" % "0.6.8",
+      CrossVersion.partialVersion(scalaVersion.value) match {
+        case Some((2, 13)) => "com.lihaoyi" %% "scalatags" % "0.7.0"
+        case _ => "com.lihaoyi" %% "scalatags" % "0.6.8"
+      },
       "org.typelevel" %% "paiges-core" % "0.2.4",
       scalametaTestkit
     )
@@ -215,6 +239,7 @@ lazy val buildInfoSettings: Seq[Def.Setting[_]] = Seq(
     "stable" -> stableVersion.value,
     "scala" -> scalaVersion.value,
     "scala211" -> scala211,
+    "scala212" -> scala212,
     "coursier" -> coursier,
     "commit" -> sys.process.Process("git rev-parse HEAD").lineStream_!.head,
     "timestamp" -> System.currentTimeMillis().toString,

project/Dependencies.scala

@@ -5,10 +5,10 @@ import org.portablescala.sbtplatformdeps.PlatformDepsPlugin.autoImport._
 // scalafmt: { maxColumn = 120, style = defaultWithAlign }
 
 object Dependencies {
-  val metaconfigV = "0.8.3"
+  val metaconfigV = "0.9.4"
   val scalametaV = "4.2.3"
-  val scalatestV = "3.2.0-SNAP10"
-  val scalacheckV = "1.13.5"
+  val scalatestV = "3.0.8"
+  val scalacheckV = "1.14.2"
   val coursier = "1.0.3"
 
   val scalapb = Def.setting {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.2.8

project/plugins.sbt

@@ -4,7 +4,7 @@ resolvers ++= Seq(
   Resolver.bintrayIvyRepo("jetbrains", "sbt-plugins")
 )
 
-addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.2.7")
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "1.3.5")
 addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.6.0-RC4")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.4.31")
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")

scalafmt-benchmarks/src/main/scala/org/scalafmt/benchmarks/MacroBenchmark.scala → scalafmt-benchmarks/src/main/scala-2.12/benchmarks/MacroBenchmark.scala

@@ -1,41 +1,14 @@
-package org.scalafmt.benchmarks
-
-import scala.collection.GenIterable
-import scala.meta.Source
-import scala.meta.testkit.Corpus
-import scala.meta.testkit.CorpusFile
-import scala.util.Try
+package benchmarks
 
 import java.util.concurrent.TimeUnit
 
-import org.openjdk.jmh.annotations.Benchmark
-import org.openjdk.jmh.annotations.BenchmarkMode
-import org.openjdk.jmh.annotations.Measurement
-import org.openjdk.jmh.annotations.Mode
-import org.openjdk.jmh.annotations.OutputTimeUnit
-import org.openjdk.jmh.annotations.Scope
-import org.openjdk.jmh.annotations.Setup
-import org.openjdk.jmh.annotations.Warmup
+import org.openjdk.jmh.annotations._
 import org.scalafmt.Scalafmt
-import org.scalafmt.config.RewriteSettings
-import org.scalafmt.config.ScalafmtConfig
-import org.scalafmt.rewrite.RedundantBraces
-import org.scalafmt.rewrite.SortImports
+import org.scalafmt.benchmarks.FormatBenchmark
 
-trait FormatBenchmark {
-  def formatRewrite(code: String) = {
-    Scalafmt
-      .format(
-        code,
-        style = ScalafmtConfig.default.copy(
-          rewrite = RewriteSettings(
-            rules = Seq(SortImports, RedundantBraces)
-          )
-        )
-      )
-      .get
-  }
-}
+import scala.collection.GenIterable
+import scala.meta.testkit.Corpus
+import scala.util.Try
 
 /**
   * Formats filename at with scalafmt.

scalafmt-benchmarks/src/main/scala/org/scalafmt/benchmarks/FormatBenchmark.scala

@@ -0,0 +1,20 @@
+package org.scalafmt.benchmarks
+
+import org.scalafmt.Scalafmt
+import org.scalafmt.config.{RewriteSettings, ScalafmtConfig}
+import org.scalafmt.rewrite.{RedundantBraces, SortImports}
+
+trait FormatBenchmark {
+  def formatRewrite(code: String): String = {
+    Scalafmt
+      .format(
+        code,
+        style = ScalafmtConfig.default.copy(
+          rewrite = RewriteSettings(
+            rules = Seq(SortImports, RedundantBraces)
+          )
+        )
+      )
+      .get
+  }
+}

scalafmt-benchmarks/src/main/scala/org/scalafmt/benchmarks/MicroBenchmark.scala

@@ -3,25 +3,9 @@ package org.scalafmt.benchmarks
 import java.io.File
 import java.util.concurrent.TimeUnit
 
-import org.openjdk.jmh.annotations.Benchmark
-import org.openjdk.jmh.annotations.BenchmarkMode
-import org.openjdk.jmh.annotations.Measurement
-import org.openjdk.jmh.annotations.Mode
-import org.openjdk.jmh.annotations.OutputTimeUnit
-import org.openjdk.jmh.annotations.Scope
-import org.openjdk.jmh.annotations.Setup
-import org.openjdk.jmh.annotations.Warmup
+import org.openjdk.jmh.annotations._
 import org.scalafmt.Scalafmt
 import org.scalafmt.util.FileOps
-import scala.meta.Source
-
-import org.scalafmt.config.RedundantBracesSettings
-import org.scalafmt.config.RewriteSettings
-import org.scalafmt.config.ScalafmtOptimizer
-import org.scalafmt.config.ScalafmtRunner
-import org.scalafmt.config.ScalafmtConfig
-import org.scalafmt.rewrite.RedundantBraces
-import org.scalafmt.rewrite.SortImports
 
 /**
   * Formats filename at [[path]] with scalafmt.

scalafmt-benchmarks/src/test/scala/org/scalafmt/benchmarks/BenchmarkOK.scala → scalafmt-benchmarks/src/test/scala-2.12/org/scalafmt/benchmarks/BenchmarkOK.scala

@@ -1,5 +1,6 @@
 package org.scalafmt.benchmarks
 
+import benchmarks.MacroBenchmark
 import org.scalafmt.benchmarks.Micro.ScalaJsFile
 import org.scalatest.FunSuite
 

scalafmt-cli/src/main/scala/org/scalafmt/cli/CompatParCollections.scala

@@ -0,0 +1,15 @@
+package org.scalafmt.cli
+
+private[cli] object CompatParCollections {
+  val Converters = {
+    import Compat._
+    {
+      import scala.collection.parallel._
+      CollectionConverters
+    }
+  }
+
+  object Compat {
+    object CollectionConverters
+  }
+}

scalafmt-cli/src/main/scala/org/scalafmt/cli/ScalafmtCoreRunner.scala

@@ -1,11 +1,13 @@
 package org.scalafmt.cli
+
 import java.util.concurrent.atomic.{AtomicInteger, AtomicReference}
 import java.util.function.UnaryOperator
 
 import metaconfig.Configured
 import org.scalafmt.Error.{MisformattedFile, NoMatchingFiles}
 import org.scalafmt.{Formatted, Scalafmt, Versions}
 import org.scalafmt.config.{FilterMatcher, ScalafmtConfig}
+import org.scalafmt.cli.CompatParCollections.Converters._
 import org.scalafmt.util.OsSpecific
 
 import scala.meta.internal.tokenizers.PlatformTokenizerCache

scalafmt-cli/src/main/scala/org/scalafmt/cli/TermDisplay.scala

@@ -39,7 +39,7 @@ object Terminal {
       None
 
   implicit class Ansi(val output: Writer) extends AnyVal {
-    private def control(n: Int, c: Char) = output.write(s"\033[" + n + c)
+    private def control(n: Int, c: Char) = output.write("\u001b[" + n + c)
 
     /**
       * Move up `n` squares

scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfDecoders.scala

@@ -18,7 +18,7 @@ trait ScalafmtConfDecoders {
   implicit lazy val eventReader: ConfDecoder[FormatEvent => Unit] =
     ConfDecoder.instance[FormatEvent => Unit] {
       case _ =>
-        Configured.Ok((_: FormatEvent) => Unit)
+        Configured.Ok((_: FormatEvent) => ())
     }
   implicit lazy val parseReader: ConfDecoder[MetaParser] = {
     ReaderUtil.oneOf[MetaParser](parseSource, parseStat, parseCase)

scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtRunner.scala

@@ -16,7 +16,7 @@ import scala.meta.parsers.Parse
   */
 case class ScalafmtRunner(
     debug: Boolean = false,
-    eventCallback: FormatEvent => Unit = _ => Unit,
+    eventCallback: FormatEvent => Unit = _ => (),
     parser: Parse[_ <: Tree] = Parse.parseSource,
     optimizer: ScalafmtOptimizer = ScalafmtOptimizer.default,
     maxStateVisits: Int = 1000000,
@@ -84,7 +84,7 @@ object ScalafmtRunner {
     */
   val default = ScalafmtRunner(
     debug = false,
-    eventCallback = _ => Unit,
+    eventCallback = _ => (),
     parser = scala.meta.parsers.Parse.parseSource,
     optimizer = ScalafmtOptimizer.default,
     maxStateVisits = 1000000