Merge pull request #2380 from dwijnand/fport/add-sbt-ivy-snapshots-to-launchconfig

FPORT: Include sbt-ivy-snapshots to launchconfig

launch/src/main/input_resources/sbt/sbt.boot.properties

@@ -13,9 +13,9 @@
 [repositories]
   local
   jcenter: https://jcenter.bintray.com/
-${{repositories}}
   maven-central
-
+  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
 
 [boot]
   directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}

notes/0.13.10/add-sbt-ivy-snapshots-to-launchconfig.markdown

@@ -0,0 +1,10 @@
+
+  [@eed3si9n]: https://github.com/eed3si9n
+
+### Fixes with compatibility implications
+
+### Improvements
+
+### Bug fixes
+
+- Fixes launcher configuration to add `sbt-ivy-snapshots` repository to resolve nightly builds. [@eed3si9n][@eed3si9n]

project/SbtLauncherPlugin.scala

@@ -28,7 +28,6 @@ object SbtLauncherPlugin extends AutoPlugin {
            if(file.getName == "sbt.boot.properties") "sbt/sbt.boot.properties" -> file
            else file.getName -> file
          }
-      propFileLocations foreach println
       // TODO - We need to inject the appropriate boot.properties file for this version of sbt.
       rebundle(rawSbtLaunchJar.value, propFileLocations.toMap, target.value / "sbt-launch.jar")
     }

project/Transform.scala

@@ -60,7 +60,7 @@ object Transform {
   }
   def configSettings = transResourceSettings ++ Seq(
     resourceProperties <<= (organization, version, scalaVersion, isSnapshot) map { (org, v, sv, isSnapshot) =>
-      Map("org" -> org, "sbt.version" -> v, "scala.version" -> sv, "repositories" -> repositories(isSnapshot).mkString(IO.Newline))
+      Map("org" -> org, "sbt.version" -> v, "scala.version" -> sv)
     }
   )
   def transResourceSettings = Seq(
@@ -87,13 +87,4 @@ object Transform {
     }
   def read(file: File): Option[String] = try { Some(IO.read(file)) } catch { case _: java.io.IOException => None }
   lazy val Property = """\$\{\{([\w.-]+)\}\}""".r
-
-  def repositories(isSnapshot: Boolean) = Releases :: (if (isSnapshot) Snapshots :: SonatypeSnapshots :: Nil else Nil)
-  lazy val Releases = typesafeRepository("releases")
-  lazy val Snapshots = typesafeRepository("snapshots")
-  lazy val SonatypeSnapshots = sonatypeRepsoitory("snapshots")
-  def sonatypeRepsoitory(status: String) =
-    s"""  sonatype-$status: https://oss.sonatype.org/content/repositories/$status"""
-  def typesafeRepository(status: String) =
-    """  typesafe-ivy-%s: https://repo.typesafe.com/typesafe/ivy-%<s/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly""" format status
 }

src/main/conscript/sbt/launchconfig

@@ -13,9 +13,9 @@
 [repositories]
   local
   jcenter: https://jcenter.bintray.com/
-  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   maven-central
-
+  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
 
 [boot]
   directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}

src/main/conscript/scalas/launchconfig

@@ -13,9 +13,9 @@
 [repositories]
   local
   jcenter: https://jcenter.bintray.com/
-  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   maven-central
-
+  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
 
 [boot]
   directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}

src/main/conscript/screpl/launchconfig

@@ -13,9 +13,9 @@
 [repositories]
   local
   jcenter: https://jcenter.bintray.com/
-  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
   maven-central
-
+  typesafe-ivy-releases: https://repo.typesafe.com/typesafe/ivy-releases/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
+  sbt-ivy-snapshots: https://repo.scala-sbt.org/scalasbt/ivy-snapshots/, [organization]/[module]/[revision]/[type]s/[artifact](-[classifier]).[ext], bootOnly
 
 [boot]
   directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/}