Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ rewrite.imports.groups = [
["java?\\..*"],
["scala\\..*"]
]

rewrite.scala3.convertToNewSyntax = true
rewrite.scala3.newSyntax.control = false
26 changes: 13 additions & 13 deletions src/main/scala/sbtpomreader/MavenHelper.scala
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtpomreader/MavenModelResolver.scala
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtpomreader/MavenPomResolver.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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.{
Expand Down
12 changes: 6 additions & 6 deletions src/main/scala/sbtpomreader/MavenProjectHelper.scala
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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?
Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/sbtpomreader/MavenUserSettingsHelper.scala
Original file line number Diff line number Diff line change
@@ -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 }

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtpomreader/PomBuild.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sbtpomreader

import sbt._
import sbt.*
import sbt.internal.BuildDef

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtpomreader/PomReaderPlugin.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package sbtpomreader

import sbt._
import sbt.*
import sbt.plugins.JvmPlugin

/** Plugin definition for Maven POM reader. */
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/sbtpomreader/SbtPomKeys.scala
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/sbtpomreader/package.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package object sbtpomreader {
}

def defaultLocalRepo: java.io.File = {
import sbt._
import sbt.*
file(sys.props("user.home")) / ".m2" / "repository"
}

Expand Down