Merge branch 'main' into version-scheme-label

Author: mzuehlke

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.6.1
+version = 3.7.0
 runner.dialect = scala213
 assumeStandardLibraryStripMargin = true
 align.openParenCallSite = false

build.sbt

@@ -348,6 +348,7 @@ lazy val dockerSettings = Def.settings(
       Cmd("RUN", "apk --no-cache add bash git ca-certificates curl maven openssh nodejs npm"),
       Cmd("RUN", s"wget $sbtUrl && tar -xf $sbtTgz && rm -f $sbtTgz"),
       Cmd("RUN", s"curl -L $millUrl > $millBin && chmod +x $millBin"),
+      Cmd("RUN", "curl -sSLf https://virtuslab.github.io/scala-cli-packages/scala-setup.sh | sh"),
       Cmd("RUN", s"curl -L https://git.io/coursier-cli > $coursierBin && chmod +x $coursierBin"),
       Cmd("RUN", s"$coursierBin install --install-dir $binDir scalafix scalafmt"),
       Cmd("RUN", "npm install --global yarn")

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

@@ -290,8 +290,8 @@ object Cli {
       "The Azure organization (required when --forge-type is azure-repos)"
     ).orNone
 
-  private val azureReposConfig: Opts[AzureReposConfig] =
-    azureReposOrganization.map(AzureReposConfig.apply)
+  private val azureReposCfg: Opts[AzureReposCfg] =
+    azureReposOrganization.map(AzureReposCfg.apply)
 
   private val refreshBackoffPeriod: Opts[FiniteDuration] = {
     val default = 0.days
@@ -338,7 +338,7 @@ object Cli {
     bitbucketCfg,
     bitbucketServerCfg,
     gitLabCfg,
-    azureReposConfig,
+    azureReposCfg,
     gitHubApp,
     urlCheckerTestUrls,
     defaultMavenRepo,

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

@@ -65,7 +65,7 @@ final case class Config(
     bitbucketCfg: BitbucketCfg,
     bitbucketServerCfg: BitbucketServerCfg,
     gitLabCfg: GitLabCfg,
-    azureReposConfig: AzureReposConfig,
+    azureReposCfg: AzureReposCfg,
     githubApp: Option[GitHubApp],
     urlCheckerTestUrls: Nel[Uri],
     defaultResolver: Resolver,
@@ -84,6 +84,15 @@ final case class Config(
       prompt = s"Password for '$urlWithUser': "
       password <- processAlg.exec(Nel.of(gitCfg.gitAskPass.pathAsString, prompt), rootDir)
     } yield AuthenticatedUser(forgeCfg.login, password.mkString.trim)
+
+  def forgeSpecificCfg: ForgeSpecificCfg =
+    forgeCfg.tpe match {
+      case ForgeType.AzureRepos      => azureReposCfg
+      case ForgeType.Bitbucket       => bitbucketCfg
+      case ForgeType.BitbucketServer => bitbucketServerCfg
+      case ForgeType.GitHub          => GitHubCfg()
+      case ForgeType.GitLab          => gitLabCfg
+    }
 }
 
 object Config {
@@ -129,22 +138,27 @@ object Config {
       disableDefaults: Boolean
   )
 
-  final case class BitbucketServerCfg(
-      useDefaultReviewers: Boolean
-  )
+  sealed trait ForgeSpecificCfg extends Product with Serializable
+
+  final case class AzureReposCfg(
+      organization: Option[String]
+  ) extends ForgeSpecificCfg
 
   final case class BitbucketCfg(
       useDefaultReviewers: Boolean
-  )
+  ) extends ForgeSpecificCfg
+
+  final case class BitbucketServerCfg(
+      useDefaultReviewers: Boolean
+  ) extends ForgeSpecificCfg
+
+  final case class GitHubCfg(
+  ) extends ForgeSpecificCfg
 
   final case class GitLabCfg(
       mergeWhenPipelineSucceeds: Boolean,
       requiredReviewers: Option[Int]
-  )
-
-  final case class AzureReposConfig(
-      organization: Option[String]
-  )
+  ) extends ForgeSpecificCfg
 
   sealed trait StewardUsage
   object StewardUsage {

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

@@ -30,6 +30,7 @@ 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.buildtool.scalacli.ScalaCliAlg
 import org.scalasteward.core.client.ClientConfiguration
 import org.scalasteward.core.coursier.{CoursierAlg, VersionsCache}
 import org.scalasteward.core.data.Repo
@@ -75,6 +76,7 @@ final class Context[F[_]](implicit
     val repoCacheAlg: RepoCacheAlg[F],
     val repoConfigAlg: RepoConfigAlg[F],
     val sbtAlg: SbtAlg[F],
+    val scalaCliAlg: ScalaCliAlg[F],
     val scalafixMigrationsFinder: ScalafixMigrationsFinder,
     val scalafixMigrationsLoader: ScalafixMigrationsLoader[F],
     val scalafmtAlg: ScalafmtAlg[F],
@@ -206,7 +208,8 @@ object Context {
       implicit val httpJsonClient: HttpJsonClient[F] = new HttpJsonClient[F]
       implicit val repoCacheRepository: RepoCacheRepository[F] =
         new RepoCacheRepository[F](repoCacheStore)
-      implicit val forgeApiAlg: ForgeApiAlg[F] = ForgeSelection.forgeApiAlg[F](config, forgeUser)
+      implicit val forgeApiAlg: ForgeApiAlg[F] =
+        ForgeSelection.forgeApiAlg[F](config.forgeCfg, config.forgeSpecificCfg, forgeUser)
       implicit val forgeRepoAlg: ForgeRepoAlg[F] = new ForgeRepoAlg[F](config)
       implicit val updateInfoUrlFinder: UpdateInfoUrlFinder[F] =
         new UpdateInfoUrlFinder[F](config.forgeCfg)
@@ -221,6 +224,7 @@ object Context {
       implicit val updateAlg: UpdateAlg[F] = new UpdateAlg[F]
       implicit val mavenAlg: MavenAlg[F] = new MavenAlg[F](config)
       implicit val sbtAlg: SbtAlg[F] = new SbtAlg[F](config)
+      implicit val scalaCliAlg: ScalaCliAlg[F] = new ScalaCliAlg[F]
       implicit val millAlg: MillAlg[F] = new MillAlg[F]
       implicit val buildToolDispatcher: BuildToolDispatcher[F] = new BuildToolDispatcher[F]
       implicit val refreshErrorAlg: RefreshErrorAlg[F] =

modules/core/src/main/scala/org/scalasteward/core/buildtool/BuildToolDispatcher.scala

@@ -21,6 +21,7 @@ import cats.syntax.all._
 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.buildtool.scalacli.ScalaCliAlg
 import org.scalasteward.core.data.{Repo, Scope}
 import org.scalasteward.core.edit.scalafix.ScalafixMigration
 import org.scalasteward.core.repoconfig.RepoConfig
@@ -32,6 +33,7 @@ final class BuildToolDispatcher[F[_]](implicit
     mavenAlg: MavenAlg[F],
     millAlg: MillAlg[F],
     sbtAlg: SbtAlg[F],
+    scalaCliAlg: ScalaCliAlg[F],
     scalafmtAlg: ScalafmtAlg[F],
     F: Monad[F]
 ) {
@@ -54,7 +56,7 @@ final class BuildToolDispatcher[F[_]](implicit
   private def getBuildRoots(repo: Repo, repoConfig: RepoConfig): List[BuildRoot] =
     repoConfig.buildRootsOrDefault.map(buildRootCfg => BuildRoot(repo, buildRootCfg.relativePath))
 
-  private val allBuildTools = List(mavenAlg, millAlg, sbtAlg)
+  private val allBuildTools = List(mavenAlg, millAlg, sbtAlg, scalaCliAlg)
   private val fallbackBuildTool = List(sbtAlg)
 
   private def findBuildTools(buildRoot: BuildRoot): F[(BuildRoot, List[BuildToolAlg[F]])] =

modules/core/src/main/scala/org/scalasteward/core/buildtool/maven/MavenAlg.scala

@@ -58,7 +58,7 @@ final class MavenAlg[F[_]](config: Config)(implicit
 
   override def runMigration(buildRoot: BuildRoot, migration: ScalafixMigration): F[Unit] =
     logger.warn(
-      "Scalafix migrations are currently not supported in Maven projects, see https://github.com/scala-steward-org/scala-steward/issues/2839 for details"
+      s"Scalafix migrations are currently not supported in $name projects, see https://github.com/scala-steward-org/scala-steward/issues/2839 for details"
     )
 
   private def exec(command: Nel[String], repoDir: File): F[List[String]] =

modules/core/src/main/scala/org/scalasteward/core/buildtool/mill/MillAlg.scala

@@ -21,7 +21,6 @@ import cats.effect.MonadCancelThrow
 import cats.syntax.all._
 import org.scalasteward.core.buildtool.mill.MillAlg._
 import org.scalasteward.core.buildtool.{BuildRoot, BuildToolAlg}
-import org.scalasteward.core.data.Scope.Dependencies
 import org.scalasteward.core.data._
 import org.scalasteward.core.edit.scalafix.ScalafixMigration
 import org.scalasteward.core.io.{FileAlg, ProcessAlg, WorkspaceAlg}
@@ -42,7 +41,7 @@ final class MillAlg[F[_]](implicit
       .buildRootDir(buildRoot)
       .flatMap(buildRootDir => fileAlg.isRegularFile(buildRootDir / "build.sc"))
 
-  override def getDependencies(buildRoot: BuildRoot): F[List[Dependencies]] =
+  override def getDependencies(buildRoot: BuildRoot): F[List[Scope.Dependencies]] =
     for {
       buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
       predef = buildRootDir / "scala-steward.sc"
@@ -66,7 +65,7 @@ final class MillAlg[F[_]](implicit
 
   override def runMigration(buildRoot: BuildRoot, migration: ScalafixMigration): F[Unit] =
     logger.warn(
-      "Scalafix migrations are currently not supported in Mill projects, see https://github.com/scala-steward-org/scala-steward/issues/2838 for details"
+      s"Scalafix migrations are currently not supported in $name projects, see https://github.com/scala-steward-org/scala-steward/issues/2838 for details"
     )
 
   private def getMillVersion(buildRootDir: File): F[Option[Version]] =

modules/core/src/main/scala/org/scalasteward/core/buildtool/scalacli/ScalaCliAlg.scala

@@ -0,0 +1,64 @@
+/*
+ * Copyright 2018-2023 Scala Steward contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.scalasteward.core.buildtool.scalacli
+
+import cats.Monad
+import cats.syntax.all._
+import org.scalasteward.core.buildtool.sbt.SbtAlg
+import org.scalasteward.core.buildtool.{BuildRoot, BuildToolAlg}
+import org.scalasteward.core.data.Scope
+import org.scalasteward.core.edit.scalafix.ScalafixMigration
+import org.scalasteward.core.git.GitAlg
+import org.scalasteward.core.io.{FileAlg, ProcessAlg, WorkspaceAlg}
+import org.scalasteward.core.util.Nel
+import org.typelevel.log4cats.Logger
+
+final class ScalaCliAlg[F[_]](implicit
+    fileAlg: FileAlg[F],
+    gitAlg: GitAlg[F],
+    logger: Logger[F],
+    processAlg: ProcessAlg[F],
+    sbtAlg: SbtAlg[F],
+    workspaceAlg: WorkspaceAlg[F],
+    F: Monad[F]
+) extends BuildToolAlg[F] {
+  override def name: String = "Scala CLI"
+
+  override def containsBuild(buildRoot: BuildRoot): F[Boolean] = {
+    val buildRootPath = buildRoot.relativePath.dropWhile(Set('.', '/'))
+    gitAlg
+      .findFilesContaining(buildRoot.repo, "//> using lib ")
+      .map(_.exists(_.startsWith(buildRootPath)))
+  }
+
+  override def getDependencies(buildRoot: BuildRoot): F[List[Scope.Dependencies]] =
+    for {
+      buildRootDir <- workspaceAlg.buildRootDir(buildRoot)
+      exportDir = "tmp-sbt-build-for-scala-steward"
+      exportCmd =
+        Nel.of("scala-cli", "export", "--sbt", "--output", exportDir, buildRootDir.pathAsString)
+      _ <- processAlg.execSandboxed(exportCmd, buildRootDir)
+      exportBuildRoot = buildRoot.copy(relativePath = buildRoot.relativePath + s"/$exportDir")
+      dependencies <- sbtAlg.getDependencies(exportBuildRoot)
+      _ <- fileAlg.deleteForce(buildRootDir / exportDir)
+    } yield dependencies
+
+  override def runMigration(buildRoot: BuildRoot, migration: ScalafixMigration): F[Unit] =
+    logger.warn(
+      s"Scalafix migrations are currently not supported in $name projects, see https://github.com/VirtusLab/scala-cli/issues/647 for details"
+    )
+}

modules/core/src/main/scala/org/scalasteward/core/edit/update/ModulePositionScanner.scala

@@ -72,13 +72,13 @@ object ModulePositionScanner {
     mavenDependencyRegex(dependency).findAllIn(fileData.content).matchData.map { m =>
       val groupId = Substring.Position.fromMatch(fileData.path, m, dependency.groupId.value)
       val artifactId = Substring.Position.fromMatch(fileData.path, m, dependency.artifactId.name)
-      val version = Substring.Position.fromMatch(fileData.path, m, m.group(1))
+      val version = Substring.Position.fromMatch(fileData.path, m, m.group(2))
       ModulePosition(groupId, artifactId, version)
     }
 
   private def mavenDependencyRegex(dependency: Dependency): Regex = {
     val g = Regex.quote(dependency.groupId.value)
     val a = Regex.quote(dependency.artifactId.name)
-    raw"""<groupId>$g</groupId>\s*<artifactId>$a</artifactId>\s*<version>(.*)</version>""".r
+    raw"""<groupId>$g</groupId>\s*<artifactId>$a(|_[^<]+)</artifactId>\s*<version>(.*)</version>""".r
   }
 }