Merge pull request #253 from godenji/0.2.4

0.2.4 release

Author: godenji

CHANGELOG

@@ -1,3 +1,9 @@
+0.2.4 (25/October/17)
+
+* Updated to Scala 2.12.4
+* Updated to Sbt 1.0.2
+* Added support for multiline param groups (fixes #77)
+
 0.2.3 (10/August/17)
 
 * Updated to Scala 2.12.3

README.rst

@@ -52,7 +52,7 @@ Usage within a project
 
 Have a use for the scalariform source code directly? You can use it as a build dependency: ::
 
-    "org.scalariform" %% "scalariform" % "0.2.3"
+    "org.scalariform" %% "scalariform" % "0.2.4"
 
 Integration with Eclipse
 ------------------------
@@ -297,7 +297,7 @@ alignSingleLineCaseStatements.maxArrowIndent
 
 Default: ``40``
 
-When ``alignSingleLineCaseStatements`` is ``true``, this is a limit on
+When ``alignSingleLineCaseStatements`` is ``true`` there is a limit on
 the number of spaces that can be inserted before an arrow to align it
 with other case statements. This can be used to avoid very large gaps,
 e.g.:
@@ -309,6 +309,21 @@ e.g.:
     case ccc                                                       => 2
   }
 
+allowParamGroupsOnNewlines
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Default: ``false``
+
+When ``allowParamGroupsOnNewlines`` is ``true`` the default behavior of collapsing
+param groups into a single line is disabled. This allows for the following formatting style:
+
+.. code:: scala
+
+  def foo[T]
+    (a: A)
+    (b: B)
+    (implicit t: T)
+
 compactControlReadability
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 

build.sbt

@@ -1,13 +1,16 @@
 import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import scalariform.formatter.preferences._
 
+import scala.sys.process._
+import sbt.io.Using
+
 lazy val commonSettings = inConfig(Test)(Defaults.testSettings) ++
-  SbtScalariform.defaultScalariformSettings ++ Seq(
+  Seq(
     organization := "org.scalariform",
     sonatypeProfileName := organization.value,
     scalaVersion := crossScalaVersions.value.head,
     crossScalaVersions := Seq(
-      "2.12.3",
+      "2.12.4",
       "2.11.11",
       "2.10.6"
     ),
@@ -120,7 +123,7 @@ lazy val cli = (project
     mainClass in assembly := Some("scalariform.commandline.Main"),
     artifact in (Compile, assembly) := {
       val art = (artifact in (Compile, assembly)).value
-      art.copy(`classifier` = Some("assembly"))
+      art.withClassifier(Some("assembly"))
     }
   )
   settings(addArtifact(artifact in (Compile, assembly), assembly))

formatterPreferences.properties

@@ -2,6 +2,7 @@
 alignParameters=true
 alignSingleLineCaseStatements=true
 #alignSingleLineCaseStatements.maxArrowIndent=40
+#allowParamGroupsOnNewlines=false
 #compactControlReadability=false
 #compactStringConcatenation=false
 danglingCloseParenthesis=Force

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.scalariform</groupId>
   <artifactId>scalariform.parent</artifactId>
-  <version>0.2.3</version>
+  <version>0.2.4</version>
   <packaging>pom</packaging>
 
   <!-- scm configuration is require to extract the github hash-->

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.15
+sbt.version=1.0.2

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.7.1")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.1")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5")

scalariform.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="scalariform.feature"
       label="Scalariform"
-      version="0.2.3">
+      version="0.2.4">
 
    <description>
       Scala Code formatter

scalariform.feature/pom.xml

@@ -8,6 +8,6 @@
   <parent>
     <artifactId>scalariform.parent</artifactId>
     <groupId>org.scalariform</groupId>
-    <version>0.2.3</version>
+    <version>0.2.4</version>
   </parent>
 </project>

scalariform.update/pom.xml

@@ -8,6 +8,6 @@
   <parent>
     <artifactId>scalariform.parent</artifactId>
     <groupId>org.scalariform</groupId>
-    <version>0.2.3</version>
+    <version>0.2.4</version>
   </parent>
 </project>