prep for snapshot release

daniel-trinh · Aug 28, 2015 · 55c4086 · 55c4086
1 parent 91aafbd
commit 55c4086
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+0.1.7 (27/August/15)
+* FIX: correct checkFile exit status in scalariform-cli (issue #61)
+* FIX: Fix multi-line argument lists when IndentWithTabs is enabled. (issue #63)
+* FIX: Parse <: as SUBTYPE in scala 2.10.5 (PR #73)
+
 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)

diff --git a/README.rst b/README.rst
@@ -57,7 +57,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.1.6"
+    "org.scalariform" %% "scalariform" % "0.1.7"
 
 Integration with Eclipse
 ------------------------
@@ -287,23 +287,23 @@ using `Compact Control Readability`_ style
 
   if (x == y) {
     foo()
-  } 
+  }
   else if (y == z) {
     bar()
-  } 
+  }
   else {
     baz()
-  }  
+  }
 
   try {
     foo()
-  } 
+  }
   catch {
     case _ => bar()
-  } 
+  }
   finally {
     baz()
-  }  
+  }
 
 
 compactStringConcatenation

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.scalariform</groupId>
   <artifactId>scalariform.parent</artifactId>
-  <version>0.1.6-SNAPSHOT</version>
+  <version>0.1.7-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- scm configuration is require to extract the github hash-->

diff --git a/project/Build.scala b/project/Build.scala
@@ -26,7 +26,7 @@ object ScalariformBuild extends Build {
   lazy val commonSettings = Defaults.defaultSettings ++ SbtScalariform.defaultScalariformSettings ++ sonatypeSettings ++ Seq(
     organization := "org.scalariform",
     profileName := "org.scalariform",
-    version := "0.1.6",
+    version := "0.1.7-SNAPSHOT",
     scalaVersion := "2.10.5",
     crossScalaVersions := Seq(
       "2.11.6",

diff --git a/scalariform.feature/pom.xml b/scalariform.feature/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>scalariform.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<version>0.1.6-SNAPSHOT</version>
+	<version>0.1.7-SNAPSHOT</version>
 	<parent>
 		<artifactId>scalariform.parent</artifactId>
 		<groupId>org.scalariform</groupId>
-		<version>0.1.6-SNAPSHOT</version>
+		<version>0.1.7-SNAPSHOT</version>
 	</parent>
 </project>
 
diff --git a/scalariform.update/pom.xml b/scalariform.update/pom.xml
@@ -5,11 +5,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>scalariform.update</artifactId>
 	<packaging>eclipse-update-site</packaging>
-	<version>0.1.6-SNAPSHOT</version>
+	<version>0.1.7-SNAPSHOT</version>
 	<parent>
 		<artifactId>scalariform.parent</artifactId>
 		<groupId>com.danieltrinh</groupId>
-		<version>0.1.6-SNAPSHOT</version>
+		<version>0.1.7-SNAPSHOT</version>
 	</parent>
 </project>
 
diff --git a/scalariform/META-INF/MANIFEST.MF b/scalariform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Scalariform
 Bundle-SymbolicName: scalariform
-Bundle-Version: 0.1.6.qualifier
+Bundle-Version: 0.1.7.qualifier
 Require-Bundle: org.scala-lang.scala-library,
  org.scala-lang.modules.scala-xml
 Bundle-ClassPath: .

diff --git a/scalariform/pom.xml b/scalariform/pom.xml
@@ -4,12 +4,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.scalariform</groupId>
   <artifactId>scalariform</artifactId>
-  <version>0.1.6-SNAPSHOT</version>
+  <version>0.1.7-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <parent>
     <artifactId>scalariform.parent</artifactId>
     <groupId>org.scalariform</groupId>
-    <version>0.1.6-SNAPSHOT</version>
+    <version>0.1.7-SNAPSHOT</version>
   </parent>
   <dependencies>
   </dependencies>