Merge pull request #104 from eed3si9n/wip/repos

Ignore jcenter and scala-tools-releases
sbt · Jun 16, 2024 · eb6ef4f · eb6ef4f
2 parents ab72937 + 0ec30a6
commit eb6ef4f
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 124 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 target
+metals.sbt
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,9 @@ import Deps._
 import Util._
 import com.typesafe.tools.mima.core._, ProblemFilters._
 
-lazy val keepFullClasses = settingKey[Seq[String]]("Fully qualified names of classes that proguard should preserve the non-private API of.")
+lazy val keepFullClasses = settingKey[Seq[String]](
+  "Fully qualified names of classes that proguard should preserve the non-private API of."
+)
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 ThisBuild / dynverSonatypeSnapshots := true
@@ -12,7 +14,7 @@ ThisBuild / version := {
   else orig
 }
 ThisBuild / description := "Standalone launcher for maven/ivy deployed projects"
-ThisBuild / scalaVersion := "2.13.6"
+ThisBuild / scalaVersion := "2.13.14"
 ThisBuild / publishMavenStyle := true
 ThisBuild / crossPaths := false
 ThisBuild / resolvers += Resolver.typesafeIvyRepo("releases")
@@ -31,9 +33,9 @@ lazy val root = (project in file("."))
     packageDoc in Compile := (packageDoc in Compile in launchSub).value
     commands += Command.command("release") { state =>
       "clean" ::
-      "test" ::
-      "publishSigned" ::
-      state
+        "test" ::
+        "publishSigned" ::
+        state
     }
     validNamespaces ++= Set("xsbt", "xsbti", "scala", "org.apache.ivy", "org.fusesource.jansi")
     validEntries ++= Set("LICENSE", "NOTICE", "module.properties")
@@ -56,19 +58,26 @@ def proguardedLauncherSettings = Seq(
 
 def launchSettings =
   inConfig(Compile)(Transform.configSettings) ++
-  inConfig(Compile)(Transform.transSourceSettings ++ Seq(
-    // TODO - these should be shared between sbt core + sbt-launcher...
-    Transform.inputSourceDirectory := sourceDirectory.value / "input_sources",
-    Transform.sourceProperties := Map("cross.package0" -> "xsbt", "cross.package1" -> "boot")
-  ))
+    inConfig(Compile)(
+      Transform.transSourceSettings ++ Seq(
+        // TODO - these should be shared between sbt core + sbt-launcher...
+        Transform.inputSourceDirectory := sourceDirectory.value / "input_sources",
+        Transform.sourceProperties := Map("cross.package0" -> "xsbt", "cross.package1" -> "boot")
+      )
+    )
 
 // The interface JAR for projects which want to be launched by sbt.
 lazy val launchInterfaceSub = (project in file("launcher-interface"))
   .settings(javaOnly)
   .settings(nocomma {
     name := "Launcher Interface"
-    resourceGenerators in Compile += Def.task{
-      generateVersionFile("sbt.launcher.version.properties")(version.value, resourceManaged.value, streams.value, (compile in Compile).value)
+    resourceGenerators in Compile += Def.task {
+      generateVersionFile("sbt.launcher.version.properties")(
+        version.value,
+        resourceManaged.value,
+        streams.value,
+        (compile in Compile).value
+      )
     }.taskValue
     description := "Interfaces for launching projects with the sbt launcher"
     mimaPreviousArtifacts := Set(organization.value % moduleName.value % "1.0.1")
@@ -119,10 +128,10 @@ lazy val launchSub = (project in file("launcher-implementation"))
     Proguard / proguardOptions ++= keepFullClasses.value map ("-keep public class " + _ + " {\n\tpublic protected * ;\n}")
     Proguard / proguardInputFilter := { file =>
       file.name match {
-        case x if x.startsWith("scala-library") => Some(libraryFilter)
-        case x if x.startsWith("ivy-2.3.0")     => Some(ivyFilter)
+        case x if x.startsWith("scala-library")           => Some(libraryFilter)
+        case x if x.startsWith("ivy-2.3.0")               => Some(ivyFilter)
         case x if x.startsWith("launcher-implementation") => None
-        case _                                  => Some(generalFilter)
+        case _                                            => Some(generalFilter)
       }
     }
     Proguard / proguardOptions += ProguardOptions.keepMain("xsbt.boot.Boot")
@@ -156,7 +165,6 @@ def ivyFilter = {
   excludeString(ivyResources)
 }
 
-
 // used to test the retrieving and loading of an application: sample app is packaged and published to the local repository
 lazy val testSamples = (project in file("test-sample"))
   .dependsOn(launchInterfaceSub)
@@ -169,20 +177,25 @@ lazy val testSamples = (project in file("test-sample"))
   })
 
 ThisBuild / organization := "org.scala-sbt"
-ThisBuild / pomIncludeRepository := { x => false }
+ThisBuild / pomIncludeRepository := { x =>
+  false
+}
 ThisBuild / homepage := Some(url("https://scala-sbt.org"))
 ThisBuild / licenses += "Apache-2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0.txt")
-ThisBuild / scmInfo := Some(ScmInfo(
-  browseUrl = url("https://github.com/sbt/launcher"),
-  connection = "scm:[email protected]:sbt/launcher.git"
-))
+ThisBuild / scmInfo := Some(
+  ScmInfo(
+    browseUrl = url("https://github.com/sbt/launcher"),
+    connection = "scm:[email protected]:sbt/launcher.git"
+  )
+)
 ThisBuild / developers := List(
   Developer("eed3si9n", "Eugene Yokota", "@eed3si9n", url("https://github.com/eed3si9n")),
   Developer("jsuereth", "Josh Suereth", "@jsuereth", url("https://github.com/jsuereth")),
   Developer("dwijnand", "Dale Wijnand", "@dwijnand", url("https://github.com/dwijnand"))
 )
 ThisBuild / publishTo := {
   val nexus = "https://oss.sonatype.org/"
-  if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
-  else                             Some("releases"  at nexus + "service/local/staging/deploy/maven2")
+  if (version.value.trim.endsWith("SNAPSHOT"))
+    Some("snapshots" at nexus + "content/repositories/snapshots")
+  else Some("releases" at nexus + "service/local/staging/deploy/maven2")
 }
diff --git a/launcher-implementation/src/main/input_sources/CrossVersionUtil.scala b/launcher-implementation/src/main/input_sources/CrossVersionUtil.scala
@@ -61,7 +61,7 @@ object CrossVersionUtil
 		major > minMajor || (major == minMajor && minor >= minMinor)
 	private[this] def binaryVersionWithApi(full: String, cutoff: String)(apiVersion: String => Option[(Int,Int)]): String =
 	{
-		def sub(major: Int, minor: Int) = major + "." + minor
+		def sub(major: Int, minor: Int) = major.toString() + "." + minor
 		(apiVersion(full), partialVersion(cutoff)) match {
 			case (Some((major, minor)), None) => sub(major, minor)
 			case (Some((major, minor)), Some((minMajor, minMinor))) if isNewer(major, minor, minMajor, minMinor) => sub(major, minor)

diff --git a/launcher-implementation/src/main/scala/xsbt/boot/Boot.scala b/launcher-implementation/src/main/scala/xsbt/boot/Boot.scala
@@ -93,5 +93,5 @@ object Boot {
   }
 
   private def exit(code: Int): Nothing =
-    System.exit(code).asInstanceOf[Nothing]
+    sys.exit(code)
 }
diff --git a/launcher-implementation/src/main/scala/xsbt/boot/Configuration.scala b/launcher-implementation/src/main/scala/xsbt/boot/Configuration.scala
@@ -50,6 +50,7 @@ object Configuration {
       case Array("")         => Console.err.println(s"[warn] [launcher] invalid system property '$head'")
       case Array(key)        => sys.props += key -> ""
       case Array(key, value) => sys.props += key -> value
+      case _                 => ()
     }
     ()
   }
@@ -79,8 +80,8 @@ object Configuration {
       multiPartError("could not find configuration file '" + path + "'. searched:", against)
     resolving.next()
   }
-  def multiPartError[T](firstLine: String, lines: List[T]) =
-    Pre.error((firstLine :: lines).mkString("\n\t"))
+  def multiPartError[A](firstLine: String, lines: List[A]) =
+    Pre.error((firstLine :: lines.map(_.toString())).mkString("\n\t"))
 
   def UnspecifiedVersionPart = "Unspecified"
   def DefaultVersionPart = "Default"

diff --git a/launcher-implementation/src/main/scala/xsbt/boot/ConfigurationParser.scala b/launcher-implementation/src/main/scala/xsbt/boot/ConfigurationParser.scala
@@ -38,7 +38,7 @@ object ConfigurationParser {
     b.toString
   }
 
-  implicit val readIDs = ids _
+  implicit val readIDs: String => List[String] = ids _
 }
 class ConfigurationParser {
   def apply(file: File): LaunchConfiguration = Using(newReader(file))(apply)

diff --git a/launcher-implementation/src/main/scala/xsbt/boot/CoursierUpdate.scala b/launcher-implementation/src/main/scala/xsbt/boot/CoursierUpdate.scala
@@ -13,6 +13,7 @@ import java.nio.file.{ Files, StandardCopyOption, Paths }
 import java.util.Properties
 import java.util.regex.Pattern
 import BootConfiguration._
+import scala.annotation.nowarn
 
 class CousierUpdate(config: UpdateConfiguration) {
   import config.{
@@ -178,7 +179,7 @@ class CousierUpdate(config: UpdateConfiguration) {
       target: UpdateTarget,
       deps: List[Dependency]
   ): UpdateResult = {
-    val repos = config.repositories.map(toCoursierRepository)
+    val repos = config.repositories.flatMap(toCoursierRepository)
     val params = scalaVersion match {
       case Some(sv) if sv != "auto" =>
         ResolutionParams()
@@ -303,11 +304,12 @@ class CousierUpdate(config: UpdateConfiguration) {
       )).toList
   }
 
-  def toCoursierRepository(repo: xsbti.Repository): Repository = {
+  @nowarn
+  def toCoursierRepository(repo: xsbti.Repository): Seq[Repository] = {
     import xsbti.Predefined._
     repo match {
       case m: xsbti.MavenRepository =>
-        mavenRepository(m.url.toString)
+        mavenRepository(m.url.toString) :: Nil
       case i: xsbti.IvyRepository =>
         ivyRepository(
           i.id,
@@ -318,22 +320,25 @@ class CousierUpdate(config: UpdateConfiguration) {
           i.descriptorOptional,
           i.skipConsistencyCheck,
           i.allowInsecureProtocol
-        )
+        ) :: Nil
       case p: xsbti.PredefinedRepository =>
         p.id match {
           case Local =>
-            localRepository
+            localRepository :: Nil
           case MavenLocal =>
             val localDir = new File(new File(new File(sys.props("user.home")), ".m2"), "repository")
-            mavenRepository(localDir.toPath.toUri.toString)
+            mavenRepository(localDir.toPath.toUri.toString) :: Nil
           case MavenCentral =>
-            Repositories.central
+            Repositories.central :: Nil
           case SonatypeOSSReleases =>
-            Repositories.sonatype("releases")
+            Repositories.sonatype("releases") :: Nil
           case SonatypeOSSSnapshots =>
-            Repositories.sonatype("snapshots")
-          case Jcenter =>
-            Repositories.jcenter
+            Repositories.sonatype("snapshots") :: Nil
+          case Jcenter | ScalaToolsReleases | ScalaToolsSnapshots =>
+            log(
+              s"[warn] [launcher] ${p.id} is deprecated or no longer available; remove from repositories"
+            )
+            Nil
         }
     }
   }

diff --git a/launcher-implementation/src/main/scala/xsbt/boot/Pre.scala b/launcher-implementation/src/main/scala/xsbt/boot/Pre.scala
@@ -6,7 +6,6 @@ package xsbt.boot
 import java.io.{ File, FileFilter }
 import java.net.URL
 import java.util.Locale
-import scala.annotation.nowarn
 import scala.collection.immutable.List
 import scala.reflect.ClassTag
 
@@ -32,7 +31,6 @@ object Pre {
   def prefixError(msg: String): String = "error during sbt launcher: " + msg
   def toBoolean(s: String) = java.lang.Boolean.parseBoolean(s)
 
-  @nowarn
   def toArray[T: ClassTag](list: List[T]) = {
     val arr = new Array[T](list.length)
     def copy(i: Int, rem: List[T]): Unit =

diff --git a/launcher-implementation/src/main/scala/xsbt/boot/Update.scala b/launcher-implementation/src/main/scala/xsbt/boot/Update.scala
@@ -436,8 +436,10 @@ final class Update(config: UpdateConfiguration) {
     }
     newDefault.setName("redefined-public")
     if (repositories.isEmpty) error("no repositories defined")
-    for (repo <- repositories if includeRepo(repo))
-      newDefault.add(toIvyRepository(settings, repo))
+    for {
+      repo <- repositories if includeRepo(repo)
+      irepo <- toIvyRepositories(settings, repo)
+    } newDefault.add(irepo)
     configureCache(settings)
     settings.addResolver(newDefault)
     settings.setDefaultResolver(newDefault.getName)
@@ -490,10 +492,14 @@ final class Update(config: UpdateConfiguration) {
   }
 
   @nowarn
-  private def toIvyRepository(settings: IvySettings, repo: xsbti.Repository) = {
+  private def toIvyRepositories(
+      settings: IvySettings,
+      repo: xsbti.Repository
+  ): Seq[plugins.resolver.RepositoryResolver] = {
     import xsbti.Predefined._
     repo match {
-      case m: xsbti.MavenRepository => mavenResolver(m.id, m.url.toString, m.allowInsecureProtocol)
+      case m: xsbti.MavenRepository =>
+        mavenResolver(m.id, m.url.toString, m.allowInsecureProtocol) :: Nil
       case i: xsbti.IvyRepository =>
         urlResolver(
           i.id,
@@ -504,7 +510,7 @@ final class Update(config: UpdateConfiguration) {
           i.descriptorOptional,
           i.skipConsistencyCheck,
           i.allowInsecureProtocol
-        )
+        ) :: Nil
       case p: xsbti.PredefinedRepository =>
         val sonatypeReleases = mavenResolver(
           "Sonatype Releases Repository",
@@ -513,27 +519,20 @@ final class Update(config: UpdateConfiguration) {
         )
         p.id match {
           case Local =>
-            localResolver(settings.getDefaultIvyUserDir.getAbsolutePath)
+            localResolver(settings.getDefaultIvyUserDir.getAbsolutePath) :: Nil
           case MavenLocal =>
-            mavenLocal
+            mavenLocal :: Nil
           case MavenCentral =>
-            mavenMainResolver
-          case ScalaToolsReleases =>
-            log(
-              s"[warn] [launcher] $ScalaToolsReleases deprecated. use $SonatypeOSSReleases instead."
-            )
-            sonatypeReleases
+            mavenMainResolver :: Nil
           case SonatypeOSSReleases =>
-            sonatypeReleases
-          case ScalaToolsSnapshots =>
+            sonatypeReleases :: Nil
+          case SonatypeOSSSnapshots =>
+            scalaSnapshots(getScalaVersion) :: Nil
+          case Jcenter | ScalaToolsReleases | ScalaToolsSnapshots =>
             log(
-              s"[warn] [launcher] $ScalaToolsSnapshots deprecated. use $SonatypeOSSSnapshots instead."
+              s"[warn] [launcher] ${p.id} is deprecated or no longer available; remove from repositories"
             )
-            scalaSnapshots(getScalaVersion)
-          case SonatypeOSSSnapshots =>
-            scalaSnapshots(getScalaVersion)
-          case Jcenter =>
-            jcenterResolver
+            Nil
         }
     }
   }
@@ -601,11 +600,9 @@ final class Update(config: UpdateConfiguration) {
       || str.startsWith("http://127.0.0.1:"))
   }
   private def centralRepositoryRoot: String = "https://repo1.maven.org/maven2/"
-  private def jcenterRepositoryRoot: String = "https://jcenter.bintray.com/"
 
   /** Creates a resolver for Maven Central.*/
   private def mavenMainResolver = defaultMavenResolver("Maven Central")
-  private def jcenterResolver = mavenResolver("JCenter", jcenterRepositoryRoot, false)
 
   /** Creates a maven-style resolver with the default root.*/
   private def defaultMavenResolver(name: String) =

diff --git a/launcher-interface/src/main/java/xsbti/Predefined.java b/launcher-interface/src/main/java/xsbti/Predefined.java
@@ -1,10 +1,7 @@
 package xsbti;
 
-public enum Predefined 
-{
-	Local("local"),
-	MavenLocal("maven-local"),
-	MavenCentral("maven-central"),
+public enum Predefined {
+	Local("local"), MavenLocal("maven-local"), MavenCentral("maven-central"),
 	/**
 	 * @deprecated use {@link #SonatypeOSSReleases} instead.
 	 */
@@ -14,23 +11,31 @@ public enum Predefined
 	 * @deprecated use {@link #SonatypeOSSSnapshots} instead.
 	 */
 	@Deprecated
-	ScalaToolsSnapshots("scala-tools-snapshots"),
-	SonatypeOSSReleases("sonatype-oss-releases"),
+	ScalaToolsSnapshots("scala-tools-snapshots"), SonatypeOSSReleases("sonatype-oss-releases"),
 	SonatypeOSSSnapshots("sonatype-oss-snapshots"),
-    Jcenter("jcenter");
+	/**
+	 * @deprecated
+	 */
+	@Deprecated
+	Jcenter("jcenter");
 
 	private final String label;
-	private Predefined(String label) { this.label = label; }
-	public String toString() { return label; }
 
-	public static Predefined toValue(String s)
-	{
-		for(Predefined p : values())
-			if(s.equals(p.toString()))
+	private Predefined(String label) {
+		this.label = label;
+	}
+
+	public String toString() {
+		return label;
+	}
+
+	public static Predefined toValue(String s) {
+		for (Predefined p : values())
+			if (s.equals(p.toString()))
 				return p;
-		
+
 		StringBuilder msg = new StringBuilder("Expected one of ");
-		for(Predefined p : values())
+		for (Predefined p : values())
 			msg.append(p.toString()).append(", ");
 		msg.append("got '").append(s).append("'.");
 		throw new RuntimeException(msg.toString());