Merge pull request #49 from dwijnand/upgrades

Upgrade, migrate & cleanup

.travis.yml

@@ -0,0 +1,22 @@
+language: scala
+jdk: openjdk6
+scala: 2.10.6
+
+# Build only master and version tags - http://stackoverflow.com/a/31882307/463761
+branches:
+  only:
+    - master
+    - /^v[0-9]/
+
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt
+
+before_cache:
+  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
+  - find $HOME/.sbt        -name "*.lock"               -print -delete
+
+notifications:
+  email:
+    on_success: never

build.sbt

@@ -0,0 +1,50 @@
+val sbtScalariform = Project("sbt-scalariform", file("."))
+
+        organization := "org.scalariform"
+                name := "sbt-scalariform"
+version in ThisBuild := "1.6.0"
+
+  licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0")))
+  homepage := scmInfo.value map (_.browseUrl)
+   scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-scalariform"), "scm:git:git@github.com:sbt/sbt-scalariform.git"))
+developers := List(
+  Developer("hseeberger", "Heiko Seeberger", "mail at heikoseeberger de", url("http://blog.heikoseeberger.name/")),
+  Developer("daniel-trinh", "Daniel Trinh", "daniel s trinh at gmail com", url("http://danieltrinh.com"))
+)
+
+sbtPlugin := true
+
+scalacOptions ++= List(
+  "-unchecked",
+  "-deprecation",
+  "-Xlint",
+  "-language:_",
+  "-target:jvm-1.6",
+  "-encoding", "UTF-8"
+)
+
+resolvers ++= Seq(sonatypeSnapshots, sonatypeReleases)
+
+libraryDependencies += "org.scalariform" %% "scalariform" % "0.1.8"
+
+com.typesafe.sbt.SbtScalariform.ScalariformKeys.preferences := {
+  import scalariform.formatter.preferences._
+  FormattingPreferences()
+    .setPreference(AlignParameters, true)
+    .setPreference(CompactStringConcatenation, true)
+    .setPreference(CompactControlReadability, false)
+    .setPreference(AlignSingleLineCaseStatements, true)
+    .setPreference(AlignSingleLineCaseStatements.MaxArrowIndent, 40)
+    .setPreference(SpacesWithinPatternBinders, true)
+    .setPreference(DoubleIndentClassDeclaration, true)
+    .setPreference(SpacesAroundMultiImports, true)
+    .setPreference(PreserveDanglingCloseParenthesis, true)
+}
+
+publishTo := Some(if (isSnapshot.value) sonatypeSnapshots else sonatypeReleases)
+publishMavenStyle := true
+publishArtifact in Test := false
+publishArtifact in (Compile, packageSrc) := true
+
+val sonatypeSnapshots = "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
+val sonatypeReleases  = "Sonatype OSS Releases"  at "https://oss.sonatype.org/service/local/staging/deploy/maven2"

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.13

src/main/scala/com/typesafe/sbt/SbtScalariform.scala

@@ -17,13 +17,28 @@
 package com.typesafe.sbt
 
 import sbt._
-import sbt.plugins.JvmPlugin
 import sbt.{ IntegrationTest => It }
 import sbt.Keys._
 import scala.collection.immutable.Seq
 import scalariform.formatter.preferences.IFormattingPreferences
 
 object SbtScalariform extends AutoPlugin {
+  override def requires = plugins.JvmPlugin
+  override def trigger = allRequirements
+
+  object autoImport {
+    val scalariformFormat = taskKey[Seq[File]]("Format (Scala) sources using scalariform")
+    val scalariformPreferences = settingKey[IFormattingPreferences]("Scalariform formatting preferences, e.g. indentation")
+
+    def scalariformSettings: Seq[Setting[_]] = Def.settings(
+      defaultScalariformSettings,
+      compileInputs in (Compile, compile) := ((compileInputs in (Compile, compile)) dependsOn (scalariformFormat in Compile)).value,
+      compileInputs in (Test, compile) := ((compileInputs in (Test, compile)) dependsOn (scalariformFormat in Test)).value
+    ).toList
+  }
+  import autoImport._
+
+  override def projectSettings = scalariformSettings
 
   val defaultPreferences = {
     import scalariform.formatter.preferences._
@@ -32,34 +47,6 @@ object SbtScalariform extends AutoPlugin {
       .setPreference(DoubleIndentClassDeclaration, true)
   }
 
-  object autoImport {
-
-    val scalariformFormat: TaskKey[Seq[File]] =
-      TaskKey[Seq[File]](
-        prefixed("format"),
-        "Format (Scala) sources using scalariform"
-      )
-
-    val scalariformPreferences: SettingKey[IFormattingPreferences] =
-      SettingKey[IFormattingPreferences](
-        prefixed("preferences"),
-        "Scalariform formatting preferences, e.g. indentation"
-      )
-    private def prefixed(key: String) = s"scalariform-$key"
-
-    def scalariformSettings: Seq[Setting[_]] =
-      defaultScalariformSettings ++ List(
-        compileInputs in (Compile, compile) <<= (compileInputs in (Compile, compile)) dependsOn (scalariformFormat in Compile),
-        compileInputs in (Test, compile) <<= (compileInputs in (Test, compile)) dependsOn (scalariformFormat in Test)
-      )
-  }
-
-  import autoImport._
-
-  override lazy val projectSettings = scalariformSettings
-  override val trigger = allRequirements
-  override val requires = JvmPlugin
-
   object ScalariformKeys {
 
     val format = autoImport.scalariformFormat
@@ -69,12 +56,12 @@ object SbtScalariform extends AutoPlugin {
 
   def scalariformSettings: Seq[Setting[_]] = autoImport.scalariformSettings
 
-  def scalariformSettingsWithIt: Seq[Setting[_]] =
-    defaultScalariformSettingsWithIt ++ List(
-      compileInputs in (Compile, compile) <<= (compileInputs in (Compile, compile)) dependsOn (scalariformFormat in Compile),
-      compileInputs in (Test, compile) <<= (compileInputs in (Test, compile)) dependsOn (scalariformFormat in Test),
-      compileInputs in (It, compile) <<= (compileInputs in (It, compile)) dependsOn (scalariformFormat in It)
-    )
+  def scalariformSettingsWithIt: Seq[Setting[_]] = Def.settings(
+    defaultScalariformSettingsWithIt,
+    compileInputs in (Compile, compile) := ((compileInputs in (Compile, compile)) dependsOn (scalariformFormat in Compile)).value,
+    compileInputs in (Test, compile) := ((compileInputs in (Test, compile)) dependsOn (scalariformFormat in Test)).value,
+    compileInputs in (It, compile) := ((compileInputs in (It, compile)) dependsOn (scalariformFormat in It)).value
+  ).toList
 
   def defaultScalariformSettings: Seq[Setting[_]] =
     noConfigScalariformSettings ++ inConfig(Compile)(configScalariformSettings) ++ inConfig(Test)(configScalariformSettings)