Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Fix the support for plugin dependencies inside the plugin dev environment #125

Merged
merged 1 commit into from
Aug 19, 2019
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ object BootstrapUtility {

// Second step: Create bin directories and copy all binaries
val targetJarDirectories = List("bin", "deploy/bin")
prepareBinDirectories(logger, targetJarDirectories, scalaLibraryVersion, copyApi = true, copyBuild = false)
prepareBinDirectories(logger, targetJarDirectories, scalaLibraryVersion, copyApi = true)

// Third step: Copy bootstrap launcher
copyJars(s"bootstrap/target/scala-$scalaLibraryVersion/", List("deploy/"), logger)
Expand Down Expand Up @@ -152,9 +152,13 @@ object BootstrapUtility {
// First step: Create directory
createOrEmptyFolder("deployDev/")

// Second step: Copy all binaries
// Second step: Copy framework, GUI and build-code jars
val targetJarDirectories = List("bin", "deployDev/bin")
prepareBinDirectories(logger, targetJarDirectories, scalaLibraryVersion, copyApi = false, copyBuild = true)
prepareBinDirectories(logger, targetJarDirectories, scalaLibraryVersion, copyApi = false)

createOrEmptyFolder("deployDev/project/lib")
val buildCodeTargetDirectories = List("bin", "deployDev/project/lib")
copyJars(s"build/target/scala-$scalaLibraryVersion/sbt-1.0", buildCodeTargetDirectories, logger)

// Third step: Copy the api
sbt.IO.copyDirectory(new File(apiProjectPath), new File("deployDev/api/"))
Expand All @@ -175,7 +179,7 @@ object BootstrapUtility {
}
}

private def prepareBinDirectories(logger: ManagedLogger, targetDirs: List[String], scalaLibraryVersion: String, copyApi: Boolean, copyBuild: Boolean): Unit = {
private def prepareBinDirectories(logger: ManagedLogger, targetDirs: List[String], scalaLibraryVersion: String, copyApi: Boolean): Unit = {
// First prepare all bin folders
targetDirs.foreach(d => {
logger info s"Preparing '$d' folder."
Expand All @@ -187,8 +191,7 @@ object BootstrapUtility {

val sourceJarDirectories = List(
Some(s"target/scala-$scalaLibraryVersion/"),
if (copyApi) Some(s"api/target/scala-$scalaLibraryVersion/") else None,
if (copyBuild) Some(s"build/target/scala-$scalaLibraryVersion/sbt-1.0") else None
if (copyApi) Some(s"api/target/scala-$scalaLibraryVersion/") else None
).flatten

sourceJarDirectories.foreach(d => copyJars(d, targetDirs, logger))
Expand Down
2 changes: 2 additions & 0 deletions deployment-files/plugin-dev/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,5 @@ create := new PluginCreateWizard(streams.value.log).createPluginTask(pluginFolde
fetch := new PluginUtility(streams.value.log).fetchPluginsTask(pluginFolderNames.value, pluginBuildFileName.value,
pluginTargetFolderNames.value, apiProjectPath.value)
copy := new PluginUtility(streams.value.log).copyPluginsTask(pluginFolderNames.value, pluginTargetFolderNames.value, scalaMajorVersion)

packageBin / includePom := false
1 change: 0 additions & 1 deletion deployment-files/plugin-dev/project/dependencies.sbt

This file was deleted.