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

Commit 64227f9

Browse files
committed
Removed closed TODOs, updated build.sbt
1 parent e58f089 commit 64227f9

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

bootstrap/src/main/scala/Bootstrap.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ object Bootstrap {
3838
if (!new File("config/").exists()) {
3939
new File("config/").mkdir()
4040
}
41-
// TODO: Fix chat overflow config service to handle non existent config folder. I mean... what?
4241

4342
// Start chat overflow!
4443
val process = new java.lang.ProcessBuilder(javaPath.get, "-cp", s"bin/*${File.pathSeparator}lib/*", chatOverflowMainClass)

build.sbt

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,6 @@ lazy val pluginFolderNames = settingKey[List[String]]("The folder names of all p
7070
lazy val pluginTargetFolderNames = settingKey[List[String]]("The folder names of compiled and packaged plugins. Remember to gitignore these!")
7171
lazy val apiProjectPath = settingKey[String]("The path to the api sub project. Remember to gitignore it!")
7272

73-
// Util task for bs, gets a dependency list kinda like "sbt dependencyList", but only includes deps required for runtime
74-
lazy val getDependencyList = Def.task[List[ModuleID]] {
75-
// only get deps required for runtime and not for anything else like testing
76-
val updateReport = update.value.configuration(ConfigRef("runtime"))
77-
78-
if (updateReport.isEmpty) {
79-
List()
80-
} else {
81-
updateReport.get.modules.map(m => m.module).toList
82-
}
83-
}
84-
8573
// Plugin framework tasks
8674
lazy val create = TaskKey[Unit]("create", "Creates a new plugin. Interactive command using the console.")
8775
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
9987
pluginTargetFolderNames.value, apiProjectPath.value)
10088
copy := BuildUtility(streams.value.log).copyPluginsTask(pluginFolderNames.value, pluginTargetFolderNames.value, scalaMajorVersion)
10189
bs := BootstrapUtility.bootstrapGenTask(streams.value.log, s"$scalaMajorVersion$scalaMinorVersion", getDependencyList.value)
102-
deploy := BootstrapUtility.prepareDeploymentTask(streams.value.log, scalaMajorVersion)
90+
deploy := BootstrapUtility.prepareDeploymentTask(streams.value.log, scalaMajorVersion)
91+
92+
// ---------------------------------------------------------------------------------------------------------------------
93+
// UTIL
94+
// ---------------------------------------------------------------------------------------------------------------------
95+
96+
// Util task for bs, gets a dependency list kinda like "sbt dependencyList", but only includes deps required for runtime
97+
lazy val getDependencyList = Def.task[List[ModuleID]] {
98+
// only get deps required for runtime and not for anything else like testing
99+
val updateReport = update.value.configuration(ConfigRef("runtime"))
100+
101+
if (updateReport.isEmpty) {
102+
List()
103+
} else {
104+
updateReport.get.modules.map(m => m.module).toList
105+
}
106+
}

project/BootstrapUtility.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ object BootstrapUtility {
138138
}
139139

140140
// TODO: Deployment readme file html
141-
// TODO: Deployment bat file
142141
// TODO: Deployment unix launch file (...?)
143142
}
144143
}

0 commit comments

Comments
 (0)