Skip to content
Permalink
Browse files

Removed closed TODOs, updated build.sbt

  • Loading branch information...
sebinside committed May 25, 2019
1 parent e58f089 commit 64227f968aa9c61e87785a0728f71da5c64b60cd
Showing with 17 additions and 15 deletions.
  1. +0 −1 bootstrap/src/main/scala/Bootstrap.scala
  2. +17 −13 build.sbt
  3. +0 −1 project/BootstrapUtility.scala
@@ -38,7 +38,6 @@ object Bootstrap {
if (!new File("config/").exists()) {
new File("config/").mkdir()
}
// TODO: Fix chat overflow config service to handle non existent config folder. I mean... what?

// Start chat overflow!
val process = new java.lang.ProcessBuilder(javaPath.get, "-cp", s"bin/*${File.pathSeparator}lib/*", chatOverflowMainClass)
@@ -70,18 +70,6 @@ lazy val pluginFolderNames = settingKey[List[String]]("The folder names of all p
lazy val pluginTargetFolderNames = settingKey[List[String]]("The folder names of compiled and packaged plugins. Remember to gitignore these!")
lazy val apiProjectPath = settingKey[String]("The path to the api sub project. Remember to gitignore it!")

// Util task for bs, gets a dependency list kinda like "sbt dependencyList", but only includes deps required for runtime
lazy val getDependencyList = Def.task[List[ModuleID]] {
// only get deps required for runtime and not for anything else like testing
val updateReport = update.value.configuration(ConfigRef("runtime"))

if (updateReport.isEmpty) {
List()
} else {
updateReport.get.modules.map(m => m.module).toList
}
}

// Plugin framework tasks
lazy val create = TaskKey[Unit]("create", "Creates a new plugin. Interactive command using the console.")
lazy val fetch = TaskKey[Unit]("fetch", "Searches for plugins in plugin directories, builds the plugin build file.")
@@ -99,4 +87,20 @@ fetch := BuildUtility(streams.value.log).fetchPluginsTask(pluginFolderNames.valu
pluginTargetFolderNames.value, apiProjectPath.value)
copy := BuildUtility(streams.value.log).copyPluginsTask(pluginFolderNames.value, pluginTargetFolderNames.value, scalaMajorVersion)
bs := BootstrapUtility.bootstrapGenTask(streams.value.log, s"$scalaMajorVersion$scalaMinorVersion", getDependencyList.value)
deploy := BootstrapUtility.prepareDeploymentTask(streams.value.log, scalaMajorVersion)
deploy := BootstrapUtility.prepareDeploymentTask(streams.value.log, scalaMajorVersion)

// ---------------------------------------------------------------------------------------------------------------------
// UTIL
// ---------------------------------------------------------------------------------------------------------------------

// Util task for bs, gets a dependency list kinda like "sbt dependencyList", but only includes deps required for runtime
lazy val getDependencyList = Def.task[List[ModuleID]] {
// only get deps required for runtime and not for anything else like testing
val updateReport = update.value.configuration(ConfigRef("runtime"))

if (updateReport.isEmpty) {
List()
} else {
updateReport.get.modules.map(m => m.module).toList
}
}
@@ -138,7 +138,6 @@ object BootstrapUtility {
}

// TODO: Deployment readme file html
// TODO: Deployment bat file
// TODO: Deployment unix launch file (...?)
}
}

0 comments on commit 64227f9

Please sign in to comment.
You can’t perform that action at this time.