From 44c4cb2a34e97df689a43d551ec1d3635258d92e Mon Sep 17 00:00:00 2001 From: jvican Date: Wed, 14 Mar 2018 16:11:00 +0100 Subject: [PATCH] Rename `installBloop` to `bloopInstall` Fixes https://github.com/scalacenter/bloop/issues/341. --- .../src/main/scala/bloop/integrations/sbt/SbtBloop.scala | 6 +++--- project/BuildPlugin.scala | 2 +- website/content/docs/getting-started-sbt.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala b/integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala index ea5fbc681a..c7e54e4656 100644 --- a/integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala +++ b/integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala @@ -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") @@ -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[_]] = { @@ -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(_ => ()) } diff --git a/project/BuildPlugin.scala b/project/BuildPlugin.scala index 3571edaeef..142243e895 100644 --- a/project/BuildPlugin.scala +++ b/project/BuildPlugin.scala @@ -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) diff --git a/website/content/docs/getting-started-sbt.md b/website/content/docs/getting-started-sbt.md index 08dad43710..d5bace351a 100644 --- a/website/content/docs/getting-started-sbt.md +++ b/website/content/docs/getting-started-sbt.md @@ -26,10 +26,10 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "") [![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'.