Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.
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
5 changes: 3 additions & 2 deletions src/main/scala/com/lightbend/rp/sbtreactiveapp/App.scala
Original file line number Diff line number Diff line change
Expand Up @@ -271,15 +271,16 @@ case object BasicApp extends DeployableApp {

val allApplicationConfFiles = unmanagedTransitive.value.flatten.toList
val unmanagedConfigName = rpPrependRpConf.value
val cp = (dependencyClasspath in Compile).value
if (unmanagedConfigName.isEmpty) Nil
else {
// 1. make the file under cache/sbt-reactive-app.
// 2. compare its SHA1 against cache/sbt-reactive-app-inputs
IO.write(tempFile, magic.Build.extractRpToolingConf(
Vector(ToolingConfig),
(dependencyClasspath in Compile).value,
cp,
allApplicationConfFiles.nonEmpty,
unmanagedConfigName).getOrElse(""))
unmanagedConfigName))
cachedCopyFile(FileInfo.hash(tempFile))
Seq(outFile)
}
Expand Down
24 changes: 9 additions & 15 deletions src/main/scala/com/lightbend/rp/sbtreactiveapp/magic/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -39,28 +39,22 @@ object Build {
managedConfigNames: Seq[String],
dependencyClasspath: Seq[Attributed[File]],
prependInclude: Boolean,
unmanagedConfigName: String): Option[String] = {
unmanagedConfigName: String): String = {
val dependencyClassLoader = new java.net.URLClassLoader(dependencyClasspath.files.map(_.toURI.toURL).toArray)

val managedConfigs: List[URL] =
managedConfigNames
.flatMap(dependencyClassLoader.findResources(_).asScala)
.toList

managedConfigs match {
case Nil => None
case _ =>
Some(
annotate(
prependInclude,
unmanagedConfigName,
managedConfigs
.foldLeft(Seq.empty[String]) {
case (accum, conf) =>
accum :+ withHeader(conf.toString, IO.readLinesURL(conf).mkString(IO.Newline))
}
.mkString(IO.Newline)))
}
annotate(
prependInclude,
unmanagedConfigName,
(managedConfigs
.foldLeft(Seq.empty[String]) {
case (accum, conf) =>
accum :+ withHeader(conf.toString, IO.readLinesURL(conf).mkString(IO.Newline))
}).mkString(IO.Newline))
}

def makeConfig(dependencyClasspath: Seq[File]): Config = {
Expand Down
5 changes: 5 additions & 0 deletions src/sbt-test/sbt-reactive-app/play-endpoints/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,9 @@ TaskKey[Unit]("check") := {
|$contents""")
}
}

val rpApplicationConf = resourceManaged.value / "main" / "sbt-reactive-app" / "rp-application.conf"
val confContents = augmentString(IO.read(rpApplicationConf)).lines.toList
assert(confContents contains """include "application.conf"""", confContents.toString)

}