From 73eaf93c4919fa90e12fa0e4d94e2682a9187ea9 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sat, 4 Apr 2026 17:41:29 +0900 Subject: [PATCH] Update scalafmt config. enforce new syntax --- .scalafmt.conf | 3 +++ src/main/scala/sbtpomreader/MavenHelper.scala | 26 +++++++++---------- .../sbtpomreader/MavenModelResolver.scala | 2 +- .../scala/sbtpomreader/MavenPomResolver.scala | 2 +- .../sbtpomreader/MavenProjectHelper.scala | 12 ++++----- .../MavenUserSettingsHelper.scala | 8 +++--- src/main/scala/sbtpomreader/PomBuild.scala | 2 +- .../scala/sbtpomreader/PomReaderPlugin.scala | 2 +- src/main/scala/sbtpomreader/SbtPomKeys.scala | 4 +-- src/main/scala/sbtpomreader/package.scala | 2 +- 10 files changed, 33 insertions(+), 30 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8717c22..6347eb3 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -20,3 +20,6 @@ rewrite.imports.groups = [ ["java?\\..*"], ["scala\\..*"] ] + +rewrite.scala3.convertToNewSyntax = true +rewrite.scala3.newSyntax.control = false diff --git a/src/main/scala/sbtpomreader/MavenHelper.scala b/src/main/scala/sbtpomreader/MavenHelper.scala index 70e5a41..65b1290 100644 --- a/src/main/scala/sbtpomreader/MavenHelper.scala +++ b/src/main/scala/sbtpomreader/MavenHelper.scala @@ -1,30 +1,30 @@ package sbtpomreader -import sbtpomreader.MavenUserSettingsHelper._ -import sbtpomreader.SbtPomKeys._ +import sbtpomreader.MavenUserSettingsHelper.* +import sbtpomreader.SbtPomKeys.* -import sbt._ -import sbt.Keys._ +import sbt.* +import sbt.Keys.* -import scala.collection.JavaConverters._ +import scala.collection.JavaConverters.* import scala.util.Try import org.apache.maven.model.{ - Dependency => PomDependency, - Model => PomModel, - Plugin => PomPlugin, - Repository => PomRepository + Dependency as PomDependency, + Model as PomModel, + Plugin as PomPlugin, + Repository as PomRepository } -import org.apache.maven.settings.{ Settings => MavenSettings } +import org.apache.maven.settings.Settings as MavenSettings /** Helper object to extract maven settings. */ object MavenHelper { // Load pom values into settings. - val useMavenPom: Seq[Setting[_]] = + val useMavenPom: Seq[Setting[?]] = loadPomInSettings ++ pullSettingsFromPom - def loadPomInSettings: Seq[Setting[_]] = Seq( + def loadPomInSettings: Seq[Setting[?]] = Seq( pomLocation := baseDirectory.value / "pom.xml", settingsLocation := file(sys.props("user.home")) / ".m2" / "settings.xml", mvnLocalRepository := defaultLocalRepo, @@ -66,7 +66,7 @@ object MavenHelper { case _ => v } - def pullSettingsFromPom: Seq[Setting[_]] = Seq( + def pullSettingsFromPom: Seq[Setting[?]] = Seq( /* Often poms have artifactId with binary version suffix. This should ideally be removed. */ name := fromPom(x => removeBinaryVersionSuffix(x.getArtifactId)).value, organization := fromPom(_.getGroupId).value, diff --git a/src/main/scala/sbtpomreader/MavenModelResolver.scala b/src/main/scala/sbtpomreader/MavenModelResolver.scala index af5f0ad..607f9f2 100644 --- a/src/main/scala/sbtpomreader/MavenModelResolver.scala +++ b/src/main/scala/sbtpomreader/MavenModelResolver.scala @@ -1,6 +1,6 @@ package sbtpomreader -import scala.collection.JavaConverters._ +import scala.collection.JavaConverters.* import org.apache.maven.model.{ Dependency, Parent, Repository } import org.apache.maven.model.building.{ FileModelSource, ModelSource2 } diff --git a/src/main/scala/sbtpomreader/MavenPomResolver.scala b/src/main/scala/sbtpomreader/MavenPomResolver.scala index aeeee64..175a6f0 100644 --- a/src/main/scala/sbtpomreader/MavenPomResolver.scala +++ b/src/main/scala/sbtpomreader/MavenPomResolver.scala @@ -3,7 +3,7 @@ package sbtpomreader import java.io.File import java.util.Locale -import scala.collection.JavaConverters._ +import scala.collection.JavaConverters.* import org.apache.maven.model.Model import org.apache.maven.model.building.{ diff --git a/src/main/scala/sbtpomreader/MavenProjectHelper.scala b/src/main/scala/sbtpomreader/MavenProjectHelper.scala index e6a7b22..56bc263 100644 --- a/src/main/scala/sbtpomreader/MavenProjectHelper.scala +++ b/src/main/scala/sbtpomreader/MavenProjectHelper.scala @@ -1,10 +1,10 @@ package sbtpomreader -import sbt._ +import sbt.* -import scala.collection.JavaConverters._ +import scala.collection.JavaConverters.* -import org.apache.maven.model.{ Model => PomModel } +import org.apache.maven.model.Model as PomModel /** This object knows how to load maven reactor projects and turn them into sbt projects. */ object MavenProjectHelper { @@ -104,11 +104,11 @@ object MavenProjectHelper { val currentProject: Project = ( Project(makeProjectName(current.model, overrideRootProjectName), current.dir) // First pull in settings from pom - settings (useMavenPom: _*) + settings (useMavenPom*) // Now update depends on relationships with actual configurations - dependsOn (projectsWithModules.map { case (p, m) => new ClasspathDependency(p, m.configurations) }: _*) + dependsOn (projectsWithModules.map { case (p, m) => new ClasspathDependency(p, m.configurations) }*) // Now fix aggregate relationships - aggregate (aggregates.map(x => x: ProjectReference): _*) + aggregate (aggregates.map(x => x: ProjectReference)*) // Now remove any inter-project dependencies we pulled in from the maven pom. // TODO - Maybe we can fix the useMavenPom settings so we don't need to // post-filter artifacts? diff --git a/src/main/scala/sbtpomreader/MavenUserSettingsHelper.scala b/src/main/scala/sbtpomreader/MavenUserSettingsHelper.scala index 95d8879..613bcc1 100644 --- a/src/main/scala/sbtpomreader/MavenUserSettingsHelper.scala +++ b/src/main/scala/sbtpomreader/MavenUserSettingsHelper.scala @@ -1,11 +1,11 @@ package sbtpomreader -import sbt._ +import sbt.* -import scala.collection.JavaConverters._ +import scala.collection.JavaConverters.* -import org.apache.maven.model.{ Model => PomModel, Repository => PomRepository } -import org.apache.maven.settings.{ Settings => MavenSettings } +import org.apache.maven.model.{ Model as PomModel, Repository as PomRepository } +import org.apache.maven.settings.Settings as MavenSettings import org.apache.maven.settings.building.{ DefaultSettingsBuilderFactory, DefaultSettingsBuildingRequest } /** diff --git a/src/main/scala/sbtpomreader/PomBuild.scala b/src/main/scala/sbtpomreader/PomBuild.scala index 812478f..3dc9164 100644 --- a/src/main/scala/sbtpomreader/PomBuild.scala +++ b/src/main/scala/sbtpomreader/PomBuild.scala @@ -1,6 +1,6 @@ package sbtpomreader -import sbt._ +import sbt.* import sbt.internal.BuildDef /** diff --git a/src/main/scala/sbtpomreader/PomReaderPlugin.scala b/src/main/scala/sbtpomreader/PomReaderPlugin.scala index 4190022..44e4a8f 100644 --- a/src/main/scala/sbtpomreader/PomReaderPlugin.scala +++ b/src/main/scala/sbtpomreader/PomReaderPlugin.scala @@ -1,6 +1,6 @@ package sbtpomreader -import sbt._ +import sbt.* import sbt.plugins.JvmPlugin /** Plugin definition for Maven POM reader. */ diff --git a/src/main/scala/sbtpomreader/SbtPomKeys.scala b/src/main/scala/sbtpomreader/SbtPomKeys.scala index 589b7cb..af38e10 100644 --- a/src/main/scala/sbtpomreader/SbtPomKeys.scala +++ b/src/main/scala/sbtpomreader/SbtPomKeys.scala @@ -1,9 +1,9 @@ package sbtpomreader -import sbt._ +import sbt.* import org.apache.maven.model.Model -import org.apache.maven.settings.{ Settings => MavenSettings } +import org.apache.maven.settings.Settings as MavenSettings /** Public plugin keys. */ trait SbtPomKeys { diff --git a/src/main/scala/sbtpomreader/package.scala b/src/main/scala/sbtpomreader/package.scala index fac1e37..1d40c0e 100644 --- a/src/main/scala/sbtpomreader/package.scala +++ b/src/main/scala/sbtpomreader/package.scala @@ -18,7 +18,7 @@ package object sbtpomreader { } def defaultLocalRepo: java.io.File = { - import sbt._ + import sbt.* file(sys.props("user.home")) / ".m2" / "repository" }