github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-02-21 00:30:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch to sbt 0.12.1

Browse Source 
- update all plugin versions
- drop the custom javadoc-sbt plugin in favor of sbt's native javadoc support
- update to a lift-json that's built against 2.9.2
This commit is contained in:
Havoc Pennington 2012-12-06 09:11:02 -05:00
parent 888e398367
commit 41d3d0bb1c
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/build.sbt
View File

@ -2,7 +2,6 @@ import de.johoop.findbugs4sbt.FindBugs._
import de.johoop.findbugs4sbt.ReportType
import de.johoop.jacoco4sbt._
import JacocoPlugin._
import javadoc.JavadocPlugin._
fork in test := true
@ -14,7 +13,7 @@ autoScalaLibrary := false
crossPaths := false
libraryDependencies += "net.liftweb" %% "lift-json" % "2.4" % "test"
libraryDependencies += "net.liftweb" %% "lift-json" % "2.5-M3" % "test"
libraryDependencies += "com.novocode" % "junit-interface" % "0.7" % "test"
@ -28,10 +27,6 @@ findbugsReportName := "findbugs.html"
seq(jacoco.settings : _*)
seq(javadocSettings: _*)
javacOptions in (Compile,doc) ++= Seq("-exclude", "com.typesafe.config.impl")
JavadocKeys.javadocOptions += "-exclude com.typesafe.config.impl"
doc in Compile <<= JavadocKeys.javadoc
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6")
javacOptions in (Compile,compile) ++= Seq("-source", "1.6", "-target", "1.6")

2
project/Build.scala
View File

@ -1,6 +1,6 @@
import sbt._
import Keys._
import com.typesafe.sbtosgi.OsgiPlugin._
import com.typesafe.sbt.osgi.SbtOsgi._
object ConfigBuild extends Build {
val unpublished = Seq(

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=0.11.2
sbt.version=0.12.1

BIN
project/lib/javadoc-sbt-0.1.0-SNAPSHOT.jar
View File

Binary file not shown.

14
project/plugins.sbt
View File

@ -1,13 +1,11 @@
addSbtPlugin("de.johoop" % "findbugs4sbt" % "1.1.6")
addSbtPlugin("de.johoop" % "findbugs4sbt" % "1.1.7")
libraryDependencies ++= Seq(
"org.jacoco" % "org.jacoco.core" % "0.5.6.201201232323" artifacts(Artifact("org.jacoco.core", "jar", "jar")),
"org.jacoco" % "org.jacoco.report" % "0.5.6.201201232323" artifacts(Artifact("org.jacoco.report", "jar", "jar")))
"org.jacoco" % "org.jacoco.core" % "0.5.9.201207300726" artifacts(Artifact("org.jacoco.core", "jar", "jar")),
"org.jacoco" % "org.jacoco.report" % "0.5.9.201207300726" artifacts(Artifact("org.jacoco.report", "jar", "jar")))
addSbtPlugin("de.johoop" % "jacoco4sbt" % "1.2.2")
addSbtPlugin("de.johoop" % "jacoco4sbt" % "1.2.4")
resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.7")
addSbtPlugin("com.jsuereth" % "xsbt-gpg-plugin" % "0.6")
addSbtPlugin("com.typesafe.sbtosgi" % "sbtosgi" % "0.2.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.4.0")