Merge pull request #488 from adpi2/configured-repositories

Use configured repositories from sbt build
scalacenter · Aug 6, 2024 · df60b1d · df60b1d
2 parents b1ef505 + 40db36b
commit df60b1d
Show file tree

Hide file tree

Showing 19 changed files with 448 additions and 352 deletions.
diff --git a/.scalafix.conf b/.scalafix.conf
@@ -17,4 +17,4 @@ OrganizeImports {
 
 RemoveUnused {
   imports = false // handled by OrganizeImports
-}
+}
diff --git a/build.sbt b/build.sbt
@@ -116,17 +116,20 @@ lazy val `sbt-plugin` = project
   .settings(
     scalaVersion := V.scala212,
     name         := "sbt-scala3-migrate",
+    libraryDependencies ++= Seq(
+      "io.get-coursier" %% "coursier"                      % V.coursierApi,
+      "io.get-coursier" %% "coursier-sbt-maven-repository" % V.coursierApi,
+      "org.scalatest"   %% "scalatest"                     % V.scalatest % Test
+    ),
     scriptedLaunchOpts ++= Seq(s"-Dplugin.version=${version.value}"),
-    scriptedDependencies := {
-      scriptedDependencies
-        .dependsOn(
-          `migrate-interface` / publishLocal,
-          `compiler-interface` / publishLocal,
-          migrate / publishLocal,
-          `scalafix-rules` / publishLocal
-        )
-        .value
-    },
+    scriptedDependencies := scriptedDependencies
+      .dependsOn(
+        `migrate-interface` / publishLocal,
+        `compiler-interface` / publishLocal,
+        migrate / publishLocal,
+        `scalafix-rules` / publishLocal
+      )
+      .value,
     buildInfoPackage  := "migrate",
     scriptedBufferLog := false,
     buildInfoKeys := Seq[BuildInfoKey](

diff --git a/interfaces/migrate/src/main/java/migrate/interfaces/Lib.java b/interfaces/migrate/src/main/java/migrate/interfaces/Lib.java
diff --git a/interfaces/migrate/src/main/java/migrate/interfaces/Migrate.java b/interfaces/migrate/src/main/java/migrate/interfaces/Migrate.java
@@ -28,7 +28,6 @@ void migrate(List<Path> unmanagedSources,
                  Path baseDirectory);
 
     MigratedScalacOptions migrateScalacOption(List<String> scala3CompilerOptions);
-    MigratedLibs migrateLibs(List<Lib> libs);
 
     void migrateSyntax(List<Path> unmanagedSources,
                        Path targetRoot,

diff --git a/interfaces/migrate/src/main/java/migrate/interfaces/MigratedLib.java b/interfaces/migrate/src/main/java/migrate/interfaces/MigratedLib.java
diff --git a/interfaces/migrate/src/main/java/migrate/interfaces/MigratedLibs.java b/interfaces/migrate/src/main/java/migrate/interfaces/MigratedLibs.java
diff --git a/migrate/src/main/scala/migrate/LibraryMigration.scala b/migrate/src/main/scala/migrate/LibraryMigration.scala
diff --git a/migrate/src/main/scala/migrate/interfaces/MigrateImpl.scala b/migrate/src/main/scala/migrate/interfaces/MigrateImpl.scala
@@ -5,12 +5,10 @@ import java.{util => jutil}
 
 import scala.jdk.CollectionConverters._
 
-import migrate.LibraryMigration
 import migrate.Scala3Migrate
 import migrate.ScalacOptionsMigration
 import migrate.internal.AbsolutePath
 import migrate.internal.Classpath
-import migrate.internal.InitialLib
 import migrate.utils.ScalaExtensions._
 import migrate.utils.ScalafixService
 
@@ -58,11 +56,6 @@ final class MigrateImpl(logger: Logger) extends Migrate {
   override def migrateScalacOption(scalacOptions: jutil.List[String]): MigratedScalacOptions =
     ScalacOptionsMigration.migrate(scalacOptions.asScala.toSeq)
 
-  override def migrateLibs(libs: jutil.List[Lib]): MigratedLibs = {
-    val initialLibs = libs.asScala.map(InitialLib.apply).toSeq
-    LibraryMigration.migrateLibs(initialLibs)
-  }
-
   override def migrateSyntax(
     unmanagedSources: jutil.List[Path],
     targetRoot: Path,

diff --git a/migrate/src/main/scala/migrate/internal/CrossVersion.scala b/migrate/src/main/scala/migrate/internal/CrossVersion.scala
diff --git a/migrate/src/main/scala/migrate/internal/Repository.scala b/migrate/src/main/scala/migrate/internal/Repository.scala
@@ -0,0 +1,3 @@
+package migrate.internal
+
+case class Repository(url: String)
diff --git a/migrate/src/main/scala/migrate/utils/CoursierHelper.scala b/migrate/src/main/scala/migrate/utils/CoursierHelper.scala
diff --git a/plugin/src/main/scala/migrate/LibImpl.scala b/plugin/src/main/scala/migrate/LibImpl.scala