Merge remote-tracking branch 'origin/master' into daniel-trinh/52-prepare-0.1.6

Author: Daniel Trinh

README.rst

@@ -22,15 +22,15 @@ Packaging an executable JAR
 
 If you would like to package scalariform for use on the command line with java -jar, clone the repo and perform the following simple steps: ::
 
-    sbt one-jar
+    sbt "project cli" "assembly"
 
 sbt will build one jar with all the dependencies and put it in ::
 
-    cli/target/scala-$your_scala_version/scalariform.jar
+    cli/target/scala-$your_scala_version/cli-assembly-$scalariform_version.jar
 
 You can copy this to a location in your path and execute it as follows: ::
 
-   java -jar /home/me/bin/scalariform.jar -f -q +compactControlReadability +alignParameters +alignSingleLineCaseStatements +doubleIndentClassDeclaration +preserveDanglingCloseParenthesis +rewriteArrowSymbols +preserveSpaceBeforeArguments --stdout ~/myproject/src/main/scala/Stuff.scala > Stuff.scala
+   java -jar /home/me/bin/cli-assembly-$scalariform_version.jar -f -q +compactControlReadability +alignParameters +alignSingleLineCaseStatements +doubleIndentClassDeclaration +preserveDanglingCloseParenthesis +rewriteArrowSymbols +preserveSpaceBeforeArguments --stdout ~/myproject/src/main/scala/Stuff.scala > Stuff.scala
 
 Integration with sbt
 --------------------

project/Build.scala

@@ -1,13 +1,13 @@
 import sbt._
 import sbt.Keys._
-import com.github.retronym.SbtOneJar
 import com.typesafe.sbteclipse.core.EclipsePlugin.EclipseKeys._
 import com.typesafe.sbteclipse.core.EclipsePlugin._
 import com.typesafe.sbt.SbtScalariform
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import scalariform.formatter.preferences._
 import xerial.sbt.Sonatype._
 import xerial.sbt.Sonatype.SonatypeKeys._
+import sbtassembly.AssemblyPlugin.autoImport._
 
 object ScalariformBuild extends Build {
 
@@ -94,13 +94,17 @@ object ScalariformBuild extends Build {
     else
       Some("releases" at "https://oss.sonatype.org/service/local/staging/deploy/maven2")
 
-  lazy val cli = Project("cli", file("cli"), settings = subprojectSettings ++ SbtOneJar.oneJarSettings ++
+  lazy val cli = Project("cli", file("cli"), settings = subprojectSettings ++
     Seq(
       libraryDependencies += "commons-io" % "commons-io" % "1.4",
       mainClass in (Compile, packageBin) := Some("scalariform.commandline.Main"),
-      artifactName in SbtOneJar.oneJar := { (version: ScalaVersion, module: ModuleID, artifact: Artifact) ⇒ "scalariform.jar" },
-      publish := (),
-      publishLocal := ())) dependsOn (scalariform)
+      mainClass in assembly := Some("scalariform.commandline.Main"),
+      artifact in (Compile, assembly) := {
+        val art = (artifact in (Compile, assembly)).value
+        art.copy(`classifier` = Some("assembly"))
+      }
+    ) ++ addArtifact(artifact in (Compile, assembly), assembly)
+  ) dependsOn (scalariform)
 
   lazy val misc: Project = Project("misc", file("misc"), settings = subprojectSettings ++
     Seq(

project/plugins.sbt

@@ -1,7 +1,5 @@
 resolvers += Classpaths.typesafeReleases
 
-addSbtPlugin("com.github.retronym" % "sbt-onejar" % "0.8")
-
 resolvers += Classpaths.typesafeSnapshots
 
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
@@ -14,4 +12,6 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.0")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
 
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.13.0")
+
 retrieveManaged := true