Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename installBloop to bloopInstall #346

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Rename installBloop to bloopInstall #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object AutoImported {
import sbt.{SettingKey, TaskKey, settingKey, taskKey}
val bloopConfigDir: SettingKey[File] =
settingKey[File]("Directory where to write bloop configuration files")
val installBloop: TaskKey[Unit] =
val bloopInstall: TaskKey[Unit] =
taskKey[Unit]("Generate all bloop configuration files")
val bloopGenerate: sbt.TaskKey[Unit] =
sbt.taskKey[Unit]("Generate bloop configuration files for this project")
Expand All @@ -26,7 +26,7 @@ object AutoImported {
object PluginImplementation {
import bloop.integrations.sbt.{AutoImported => BloopKeys}
val globalSettings: Seq[Def.Setting[_]] = List(
BloopKeys.installBloop := PluginDefaults.installBloop.value
BloopKeys.bloopInstall := PluginDefaults.bloopInstall.value
)

val configSettings: Seq[Def.Setting[_]] = {
Expand Down Expand Up @@ -106,7 +106,7 @@ object PluginImplementation {
// format: ON
}

lazy val installBloop: Def.Initialize[Task[Unit]] = Def.taskDyn {
lazy val bloopInstall: Def.Initialize[Task[Unit]] = Def.taskDyn {
val filter = ScopeFilter(sbt.inAnyProject, sbt.inConfigurations(Compile, Test))
BloopKeys.bloopGenerate.all(filter).map(_ => ())
}
Expand Down
2 changes: 1 addition & 1 deletion project/BuildPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ object BuildImplementation {
val pluginsProperty = s"-D${BuildPaths.GlobalPluginsProperty}=${globalPluginsBase}"
val indexProperty = s"-Dbloop.integrations.index=${buildIndexFile.getAbsolutePath}"
val properties = stagingProperty :: indexProperty :: pluginsProperty :: settingsProperty :: Nil
val toRun = "installBloop" :: "buildIndex" :: Nil
val toRun = "bloopInstall" :: "buildIndex" :: Nil
val cmd = "sbt" :: (properties ++ toRun)

IO.delete(buildIndexFile)
Expand Down
4 changes: 2 additions & 2 deletions website/content/docs/getting-started-sbt.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "<latest-release>")
[![Latest
version](https://index.scala-lang.org/scalacenter/bloop/sbt-bloop/latest.svg)](https://index.scala-lang.org/scalacenter/bloop/sbt-bloop).

Once sbt is configured, you can run `installBloop` to generate the Bloop configuration:
Once sbt is configured, you can run `bloopInstall` to generate the Bloop configuration:

```sh
$ sbt installBloop
$ sbt bloopInstall
[info] Loading global plugins from /Users/martin/.sbt/1.0/plugins
(...)
[success] Bloop wrote the configuration of project 'foo' to '/my-project/.bloop-config/foo.config'.
Expand Down