Merge pull request #54 from daniel-trinh/daniel-trinh/52-prepare-0.1.6

Prepare for 0.1.6 release

Author: daniel-trinh

CHANGELOG

@@ -1,5 +1,10 @@
-0.1.6 (17/Jan/15)
-* FIX: FQN package name changed from scalariform to com.danieltrinh.scalariform to avoid dependency collision with prior mdr/scalariform fork
+0.1.6 (08/April/15)
+* FIX: Bug in parser prevented DOT characters inside type parameters (issue #44)
+* Newline no longer added for each function in `=> => =>` scenarios (issue #45)
+* Update build to sbt 0.13.7 and update java version validation (PR #42)
+* Rewrite -> into → when RewriteArrowSymbols is on (issue #34)
+* Sync maven build with sbt build (PR #22)
+* Add support for Scala 2.12 in the maven build (PR #20)
 
 0.1.5 (4/May/14)
 * FIX: Type formatter crash on multiline types

README.rst

@@ -39,6 +39,13 @@ A version for sbt >= 0.13.x has been written by Peter Vlugter: https://github.co
 
 Please see https://github.com/sbt/sbt-scalariform for older versions of sbt.
 
+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.1.6"
+
 Integration with Eclipse
 ------------------------
 

cli/src/main/scala/com/danieltrinh/scalariform/commandline/CommandLineOptionParser.scala

@@ -1,4 +1,4 @@
-package com.danieltrinh.scalariform.commandline
+package scalariform.commandline
 
 import scala.util.parsing.input._
 import scala.util.parsing.combinator._

cli/src/main/scala/com/danieltrinh/scalariform/commandline/Main.scala

@@ -1,14 +1,14 @@
-package com.danieltrinh.scalariform.commandline
+package scalariform.commandline
 
 import java.io.File
 import java.io.IOException
 import java.nio.charset._
 import scala.io.Source
-import com.danieltrinh.scalariform.formatter.preferences._
-import com.danieltrinh.scalariform.formatter.ScalaFormatter
-import com.danieltrinh.scalariform.parser.ScalaParserException
-import com.danieltrinh.scalariform.utils.Utils._
-import com.danieltrinh.scalariform.ScalaVersions
+import scalariform.formatter.preferences._
+import scalariform.formatter.ScalaFormatter
+import scalariform.parser.ScalaParserException
+import scalariform.utils.Utils._
+import scalariform.ScalaVersions
 
 object Main {
 

cli/src/main/scala/com/danieltrinh/scalariform/commandline/ScalaFileWalker.scala

@@ -1,4 +1,4 @@
-package com.danieltrinh.scalariform.commandline
+package scalariform.commandline
 
 import java.io.File
 import java.util.{ ArrayList, Collection }

misc/src/main/scala/com/danieltrinh/scalariform/corpusscan/CorpusScanner.scala

@@ -1,17 +1,17 @@
-package com.danieltrinh.scalariform.corpusscan
+package scalariform.corpusscan
 
 import java.io.File
 
 import scala.io.Source
 
 import org.apache.commons.io.FileUtils
 
-import com.danieltrinh.scalariform.commandline.ScalaFileWalker
-import com.danieltrinh.scalariform.formatter._
-import com.danieltrinh.scalariform.formatter.preferences.FormattingPreferences
-import com.danieltrinh.scalariform.lexer._
-import com.danieltrinh.scalariform.parser._
-import com.danieltrinh.scalariform.utils.Utils.writeText
+import scalariform.commandline.ScalaFileWalker
+import scalariform.formatter._
+import scalariform.formatter.preferences.FormattingPreferences
+import scalariform.lexer._
+import scalariform.parser._
+import scalariform.utils.Utils.writeText
 
 sealed trait ParseFault
 case object TokensDoNotCoverSource extends ParseFault

misc/src/main/scala/com/danieltrinh/scalariform/gui/FormatterFrame.scala

@@ -1,4 +1,4 @@
-package com.danieltrinh.scalariform.gui
+package scalariform.gui
 
 import java.awt.event._
 import java.awt.{ List ⇒ _, _ }
@@ -13,16 +13,16 @@ import javax.swing.border.TitledBorder
 import net.miginfocom.layout._
 import net.miginfocom.swing._
 
-import com.danieltrinh.scalariform.astselect._
-import com.danieltrinh.scalariform.utils.Utils._
-import com.danieltrinh.scalariform.utils.Range
-import com.danieltrinh.scalariform.parser._
-import com.danieltrinh.scalariform.formatter._
-import com.danieltrinh.scalariform.formatter.preferences._
-import com.danieltrinh.scalariform.lexer._
-import com.danieltrinh.scalariform.lexer.Tokens._
-import com.danieltrinh.scalariform.gui.SwingUtils._
-import com.danieltrinh.scalariform.parser._
+import scalariform.astselect._
+import scalariform.utils.Utils._
+import scalariform.utils.Range
+import scalariform.parser._
+import scalariform.formatter._
+import scalariform.formatter.preferences._
+import scalariform.lexer._
+import scalariform.lexer.Tokens._
+import scalariform.gui.SwingUtils._
+import scalariform.parser._
 import scala.util.parsing.input._
 import scala.util.parsing.combinator._
 

misc/src/main/scala/com/danieltrinh/scalariform/gui/Main.scala

@@ -1,6 +1,6 @@
-package com.danieltrinh.scalariform.gui
+package scalariform.gui
 
-import com.danieltrinh.scalariform.utils.Utils._
+import scalariform.utils.Utils._
 import javax.swing.JFrame
 
 object Main {

misc/src/main/scala/com/danieltrinh/scalariform/gui/ParseTreeModel.scala

@@ -1,10 +1,10 @@
-package com.danieltrinh.scalariform.gui
+package scalariform.gui
 
 import javax.swing.event.TreeModelListener
 import javax.swing.tree._
-import com.danieltrinh.scalariform.lexer.Token
-import com.danieltrinh.scalariform.parser.AstNode
-import com.danieltrinh.scalariform.utils.Range
+import scalariform.lexer.Token
+import scalariform.parser.AstNode
+import scalariform.utils.Range
 
 class ParseTreeModel(rootAstNode: AstNode) extends TreeModel {
 

misc/src/main/scala/com/danieltrinh/scalariform/gui/SwingUtils.scala

@@ -1,4 +1,4 @@
-package com.danieltrinh.scalariform.gui
+package scalariform.gui
 
 import javax.swing.event.ListSelectionListener
 import javax.swing.event.ListSelectionEvent