Merge branch 'master' of https://github.com/scala-labs/scala-labs

upeter · upeter · commit 55d5f17f0b31 · 2015-06-19T12:06:11.000+02:00
diff --git a/labs/build.sbt b/labs/build.sbt
@@ -30,3 +30,5 @@ libraryDependencies ++= Seq("joda-time" % "joda-time" % "1.6",
         "org.hibernate" % "hibernate-entitymanager" % "3.4.0.GA",
         "org.slf4j" % "slf4j-simple" % "1.4.2")
 
+scalariformSettings
+
diff --git a/labs/pom.xml b/labs/pom.xml
@@ -254,6 +254,22 @@
 					</buildcommands>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.scalariform</groupId>
+				<artifactId>scalariform-maven-plugin</artifactId>
+				<executions>
+					<execution>
+						<phase>process-sources</phase>
+						<goals>
+							<goal>format</goal>
+						</goals>
+						<configuration>
+							<rewriteArrowSymbols>true</rewriteArrowSymbols>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
 		</plugins>
 	</build>
 
diff --git a/labs/project/plugins.sbt b/labs/project/plugins.sbt
@@ -4,3 +4,5 @@
 addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.2")
 
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
