Merge pull request #247 from godenji/0.2.3

0.2.3 Release

CHANGELOG

@@ -1,3 +1,7 @@
+0.2.3 (10/August/17)
+
+* Updated to Scala 2.12.3
+
 0.2.2 (19/July/17)
 
 * Added IDE friendly preference descriptors

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.2"
+    "org.scalariform" %% "scalariform" % "0.2.3"
 
 Integration with Eclipse
 ------------------------

build.sbt

@@ -2,32 +2,31 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys
 import scalariform.formatter.preferences._
 
 lazy val commonSettings = inConfig(Test)(Defaults.testSettings) ++
-    SbtScalariform.defaultScalariformSettings ++ Seq(
-  organization := "org.scalariform",
-  sonatypeProfileName := organization.value,
-  scalaVersion := crossScalaVersions.value.head,
-  crossScalaVersions := Seq(
-    "2.12.2",
-    "2.11.11",
-    "2.10.6"
-  ),
-  exportJars := true, // Needed for cli oneJar
-  scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, 12)) => Seq(
-      "-Xlint:-unused,_", "-Ywarn-unused:imports",
-      "-language:postfixOps", "-language:implicitConversions",
-      "-deprecation", "-feature"
-    )
-    case Some((2, major)) if major >= 11 =>
-      scalac2_10Options ++ scalac2_11Options
-    case _ =>
-      scalac2_10Options
-  }),
-  credentials ++= {
-    val creds = Path.userHome / ".m2" / "credentials"
-    if (creds.exists) Seq(Credentials(creds)) else Nil
-  }
-)
+  SbtScalariform.defaultScalariformSettings ++ Seq(
+    organization := "org.scalariform",
+    sonatypeProfileName := organization.value,
+    scalaVersion := crossScalaVersions.value.head,
+    crossScalaVersions := Seq(
+      "2.12.3",
+      "2.11.11",
+      "2.10.6"
+    ),
+    scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, 12)) => Seq(
+        "-Xlint:-unused,_", "-Ywarn-unused:imports",
+        "-language:postfixOps", "-language:implicitConversions",
+        "-deprecation", "-feature"
+      )
+      case Some((2, major)) if major >= 11 =>
+        scalac2_10Options ++ scalac2_11Options
+      case _ =>
+        scalac2_10Options
+    }),
+    credentials ++= {
+      val creds = Path.userHome / ".m2" / "credentials"
+      if (creds.exists) Seq(Credentials(creds)) else Nil
+    }
+  )
 
 def scalac2_10Options = Seq(
   "-encoding", "UTF-8",
@@ -169,4 +168,9 @@ def pomExtraXml =
       <name>Mariano de Achaval</name>
       <url>https://github.com/machaval/</url>
     </developer>
+    <developer>
+      <id>godenji</id>
+      <name>N.S. Cutler</name>
+      <url>https://github.com/godenji/</url>
+    </developer>
   </developers>

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.scalariform</groupId>
   <artifactId>scalariform.parent</artifactId>
-  <version>0.2.2</version>
+  <version>0.2.3</version>
   <packaging>pom</packaging>
 
   <!-- scm configuration is require to extract the github hash-->
@@ -16,7 +16,7 @@
   <properties>
     <encoding>UTF-8</encoding>
     <tycho.version>0.24.0</tycho.version>
-    <scala.version>2.12.2</scala.version>
+    <scala.version>2.12.3</scala.version>
     <scala.xml.version>1.0.6</scala.xml.version>
     <scala.parser-combinators.version>1.0.6</scala.parser-combinators.version>
     <scala.version.suffix>2_12</scala.version.suffix>
@@ -162,7 +162,7 @@
     <profile>
       <id>scala-2.12.x</id>
       <properties>
-        <scala.version>2.12.2</scala.version>
+        <scala.version>2.12.3</scala.version>
         <version.suffix>2.12</version.suffix>
       </properties>
       <dependencies>

project/plugins.sbt

@@ -1,5 +1,5 @@
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
+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("com.eed3si9n" % "sbt-assembly" % "0.14.2")    
+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.2">
+      version="0.2.3">
 
    <description>
       Scala Code formatter

scalariform.feature/pom.xml

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

scalariform.update/pom.xml

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

scalariform.update/site.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
   <description name="Scalariform Update Site" 
-    url="https://github.com/scala-ide/scalariform/tree/0.2.2/scalariform.update/target/site">
+    url="https://github.com/scala-ide/scalariform/tree/0.2.3/scalariform.update/target/site">
       Scalariform Update Site
    </description>
-   <feature url="features/scalariform.feature_0.2.2.jar" version="0.2.2" id="scalariform.feature">
+   <feature url="features/scalariform.feature_0.2.3.jar" version="0.2.3" id="scalariform.feature">
       <category name="Scala"/>
    </feature>
    <category-def name="Scala" label="Scala"/>

scalariform.update/target/site/site.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
   <description name="Scalariform Update Site" 
-    url="https://github.com/scala-ide/scalariform/tree/0.2.2/scalariform.update/target/site">
+    url="https://github.com/scala-ide/scalariform/tree/0.2.3/scalariform.update/target/site">
       Scalariform Update Site
    </description>
-   <feature url="features/scalariform.feature_0.2.2.jar" version="0.2.2" id="scalariform.feature">
+   <feature url="features/scalariform.feature_0.2.3.jar" version="0.2.3" id="scalariform.feature">
       <category name="Scala"/>
    </feature>
    <category-def name="Scala" label="Scala"/>

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.2.2
+Bundle-Version: 0.2.3
 Require-Bundle: org.scala-lang.scala-library,
  org.scala-lang.modules.scala-xml
 Bundle-ClassPath: .

scalariform/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <artifactId>scalariform.parent</artifactId>
     <groupId>org.scalariform</groupId>
-    <version>0.2.2</version>
+    <version>0.2.3</version>
   </parent>
   <dependencies>
   </dependencies>

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.2.2"
+version in ThisBuild := "0.2.3"