Unify more in single build.sbt file. Upgrade of SBT plugins.

Author: Mathias Bogaert

build.sbt

@@ -1,16 +1,69 @@
 import com.typesafe.sbt.osgi.SbtOsgi._
+import com.typesafe.sbt.SbtScalariform
+import com.typesafe.sbt.SbtScalariform.ScalariformKeys
+import com.typesafe.sbt.osgi.SbtOsgi
 
-lazy val scalaLogging = project in file(".")
+import scalariform.formatter.preferences.{AlignSingleLineCaseStatements, DoubleIndentClassDeclaration}
 
-name := "scala-logging"
+enablePlugins(SbtOsgi)
 
-Common.settings ++ defaultOsgiSettings ++ Seq(
-  packageBin in Runtime <<= OsgiKeys.bundle,
-  packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), OsgiKeys.bundle).identityMap,
-  OsgiKeys.exportPackage := Seq("com.typesafe.scalalogging")
+name := "scala-logging"
+organization := "com.typesafe.scala-logging"
+licenses := Seq("Apache 2.0 License" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"))
+homepage := Some(url("https://github.com/typesafehub/scala-logging"))
+scalaVersion := Version.scala
+crossScalaVersions := Version.crossScala
+scalacOptions ++= List(
+  "-unchecked",
+  "-deprecation",
+  "-language:_",
+  "-encoding", "UTF-8"
 )
 
+osgiSettings
+
+OsgiKeys.bundleSymbolicName := s"com.typesafe.scalalogging"
+OsgiKeys.exportPackage := Seq(s"com.typesafe.scalalogging.*;version=${version.value}")
+
+packageBin in Runtime <<= OsgiKeys.bundle
+packagedArtifact in (Compile, packageBin) <<= (artifact in (Compile, packageBin), OsgiKeys.bundle).identityMap
+
+unmanagedSourceDirectories in Compile := List((scalaSource in Compile).value)
+unmanagedSourceDirectories in Test := List((scalaSource in Test).value)
+
+releaseVersionBump := sbtrelease.Version.Bump.Minor
+releaseCrossBuild := true
+releasePublishArtifactsAction := PgpKeys.publishSigned.value
+
+SbtScalariform.scalariformSettings
+
+ScalariformKeys.preferences := ScalariformKeys.preferences.value
+  .setPreference(AlignSingleLineCaseStatements, true)
+  .setPreference(AlignSingleLineCaseStatements.MaxArrowIndent, 100)
+  .setPreference(DoubleIndentClassDeclaration, true)
+
 libraryDependencies ++= Dependencies.scalaLogging(scalaVersion.value)
 
 initialCommands := """|import com.typesafe.scalalogging._
                       |import org.slf4j.{ Logger => Underlying, _ }""".stripMargin
+
+publishTo <<= isSnapshot(isSnapshot => Some(if (isSnapshot) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging))
+publishArtifact in Test := false
+pomIncludeRepository := (_ => false)
+pomExtra :=
+  <scm>
+    <url>https://github.com/typesafehub/scala-logging</url>
+    <connection>scm:git:git://github.com/typesafehub/scala-logging.git</connection>
+  </scm>
+    <developers>
+      <developer>
+        <id>hseeberger</id>
+        <name>Heiko Seeberger</name>
+        <url>http://heikoseeberger.de</url>
+      </developer>
+      <developer>
+        <id>analytically</id>
+        <name>Mathias Bogaert</name>
+        <url>http://twitter.com/analytically</url>
+      </developer>
+    </developers>

project/Common.scala

@@ -18,7 +18,6 @@ object Library {
 }
 
 object Dependencies {
-
   import Library._
 
   def scalaLogging(scalaVersion: String) = List(

project/Dependencies.scala

@@ -1,9 +1,11 @@
+resolvers += Resolver.typesafeRepo("releases")
+
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
 
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.5")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
+addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.1")
 
-addSbtPlugin("com.scalapenos" % "sbt-prompt" % "0.2.1")
+addSbtPlugin("com.scalapenos" % "sbt-prompt" % "1.0.0")