Permalink
Browse files

Merge branch 'master' of github.com:reportgrid/RosettaJson

Conflicts:
	project/Build.scala
  • Loading branch information...
2 parents 5684fba + 344a689 commit 229c13fc86ae6784a8fd5e0efe92bae59a0af3b4 @nuttycom nuttycom committed Dec 29, 2011
Showing with 33 additions and 18 deletions.
  1. +25 −18 project/Build.scala
  2. +8 −0 project/plugins.sbt
View
@@ -11,24 +11,31 @@ object RosettaJsonBuild extends Build {
credentials += Credentials(Path.userHome / ".ivy2" / ".rgcredentials")
)
- lazy val rosettaJson: Project = Project("rosetta-json", file(".")) settings(nexusSettings ++ Seq(
- organization := "com.reportgrid",
- version := "0.3.5",
- scalaVersion := "2.9.1",
- scalacOptions ++= Seq("-deprecation", "-unchecked"),
- libraryDependencies ++= Seq(
- "com.reportgrid" %% "blueeyes" % "0.5.1",
- "net.databinder" %% "dispatch-http-json" % "0.8.5" % "provided",
- "net.liftweb" %% "lift-json" % "2.4-M4" % "provided" intransitive(),
- "org.scala-tools.testing" %% "scalacheck" % "1.9" % "test",
- "org.scala-tools.testing" %% "specs" % "1.6.9" % "test"
- ),
- publishTo <<= (version) { version: String =>
- val nexus = "http://nexus.reportgrid.com/content/repositories/public-"
- if (version.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus+"snapshots/")
- else Some("releases" at nexus+"releases/")
- }
- ): _*)
+ val blueeyesDeps = com.samskivert.condep.Depends(
+ ("blueeyes", null, "com.reportgrid" %% "blueeyes" % "0.5.1" % "provided")
+ )
+
+ lazy val rosettaJson: Project = blueeyesDeps addDeps {
+ Project(id = "rosetta-json", base = file(".")) settings(nexusSettings ++ Seq(
+ organization := "com.reportgrid",
+ version := "0.3.5",
+ scalaVersion := "2.9.1",
+ scalacOptions ++= Seq("-deprecation", "-unchecked"),
+
+ libraryDependencies ++= blueeyesDeps.libDeps ++ Seq(
+ "joda-time" % "joda-time" % "1.6.2" % "provided",
+ "net.databinder" %% "dispatch-http-json" % "0.8.5" % "provided",
+ "net.liftweb" %% "lift-json" % "2.4-M4" % "provided" intransitive(),
+ "org.scala-tools.testing" %% "scalacheck" % "1.9" % "test",
+ "org.scala-tools.testing" %% "specs" % "1.6.9" % "test"),
+
+ publishTo <<= (version) { version: String =>
+ val nexus = "http://nexus.reportgrid.com/content/repositories/"
+ if (version.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus+"public-snapshots/")
+ else Some("releases" at nexus+"public-releases/")
+ }
+ ): _*)
+ }
}
// vim: set ts=4 sw=4 et:
View
@@ -0,0 +1,8 @@
+resolvers ++= Seq("Condep repo" at "http://samskivert.github.com/sbt-condep-plugin/maven",
+ "sbt-idea-repo" at "http://mpeltonen.github.com/maven/")
+
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.7.2")
+
+addSbtPlugin("com.samskivert" %% "sbt-condep-plugin" % "1.1")
+
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "0.11.0")

0 comments on commit 229c13f

Please sign in to comment.