From 3d3b347c8fc0af63204ca8353ed21bd298bf31ff Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Tue, 26 Mar 2024 16:01:57 +0100
Subject: [PATCH] Fix pom-advanced

---
 .../dependency-management/pom-advanced/build.sbt       |  6 ++++--
 .../dependency-management/pom-advanced/pending         | 10 ----------
 .../sbt-test/dependency-management/pom-advanced/test   | 10 ++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)
 delete mode 100644 sbt-app/src/sbt-test/dependency-management/pom-advanced/pending
 create mode 100644 sbt-app/src/sbt-test/dependency-management/pom-advanced/test

diff --git a/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt b/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt
index 2da229089..15ed8b529 100644
--- a/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt
+++ b/sbt-app/src/sbt-test/dependency-management/pom-advanced/build.sbt
@@ -6,15 +6,17 @@ lazy val root = (project in file(".")).
   settings(
     resolvers ++= Seq(local, Resolver.sonatypeRepo("releases"), Resolver.sonatypeRepo("snapshots")),
     InputKey[Unit]("checkPom") := {
+      val converter = fileConverter.value
       val result = spaceDelimited("<args>").parsed
-      checkPomRepositories(makePom.value, result, streams.value)
+      val pomFile = converter.toPath(makePom.value)
+      checkPomRepositories(pomFile.toFile, result, streams.value)
     },
     makePomConfiguration := {
       val conf = makePomConfiguration.value
       conf
         .withFilterRepositories(pomIncludeRepository(baseDirectory.value, conf.filterRepositories))
     },
-    ivyPaths := baseDirectory( dir => IvyPaths(dir, Some(dir / "ivy-home"))).value
+    ivyPaths := baseDirectory(dir => IvyPaths(dir.toString, Some((dir / "ivy-home").toString))).value
   )
 
 val local = "local-maven-repo" at "file://" + (Path.userHome / ".m2" /"repository").absolutePath
diff --git a/sbt-app/src/sbt-test/dependency-management/pom-advanced/pending b/sbt-app/src/sbt-test/dependency-management/pom-advanced/pending
deleted file mode 100644
index d639e4ae6..000000000
--- a/sbt-app/src/sbt-test/dependency-management/pom-advanced/pending
+++ /dev/null
@@ -1,10 +0,0 @@
-# write the default pom.  The only repositories should be Scala Tools Releases and Snapshots
-> checkPom https://scala-ci.typesafe.com/artifactory/scala-integration/ https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/ https://oss.sonatype.org/service/local/repositories/releases/content/ https://oss.sonatype.org/content/repositories/snapshots/
-
-# include file:// repositories.  The generated repositories section should include the local Maven repository as well
-$ touch repo.all
-> checkPom https://scala-ci.typesafe.com/artifactory/scala-integration/ https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/ https://oss.sonatype.org/service/local/repositories/releases/content/ https://oss.sonatype.org/content/repositories/snapshots/ file://*.m2/repository/
-
-$ delete repo.all
-$ touch repo.none
-> checkPom
diff --git a/sbt-app/src/sbt-test/dependency-management/pom-advanced/test b/sbt-app/src/sbt-test/dependency-management/pom-advanced/test
new file mode 100644
index 000000000..28688bcc7
--- /dev/null
+++ b/sbt-app/src/sbt-test/dependency-management/pom-advanced/test
@@ -0,0 +1,10 @@
+# write the default pom.  The only repositories should be Scala Tools Releases and Snapshots
+> checkPom https://oss.sonatype.org/service/local/repositories/releases/content/ https://oss.sonatype.org/content/repositories/snapshots/
+
+# include file:// repositories.  The generated repositories section should include the local Maven repository as well
+$ touch repo.all
+> checkPom https://oss.sonatype.org/service/local/repositories/releases/content/ https://oss.sonatype.org/content/repositories/snapshots/ file://*.m2/repository/
+
+$ delete repo.all
+$ touch repo.none
+> checkPom