Merge remote-tracking branch 'origin/master' into mergeable-repo-configurations

Author: eugeniyk

.scalafmt.conf

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

.travis.yml

@@ -6,6 +6,7 @@ dist: xenial
 
 scala: 
   - 2.13.2
+  - 2.12.10
 
 jdk:
   - openjdk8
@@ -26,7 +27,7 @@ jobs:
   include:
   - stage: release
     jdk: openjdk8
-    script: docker login -u $DOCKER_USER -p $DOCKER_PASS && sbt docker:publish
+    script: docker login -u $DOCKER_USER -p $DOCKER_PASS && sbt core/docker:publish
     name: docker
   - script: sbt ci-release
     name: jar
@@ -55,7 +56,7 @@ after_success:
 notifications:
   webhooks:
     urls:
-    - https://webhooks.gitter.im/e/0c488817d5dc313a8cc7
+    - https://webhooks.gitter.im/e/423a40e87e9aec4665dc
     on_success: change
     on_failure: always
     on_start: never

README.md

@@ -3,9 +3,9 @@
 </p>
 
 # Scala Steward
-[![Build Status](https://travis-ci.com/fthomas/scala-steward.svg?branch=master)](https://travis-ci.com/fthomas/scala-steward)
-[![codecov](https://codecov.io/gh/fthomas/scala-steward/branch/master/graph/badge.svg)](https://codecov.io/gh/fthomas/scala-steward)
-[![Join the chat at https://gitter.im/fthomas/scala-steward](https://badges.gitter.im/fthomas/scala-steward.svg)](https://gitter.im/fthomas/scala-steward?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://travis-ci.com/scala-steward-org/scala-steward.svg?branch=master)](https://travis-ci.com/scala-steward-org/scala-steward)
+[![codecov](https://codecov.io/gh/scala-steward-org/scala-steward/branch/master/graph/badge.svg)](https://codecov.io/gh/scala-steward-org/scala-steward)
+[![Join the chat at https://gitter.im/scala-steward-org/scala-steward](https://badges.gitter.im/scala-steward-org/scala-steward.svg)](https://gitter.im/scala-steward-org/scala-steward?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Follow @ScalaSteward on Twitter](https://img.shields.io/twitter/follow/ScalaSteward.svg?logo=twitter&style=flat&color=blue)](https://twitter.com/ScalaSteward)
 [![Typelevel project](https://img.shields.io/badge/typelevel-project-blue.svg)](https://typelevel.org/projects/#scala-steward)
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
@@ -70,15 +70,19 @@ Thanks goes to these wonderful people for contributing to Scala Steward:
 * [Anil Kumar Myla](https://github.com/anilkumarmyla)
 * [Arjun Dhawan](https://github.com/arjun-1)
 * [Arulselvan Madhavan](https://github.com/ArulselvanMadhavan)
+* [Barry O'Neill](https://github.com/barryoneill)
 * [Bayram Kiran](https://github.com/kiranbayram)
+* [Brice Jaglin](https://github.com/bjaglin)
 * [Cédric Chantepie](https://github.com/cchantep)
 * [Christopher Davenport](https://github.com/ChristopherDavenport)
 * [Dale Wijnand](https://github.com/dwijnand)
 * [Daniel Pfeiffer](https://github.com/dpfeiffer)
 * [David Francoeur](https://github.com/daddykotex)
+* [Doug Roper](https://github.com/htmldoug)
 * [Eldar Yusupov](https://github.com/eyusupov)
 * [Erik Erlandson](https://github.com/erikerlandson)
 * [Erlend Hamnaberg](https://github.com/hamnis)
+* [eugeniyk](https://github.com/eugeniyk)
 * [Fabian](https://github.com/fg-devs)
 * [Felix Dietze](https://github.com/fdietze)
 * [Filipe Regadas](https://github.com/regadas)
@@ -91,6 +95,7 @@ Thanks goes to these wonderful people for contributing to Scala Steward:
 * [JCollier](https://github.com/Slakah)
 * [Jeff Martin](https://github.com/custommonkey)
 * [Jichao Ouyang](https://github.com/jcouyang)
+* [Joan Goyeau](https://github.com/joan38)
 * [José Eduardo Montenegro Cavalcanti de Oliveira](https://github.com/edumco)
 * [kalejami](https://github.com/kalejami)
 * [KAWACHI Takashi](https://github.com/tkawachi)
@@ -127,13 +132,16 @@ Using Scala Steward in your company and don't see it listed here?
 Consider creating PR to add your company to the list and join the community.
 
 * [Adform](https://site.adform.com/)
+* [Agoda](https://agoda.com/)
 * [AutoScout24](https://www.autoscout24.de/)
 * [Avast](https://avast.com)
+* [Babylon Health](https://www.babylonhealth.com/)
 * [Besedo](https://www.besedo.com/)
 * [Bitrock](http://www.bitrock.it/)
 * [Chartboost](https://www.chartboost.com/)
 * [Colisweb](https://www.colisweb.com/)
 * [commercetools](https://docs.commercetools.com/)
+* [Enliven Systems](https://enliven.systems)
 * [Evolution Gaming](https://www.evolutiongaming.com/)
 * [Firstbird](https://firstbird.com)
 * [Hellosoda](https://hellosoda.com/)

build.sbt

@@ -6,18 +6,22 @@ import sbtcrossproject.{CrossProject, CrossType, Platform}
 val groupId = "org.scala-steward"
 val projectName = "scala-steward"
 val rootPkg = groupId.replace("-", "")
-val gitHubOwner = "fthomas"
+val gitHubOwner = "scala-steward-org"
 
 val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map(
   "core" -> List(JVMPlatform),
-  "plugin" -> List(JVMPlatform)
+  "sbt-plugin" -> List(JVMPlatform),
+  "mill-plugin" -> List(JVMPlatform)
 )
 
+val Scala212 = "2.12.10"
+val Scala213 = "2.13.2"
+
 /// projects
 
 lazy val root = project
   .in(file("."))
-  .aggregate(core.jvm, plugin.jvm)
+  .aggregate(core.jvm, `sbt-plugin`.jvm, `mill-plugin`.jvm)
   .settings(commonSettings)
   .settings(noPublishSettings)
 
@@ -51,7 +55,7 @@ lazy val core = myCrossProject("core")
       Dependencies.scalacacheCaffeine,
       Dependencies.scalacacheCatsEffect,
       Dependencies.logbackClassic % Runtime,
-      Dependencies.catsKernelLaws % Test,
+      Dependencies.catsLaws % Test,
       Dependencies.circeLiteral % Test,
       Dependencies.disciplineScalatest % Test,
       Dependencies.http4sDsl % Test,
@@ -80,11 +84,21 @@ lazy val core = myCrossProject("core")
       }
     },
     buildInfoKeys := Seq[BuildInfoKey](
+      organization,
       version,
       scalaVersion,
       scalaBinaryVersion,
       sbtVersion,
-      BuildInfoKey.map(git.gitHeadCommit) { case (k, v) => k -> v.getOrElse("master") }
+      BuildInfoKey.map(git.gitHeadCommit) { case (k, v) => k -> v.getOrElse("master") },
+      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 / moduleRootPkg) {
+        case (_, v) => "millPluginModuleRootPkg" -> v
+      }
     ),
     buildInfoPackage := moduleRootPkg.value,
     initialCommands += s"""
@@ -109,17 +123,23 @@ lazy val core = myCrossProject("core")
     """,
     fork in run := true,
     fork in Test := true,
-    Compile / unmanagedResourceDirectories ++= (plugin.jvm / Compile / unmanagedSourceDirectories).value
+    Compile / unmanagedResourceDirectories ++= (`sbt-plugin`.jvm / Compile / unmanagedSourceDirectories).value
   )
 
-lazy val plugin = myCrossProject("plugin")
+lazy val `sbt-plugin` = myCrossProject("sbt-plugin")
   .settings(noPublishSettings)
   .settings(
-    scalaVersion := "2.12.11",
+    scalaVersion := Scala212,
     sbtPlugin := true,
     Compile / compile / wartremoverErrors -= Wart.Equals
   )
 
+lazy val `mill-plugin` = myCrossProject("mill-plugin")
+  .settings(
+    crossScalaVersions := Seq(Scala213, Scala212),
+    libraryDependencies += Dependencies.mill.value % Provided
+  )
+
 /// settings
 
 def myCrossProject(name: String): CrossProject =
@@ -129,7 +149,7 @@ def myCrossProject(name: String): CrossProject =
     .in(file(s"modules/$name"))
     .settings(
       moduleName := s"$projectName-$name",
-      moduleRootPkg := s"$rootPkg.$name"
+      moduleRootPkg := s"$rootPkg.${name.replace('-', '.')}"
     )
     .settings(commonSettings)
     // workaround for https://github.com/portable-scala/sbt-crossproject/issues/74
@@ -151,6 +171,7 @@ lazy val commonSettings = Def.settings(
 )
 
 lazy val compileSettings = Def.settings(
+  scalaVersion := Scala213,
   doctestTestFramework := DoctestTestFramework.ScalaCheck,
   wartremoverErrors ++= Seq(Wart.TraversableOps),
   Compile / compile / wartremoverErrors ++= Seq(Wart.Equals)
@@ -177,20 +198,23 @@ lazy val metadataSettings = Def.settings(
 )
 
 lazy val dockerSettings = Def.settings(
-  dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE")).getOrElse("openjdk:8-jre-alpine"),
+  dockerBaseImage := Option(System.getenv("DOCKER_BASE_IMAGE")).getOrElse("openjdk:8-jdk-alpine"),
   dockerCommands ++= {
     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
     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"apk --no-cache add bash git ca-certificates maven && wget $sbtUrl && tar -xf $sbtTgz && rm -f $sbtTgz"
+        s"curl -L https://github.com/lihaoyi/mill/releases/download/$millVersion/$millVersion > /usr/local/bin/mill && chmod +x /usr/local/bin/mill"
       )
     )
   },
-  Docker / packageName := s"${gitHubOwner}/${name.value}",
+  Docker / packageName := s"fthomas/${name.value}",
   dockerUpdateLatest := true,
   dockerEntrypoint += "--disable-sandbox",
   dockerEnvVars := Map("PATH" -> "/opt/docker/sbt/bin:${PATH}")
@@ -218,7 +242,7 @@ lazy val scaladocSettings = Def.settings(
 lazy val installPlugin = taskKey[Unit]("Copies StewardPlugin.scala into global plugins directory.")
 installPlugin := {
   val name = "StewardPlugin.scala"
-  val source = (plugin.jvm / Compile / sources).value.find(_.name == name).get
+  val source = (`sbt-plugin`.jvm / Compile / sources).value.find(_.name == name).get
   val target = file(System.getProperty("user.home")) / ".sbt" / "1.0" / "plugins" / name
   IO.copyFile(source, target)
 }
@@ -236,7 +260,7 @@ runSteward := Def.taskDyn {
   val args = Seq(
     Seq("--workspace", s"$projectDir/workspace"),
     Seq("--repos-file", s"$projectDir/repos.md"),
-    Seq("--default-repo-config", s"$projectDir/default.scala-steward.conf"),
+    Seq("--default-repo-conf", s"$projectDir/default.scala-steward.conf"),
     Seq("--git-author-email", s"me@$projectName.org"),
     Seq("--vcs-login", projectName),
     Seq("--git-ask-pass", s"$home/.github/askpass/$projectName.sh"),

docs/running.md

@@ -45,6 +45,13 @@ The [`git-ask-pass` option](https://git-scm.com/docs/gitcredentials) must specif
 You can also provide a `--scalafix-migrations` option with the path to a file containing scalafix migrations.
 More information can be found [here][migrations]
 
+### Workspace
+
+The workspace directory (specified with `--workspace`) provides a location for cache and temporary files.  
+
+It is important to persist this workspace between runs.  Without this, Scala Steward will be unable to observe 
+repo-specific preferences (such as [pullRequests.frequency](repo-specific-configuration.md)) correctly.   
+
 ### Private repositories
 
 If you run Scala Steward for your own private projects, the option `--do-not-fork` can be required, not to fork.
@@ -66,6 +73,15 @@ These variables will be accessible (in sbt) to all of the projects that Scala St
 If your projects require credentials, you can also provide global credentials in the `$HOME/.sbt/1.0/credentials.sbt` file. 
 The file should contain a single line: `credentials += Credentials("Some Nexus Repository Manager", "my.artifact.repo.net", "admin", "admin123")`.
 
+#### sbt 0.13 workaround
+For sbt 0.13 builds, scala-steward [may be unable](https://gitter.im/fthomas/scala-steward?at=5f0573dac7d15f7d0f7b15ac) to extract credentials for private resolvers. Instead, you can [configure coursier directly](https://get-coursier.io/docs/other-credentials) by adding `~/.config/coursier/credentials.properties`:
+```scala
+example1.username=username
+example1.password=password
+example1.host=artifacts.example.com
+example1.realm=Example Realm
+```
+
 ### Running locally from sbt
 
 #### Sample run for Gitlab

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

@@ -29,12 +29,26 @@ migrations = [
     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: "dev.zio",
     artifactIds: ["zio-test"],
     newVersion: "1.0.0-RC18",
       rewriteRules: ["github:zio/zio/CurriedAssert"]
   },
+  {
+    groupId: "org.http4s",
+    artifactIds: ["http4s-.*"],
+    newVersion: "0.21.5",
+    rewriteRules: ["dependency:[email protected]:http4s-scalafix:0.21.5"],
+    doc: "https://github.com/http4s/http4s/releases/tag/v0.21.5"
+  },
   {
     groupId: "org.http4s",
     artifactIds: ["http4s-.*"],
@@ -75,5 +89,12 @@ migrations = [
     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: "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"
   }
 ]

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

@@ -37,7 +37,7 @@ object Cli {
   final case class Args(
       workspace: String,
       reposFile: String,
-      defaultRepoConf: String = "default.scala-steward.conf",
+      defaultRepoConf: Option[String] = None,
       gitAuthorName: String = "Scala Steward",
       gitAuthorEmail: String,
       vcsType: SupportedVCS = SupportedVCS.GitHub,

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

@@ -54,7 +54,7 @@ import scala.sys.process.Process
 final case class Config(
     workspace: File,
     reposFile: File,
-    defaultRepoConfigFile: File,
+    defaultRepoConfigFile: Option[File],
     gitAuthor: Author,
     vcsType: SupportedVCS,
     vcsApiHost: Uri,
@@ -90,7 +90,7 @@ object Config {
       Config(
         workspace = args.workspace.toFile,
         reposFile = args.reposFile.toFile,
-        defaultRepoConfigFile = args.defaultRepoConf.toFile,
+        defaultRepoConfigFile = args.defaultRepoConf.map(_.toFile),
         gitAuthor = Author(args.gitAuthorName, args.gitAuthorEmail),
         vcsType = args.vcsType,
         vcsApiHost = args.vcsApiHost,

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

@@ -24,6 +24,7 @@ import org.http4s.client.Client
 import org.http4s.client.asynchttpclient.AsyncHttpClient
 import org.scalasteward.core.buildtool.BuildToolDispatcher
 import org.scalasteward.core.buildtool.maven.MavenAlg
+import org.scalasteward.core.buildtool.mill.MillAlg
 import org.scalasteward.core.buildtool.sbt.SbtAlg
 import org.scalasteward.core.coursier.{CoursierAlg, VersionsCache}
 import org.scalasteward.core.edit.EditAlg
@@ -83,6 +84,7 @@ object Context {
       implicit val updateAlg: UpdateAlg[F] = new UpdateAlg[F]
       implicit val mavenAlg: MavenAlg[F] = MavenAlg.create[F]
       implicit val sbtAlg: SbtAlg[F] = SbtAlg.create[F]
+      implicit val millAlg: MillAlg[F] = MillAlg.create[F]
       implicit val buildToolDispatcher: BuildToolDispatcher[F] = BuildToolDispatcher.create[F]
       implicit val refreshErrorAlg: RefreshErrorAlg[F] =
         new RefreshErrorAlg[F](new JsonKeyValueStore("refresh_error", "1", kvsPrefix))