Merge branch 'master' into mergeable-repo-configurations

Author: eugeniyk

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 2.6.4
+version = 2.7.2
 assumeStandardLibraryStripMargin = true
 align.openParenCallSite = false
 align.openParenDefnSite = false

.travis.yml

@@ -5,7 +5,7 @@ os: linux
 dist: xenial
 
 scala: 
-  - 2.13.2
+  - 2.13.3
   - 2.12.10
 
 jdk:

README.md

@@ -78,6 +78,7 @@ Thanks goes to these wonderful people for contributing to Scala Steward:
 * [Dale Wijnand](https://github.com/dwijnand)
 * [Daniel Pfeiffer](https://github.com/dpfeiffer)
 * [David Francoeur](https://github.com/daddykotex)
+* [Don Smith III](https://github.com/cactauz)
 * [Doug Roper](https://github.com/htmldoug)
 * [Eldar Yusupov](https://github.com/eyusupov)
 * [Erik Erlandson](https://github.com/erikerlandson)
@@ -151,9 +152,9 @@ Consider creating PR to add your company to the list and join the community.
 * [Lightbend](https://www.lightbend.com/)
 * [Ocado Technology](https://ocadotechnology.com/)
 * [PlayQ](https://www.playq.com/)
+* [Precog](https://precog.com/)
 * [Rewards Network](https://www.rewardsnetwork.com/)
 * [Septeni Original](https://www.septeni-original.co.jp)
-* [SlamData](https://slamdata.com/)
 * [Snowplow Analytics](https://snowplowanalytics.com/)
 * [SoftwareMill](https://softwaremill.com)
 * [Spotify](https://www.spotify.com)

build.sbt

@@ -15,7 +15,7 @@ val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map(
 )
 
 val Scala212 = "2.12.10"
-val Scala213 = "2.13.2"
+val Scala213 = "2.13.3"
 
 /// projects
 
@@ -35,6 +35,7 @@ lazy val core = myCrossProject("core")
       Dependencies.attoCore,
       Dependencies.betterFiles,
       Dependencies.caseApp,
+      Dependencies.catsCore,
       Dependencies.catsEffect,
       Dependencies.circeConfig,
       Dependencies.circeGeneric,
@@ -61,7 +62,8 @@ lazy val core = myCrossProject("core")
       Dependencies.http4sDsl % Test,
       Dependencies.refinedScalacheck % Test,
       Dependencies.scalacheck % Test,
-      Dependencies.scalaTest % Test
+      Dependencies.scalaTestFunSuite % Test,
+      Dependencies.scalaTestShouldMatcher % Test
     ),
     assembly / test := {},
     assemblyMergeStrategy in assembly := {
@@ -90,14 +92,14 @@ lazy val core = myCrossProject("core")
       scalaBinaryVersion,
       sbtVersion,
       BuildInfoKey.map(git.gitHeadCommit) { case (k, v) => k -> v.getOrElse("master") },
-      BuildInfoKey.map(`sbt-plugin`.jvm / moduleRootPkg) {
-        case (_, v) => "sbtPluginModuleRootPkg" -> v
+      BuildInfoKey.map(`sbt-plugin`.jvm / moduleRootPkg) { case (_, v) =>
+        "sbtPluginModuleRootPkg" -> v
       },
-      BuildInfoKey.map(`mill-plugin`.jvm / moduleName) {
-        case (_, v) => "millPluginModuleName" -> v
+      BuildInfoKey.map(`mill-plugin`.jvm / moduleName) { case (_, v) =>
+        "millPluginModuleName" -> v
       },
-      BuildInfoKey.map(`mill-plugin`.jvm / moduleRootPkg) {
-        case (_, v) => "millPluginModuleRootPkg" -> v
+      BuildInfoKey.map(`mill-plugin`.jvm / moduleRootPkg) { case (_, v) =>
+        "millPluginModuleRootPkg" -> v
       }
     ),
     buildInfoPackage := moduleRootPkg.value,
@@ -119,7 +121,7 @@ lazy val core = myCrossProject("core")
       implicit val ioContextShift: ContextShift[IO] = IO.contextShift(ExecutionContext.global)
       implicit val ioTimer: Timer[IO] = IO.timer(ExecutionContext.global)
       implicit val logger: Logger[IO] = Slf4jLogger.getLogger[IO]
-      implicit val client: Client[IO] = AsyncHttpClient.allocate[IO]().map(_._1).unsafeRunSync
+      implicit val client: Client[IO] = AsyncHttpClient.allocate[IO]().map(_._1).unsafeRunSync()
     """,
     fork in run := true,
     fork in Test := true,
@@ -137,7 +139,7 @@ lazy val `sbt-plugin` = myCrossProject("sbt-plugin")
 lazy val `mill-plugin` = myCrossProject("mill-plugin")
   .settings(
     crossScalaVersions := Seq(Scala213, Scala212),
-    libraryDependencies += Dependencies.mill.value % Provided
+    libraryDependencies += Dependencies.millScalalib.value % Provided
   )
 
 /// settings
@@ -203,14 +205,14 @@ lazy val dockerSettings = Def.settings(
     val getSbtVersion = sbtVersion.value
     val sbtTgz = s"sbt-$getSbtVersion.tgz"
     val sbtUrl = s"https://github.com/sbt/sbt/releases/download/v$getSbtVersion/$sbtTgz"
-    val millVersion = Dependencies.mill.value.revision
+    val millVersion = Dependencies.millVersion.value
     Seq(
       Cmd("USER", "root"),
       Cmd("RUN", "apk --no-cache add bash git ca-certificates curl maven"),
       Cmd("RUN", s"wget $sbtUrl && tar -xf $sbtTgz && rm -f $sbtTgz"),
       Cmd(
         "RUN",
-        s"curl -L https://github.com/lihaoyi/mill/releases/download/$millVersion/$millVersion > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
+        s"curl -L https://github.com/lihaoyi/mill/releases/download/${millVersion.split("-").head}/$millVersion > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
       )
     )
   },

modules/core/src/main/resources/scalafix-migrations.conf

@@ -1,16 +1,16 @@
 migrations = [
-  {
-    groupId: "org.scalaz",
-    artifactIds: ["scalaz-.*"],
-    newVersion: "7.3.0",
-    rewriteRules: ["https://raw.githubusercontent.com/scalaz/scalazfix/master/rules/src/main/scala/scalaz/ScalazFix.scala"]
-  },
   {
     groupId: "co.fs2",
     artifactIds: ["fs2-.*"],
     newVersion: "1.0.0",
     rewriteRules: ["github:functional-streams-for-scala/fs2/v1?sha=v1.0.5"]
   },
+  {
+    groupId: "com.spotify",
+    artifactIds: ["scio-.*"],
+    newVersion: "0.8.0",
+    rewriteRules: ["github:spotify/scio/MigrateV0_8?sha=v0.8.0"]
+  },
   {
     groupId: "com.spotify",
     artifactIds: ["scio-.*"],
@@ -23,24 +23,25 @@ migrations = [
     ],
     doc: "https://github.com/spotify/scio/blob/v0.7.0/site/src/paradox/migrations/v0.7.0-Migration-Guide.md#automated-migration"
   },
-  {
-    groupId: "com.spotify",
-    artifactIds: ["scio-.*"],
-    newVersion: "0.8.0",
-    rewriteRules: ["github:spotify/scio/MigrateV0_8?sha=v0.8.0"]
-  },
   {
     groupId: "com.twilio",
     artifactIds: ["sbt-guardrail"],
     newVersion: "0.59.0.1",
     rewriteRules: ["https://raw.githubusercontent.com/blast-hardcheese/guardrail-scalafix-rules/master/rules/src/main/scala/fix/GuardrailScalaResponseTypes.scala"],
     doc: "https://github.com/twilio/guardrail/blob/master/MIGRATING.md#0590-may-contain-type-and-package-naming-changes-that-will-require-changes-in-consuming-code"
   },
+  {
+    groupId: "com.typesafe.akka",
+    artifactIds: ["akka-http.*"],
+    newVersion: "10.2.0",
+    rewriteRules: ["dependency:[email protected]:akka-http-scalafix-rules:10.2.0"],
+    doc: "https://doc.akka.io/docs/akka-http/10.2/migration-guide/migration-guide-10.2.x.html#akka-http-10-1-x-10-2-0"
+  },
   {
     groupId: "dev.zio",
     artifactIds: ["zio-test"],
     newVersion: "1.0.0-RC18",
-      rewriteRules: ["github:zio/zio/CurriedAssert"]
+    rewriteRules: ["github:zio/zio/CurriedAssert?sha=v1.0.0-RC18"]
   },
   {
     groupId: "org.http4s",
@@ -57,18 +58,17 @@ migrations = [
     doc: "https://github.com/http4s/http4s/blob/v0.20.0/docs/src/main/tut/upgrading.md"
   },
   {
-    groupId: "org.typelevel",
-    artifactIds: ["cats-core"],
-    newVersion: "1.0.0",
-    rewriteRules: ["https://raw.githubusercontent.com/typelevel/cats/master/scalafix/rules/src/main/scala/fix/Cats_v1_0_0.scala"],
-    doc: "https://github.com/typelevel/cats/blob/v1.0.0/scalafix/README.md"
+    groupId: "org.manatki",
+    artifactIds: ["derevo-.*"],
+    newVersion: "0.11.0",
+    rewriteRules: ["https://gist.githubusercontent.com/REDNBLACK/9bc56ad71e4b01a63001339fa61b4cfd/raw/5f1cd32713c3235a83fe2d1d182bd71a001ef464/derevo-v0.11.0.scala"],
+    doc: "https://github.com/manatki/derevo/blob/0.11.3/README.md#breaking-changes-in-011"
   },
   {
-    groupId: "org.scalatest",
-    artifactIds: ["scalatest"],
-    newVersion: "3.0.8",
-    rewriteRules: ["https://raw.githubusercontent.com/scalatest/autofix/e4de53fa40fac423bd64d165ff36bde38ce52388/3.0.x/rules/src/main/scala/org/scalatest/autofix/v3_0_x/RenameDeprecatedPackage.scala"],
-    doc: "https://github.com/scalatest/autofix/blob/master/3.0.x/README.md"
+    groupId: "org.scalacheck",
+    artifactIds: ["scalacheck"],
+    newVersion: "1.14.1",
+    rewriteRules: ["github:typelevel/scalacheck/v1_14_1?sha=1.14.1"]
   },
   {
     groupId: "org.scalatest",
@@ -78,23 +78,31 @@ migrations = [
     doc: "https://github.com/scalatest/autofix/blob/master/3.1.x/README.md"
   },
   {
-    groupId: "org.scalacheck",
-    artifactIds: ["scalacheck"],
-    newVersion: "1.14.1",
-    rewriteRules: ["github:typelevel/scalacheck/v1_14_1?sha=3fc537dde9d8fdf951503a8d8b027a568d52d055"]
+    groupId: "org.scalatest",
+    artifactIds: ["scalatest"],
+    newVersion: "3.0.8",
+    rewriteRules: ["https://raw.githubusercontent.com/scalatest/autofix/e4de53fa40fac423bd64d165ff36bde38ce52388/3.0.x/rules/src/main/scala/org/scalatest/autofix/v3_0_x/RenameDeprecatedPackage.scala"],
+    doc: "https://github.com/scalatest/autofix/blob/master/3.0.x/README.md"
   },
   {
-    groupId: "org.manatki",
-    artifactIds: ["derevo-.*"],
-    newVersion: "0.11.0",
-    rewriteRules: ["https://gist.githubusercontent.com/REDNBLACK/9bc56ad71e4b01a63001339fa61b4cfd/raw/5f1cd32713c3235a83fe2d1d182bd71a001ef464/derevo-v0.11.0.scala"],
-    doc: "https://github.com/manatki/derevo/blob/0.11.3/README.md#breaking-changes-in-011"
+    groupId: "org.scalaz",
+    artifactIds: ["scalaz-.*"],
+    newVersion: "7.3.0",
+    rewriteRules: ["https://raw.githubusercontent.com/scalaz/scalazfix/v0.1.2/rules/src/main/scala/scalaz/ScalazFix.scala"]
   },
   {
-    groupId: "com.typesafe.akka",
-    artifactIds: ["akka-http.*"],
-    newVersion: "10.2.0",
-    rewriteRules: ["dependency:[email protected]:akka-http-scalafix-rules:10.2.0"],
-    doc: "https://doc.akka.io/docs/akka-http/10.2/migration-guide/migration-guide-10.2.x.html#akka-http-10-1-x-10-2-0"
+    groupId: "org.typelevel",
+    artifactIds: ["cats-core"],
+    newVersion: "2.2.0",
+    rewriteRules: ["github:typelevel/cats/Cats_v2_2_0"],
+    doc: "https://github.com/typelevel/cats/blob/master/scalafix/README.md#migration-to-cats-v220",
+    scalacOptions: ["-P:semanticdb:synthetics:on"]
+  },
+  {
+    groupId: "org.typelevel",
+    artifactIds: ["cats-core"],
+    newVersion: "1.0.0",
+    rewriteRules: ["https://raw.githubusercontent.com/typelevel/cats/v2.1.1/scalafix/rules/src/main/scala/fix/Cats_v1_0_0.scala"],
+    doc: "https://github.com/typelevel/cats/blob/v2.1.1/scalafix/README.md"
   }
 ]

modules/core/src/main/scala/org/scalasteward/core/application/Cli.scala

@@ -19,7 +19,7 @@ package org.scalasteward.core.application
 import caseapp._
 import caseapp.core.Error.MalformedValue
 import caseapp.core.argparser.{ArgParser, SimpleArgParser}
-import cats.implicits._
+import cats.syntax.all._
 import org.http4s.Uri
 import org.http4s.syntax.literals._
 import org.scalasteward.core.application.Cli._
@@ -56,7 +56,8 @@ object Cli {
       groupMigrations: Option[String] = None,
       cacheTtl: FiniteDuration = 2.hours,
       cacheMissDelay: FiniteDuration = 0.milliseconds,
-      bitbucketServerUseDefaultReviewers: Boolean = false
+      bitbucketServerUseDefaultReviewers: Boolean = false,
+      gitlabMergeWhenPipelineSucceeds: Boolean = false
   )
 
   final case class EnvVar(name: String, value: String)

modules/core/src/main/scala/org/scalasteward/core/application/Config.scala

@@ -72,7 +72,8 @@ final case class Config(
     groupMigrations: Option[File],
     cacheTtl: FiniteDuration,
     cacheMissDelay: FiniteDuration,
-    bitbucketServerUseDefaultReviewers: Boolean
+    bitbucketServerUseDefaultReviewers: Boolean,
+    gitlabMergeWhenPipelineSucceeds: Boolean
 ) {
   def vcsUser[F[_]](implicit F: Sync[F]): F[AuthenticatedUser] = {
     val urlWithUser = util.uri.withUserInfo.set(UserInfo(vcsLogin, None))(vcsApiHost).renderString
@@ -108,7 +109,8 @@ object Config {
         groupMigrations = args.groupMigrations.map(_.toFile),
         cacheTtl = args.cacheTtl,
         cacheMissDelay = args.cacheMissDelay,
-        bitbucketServerUseDefaultReviewers = args.bitbucketServerUseDefaultReviewers
+        bitbucketServerUseDefaultReviewers = args.bitbucketServerUseDefaultReviewers,
+        gitlabMergeWhenPipelineSucceeds = args.gitlabMergeWhenPipelineSucceeds
       )
     }
 }

modules/core/src/main/scala/org/scalasteward/core/application/SelfCheckAlg.scala

@@ -16,7 +16,7 @@
 
 package org.scalasteward.core.application
 
-import cats.implicits._
+import cats.syntax.all._
 import io.chrisdavenport.log4cats.Logger
 import org.http4s.Uri
 import org.scalasteward.core.util.{HttpExistenceClient, MonadThrowable}

modules/core/src/main/scala/org/scalasteward/core/application/StewardAlg.scala

@@ -19,7 +19,7 @@ package org.scalasteward.core.application
 import better.files.File
 import cats.Monad
 import cats.effect.ExitCode
-import cats.implicits._
+import cats.syntax.all._
 import fs2.Stream
 import io.chrisdavenport.log4cats.Logger
 import org.scalasteward.core.buildtool.sbt.SbtAlg
@@ -64,8 +64,8 @@ final class StewardAlg[F[_]](implicit
     fileAlg.readFile(reposFile).map { maybeContent =>
       val regex = """-\s+(.+)/([^/]+)""".r
       val content = maybeContent.getOrElse("")
-      content.linesIterator.collect {
-        case regex(owner, repo) => Repo(owner.trim, repo.trim)
+      content.linesIterator.collect { case regex(owner, repo) =>
+        Repo(owner.trim, repo.trim)
       }.toList
     }
 

modules/core/src/main/scala/org/scalasteward/core/application/SupportedVCS.scala

@@ -19,7 +19,7 @@ package org.scalasteward.core.application
 import caseapp.core.Error.MalformedValue
 import caseapp.core.argparser.ArgParser
 import cats.Eq
-import cats.implicits._
+import cats.syntax.all._
 
 sealed trait SupportedVCS {
   import SupportedVCS.{Bitbucket, BitbucketServer, GitHub, Gitlab}