From ebb6b2cf705c6746828f1d9fe341a7e568da0817 Mon Sep 17 00:00:00 2001 From: Marko Elezovic Date: Mon, 1 Jul 2013 21:28:33 +0200 Subject: [PATCH] Whitespace OCD --- launch/src/main/input_resources/sbt/sbt.boot.properties | 2 +- launch/src/main/resources/sbt.boot.properties0.10.0 | 2 +- launch/src/main/resources/sbt.boot.properties0.10.1 | 2 +- launch/src/main/resources/sbt.boot.properties0.11.0 | 2 +- launch/src/main/resources/sbt.boot.properties0.11.1 | 2 +- launch/src/main/resources/sbt.boot.properties0.11.2 | 2 +- launch/src/main/resources/sbt.boot.properties0.11.3 | 2 +- launch/src/main/resources/sbt.boot.properties0.7 | 4 ++-- src/main/conscript/sbt/launchconfig | 2 +- src/main/conscript/scalas/launchconfig | 2 +- src/main/conscript/screpl/launchconfig | 2 +- src/sphinx/Detailed-Topics/Launcher.rst | 8 ++++---- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/launch/src/main/input_resources/sbt/sbt.boot.properties b/launch/src/main/input_resources/sbt/sbt.boot.properties index f7460164c..0fc66cd88 100644 --- a/launch/src/main/input_resources/sbt/sbt.boot.properties +++ b/launch/src/main/input_resources/sbt/sbt.boot.properties @@ -16,7 +16,7 @@ ${{repositories}} maven-central [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.10.0 b/launch/src/main/resources/sbt.boot.properties0.10.0 index 47a411edb..8cd568598 100644 --- a/launch/src/main/resources/sbt.boot.properties0.10.0 +++ b/launch/src/main/resources/sbt.boot.properties0.10.0 @@ -16,7 +16,7 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.10.1 b/launch/src/main/resources/sbt.boot.properties0.10.1 index 3c734b08d..247e2a79d 100644 --- a/launch/src/main/resources/sbt.boot.properties0.10.1 +++ b/launch/src/main/resources/sbt.boot.properties0.10.1 @@ -16,7 +16,7 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.11.0 b/launch/src/main/resources/sbt.boot.properties0.11.0 index 27727d7eb..9fd96d88b 100644 --- a/launch/src/main/resources/sbt.boot.properties0.11.0 +++ b/launch/src/main/resources/sbt.boot.properties0.11.0 @@ -16,7 +16,7 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.11.1 b/launch/src/main/resources/sbt.boot.properties0.11.1 index 7439d2c13..44f912512 100644 --- a/launch/src/main/resources/sbt.boot.properties0.11.1 +++ b/launch/src/main/resources/sbt.boot.properties0.11.1 @@ -16,7 +16,7 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.11.2 b/launch/src/main/resources/sbt.boot.properties0.11.2 index 6773ff547..c63fa7c7c 100644 --- a/launch/src/main/resources/sbt.boot.properties0.11.2 +++ b/launch/src/main/resources/sbt.boot.properties0.11.2 @@ -16,7 +16,7 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.11.3 b/launch/src/main/resources/sbt.boot.properties0.11.3 index e42b70738..e55c596d0 100644 --- a/launch/src/main/resources/sbt.boot.properties0.11.3 +++ b/launch/src/main/resources/sbt.boot.properties0.11.3 @@ -16,7 +16,7 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/launch/src/main/resources/sbt.boot.properties0.7 b/launch/src/main/resources/sbt.boot.properties0.7 index b29cad683..52b4f6876 100644 --- a/launch/src/main/resources/sbt.boot.properties0.7 +++ b/launch/src/main/resources/sbt.boot.properties0.7 @@ -16,8 +16,8 @@ sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} - properties: project/build.properties + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + properties: project/build.properties [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/src/main/conscript/sbt/launchconfig b/src/main/conscript/sbt/launchconfig index 707d24f98..545638df2 100644 --- a/src/main/conscript/sbt/launchconfig +++ b/src/main/conscript/sbt/launchconfig @@ -17,7 +17,7 @@ maven-central [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index d217c2218..84a9071b4 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -17,7 +17,7 @@ maven-central [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index 4807e6ec8..7fb20a797 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -17,7 +17,7 @@ maven-central [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} diff --git a/src/sphinx/Detailed-Topics/Launcher.rst b/src/sphinx/Detailed-Topics/Launcher.rst index 00e70e787..8193f0ca3 100644 --- a/src/sphinx/Detailed-Topics/Launcher.rst +++ b/src/sphinx/Detailed-Topics/Launcher.rst @@ -162,7 +162,7 @@ The default configuration file for sbt looks like: sonatype-snapshots: https://oss.sonatype.org/content/repositories/snapshots [boot] - directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} + directory: ${sbt.boot.directory-${sbt.global.base-${user.home}/.sbt}/boot/} [ivy] ivy-home: ${sbt.ivy.home-${user.home}/.ivy2/} @@ -182,8 +182,8 @@ classifiers, such as 'sources', of extra Scala artifacts to retrieve. The ``app.org``, ``app.name``, and ``app.version`` properties specify the organization, module ID, and version of the application, respectively. These are used to resolve and retrieve the application -from the repositories listed in ``[repositories]``. If -``app.cross-versioned`` is ``binary``, the resolved module ID is +from the repositories listed in ``[repositories]``. If +``app.cross-versioned`` is ``binary``, the resolved module ID is ``{app.name+'_'+CrossVersion.binaryScalaVersion(scala.version)}``. If ``app.cross-versioned`` is ``true`` or ``full``, the resolved module ID is ``{app.name+'_'+scala.version}``. The ``scala.version`` property must be @@ -363,7 +363,7 @@ it might look like: local maven-central [boot] - directory: ${user.home}/.myapp/boot + directory: ${user.home}/.myapp/boot Then, ``publishLocal`` or ``+publishLocal`` the application to make it available.