summaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorMathias <mathias@spray.cc>2011-11-09 11:33:46 +0100
committerMathias <mathias@spray.cc>2011-11-09 12:40:16 +0100
commit9cda445514efe7700544e2b121c2258a69b9b207 (patch)
tree3e195b19204346e72dace087597014a6ab451677 /project
parentc453ff95bcd69f57299b198c552e409e27488f74 (diff)
downloadspray-json-9cda445514efe7700544e2b121c2258a69b9b207.tar.gz
spray-json-9cda445514efe7700544e2b121c2258a69b9b207.tar.bz2
spray-json-9cda445514efe7700544e2b121c2258a69b9b207.zip
Upgrade to SBT 0.11.0
Diffstat (limited to 'project')
-rw-r--r--project/build.properties7
-rw-r--r--project/build/Project.scala79
-rw-r--r--project/idea.properties2
-rw-r--r--project/plugins/Plugins.scala26
4 files changed, 1 insertions, 113 deletions
diff --git a/project/build.properties b/project/build.properties
index 729c026..c6158f7 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1 @@
-project.organization=cc.spray.json
-project.name=spray-json
-sbt.version=0.7.7
-project.version=1.1.0-SNAPSHOT
-build.scala.versions=2.9.1
-project.initialize=false
+sbt.version=0.11.0 \ No newline at end of file
diff --git a/project/build/Project.scala b/project/build/Project.scala
deleted file mode 100644
index ca1bacd..0000000
--- a/project/build/Project.scala
+++ /dev/null
@@ -1,79 +0,0 @@
-import sbt._
-import Process._
-
-class Project(info: ProjectInfo) extends DefaultProject(info) with posterous.Publish {
-
- // -------------------------------------------------------------------------------------------------------------------
- // All repositories *must* go here! See ModuleConfigurations below.
- // -------------------------------------------------------------------------------------------------------------------
- object Repositories {
- // e.g. val AkkaRepo = MavenRepository("Akka Repository", "http://akka.io/repository")
- }
-
- // -------------------------------------------------------------------------------------------------------------------
- // ModuleConfigurations
- // Every dependency that cannot be resolved from the built-in repositories (Maven Central and Scala Tools Releases)
- // must be resolved from a ModuleConfiguration. This will result in a significant acceleration of the update action.
- // Therefore, if repositories are defined, this must happen as def, not as val.
- // -------------------------------------------------------------------------------------------------------------------
- import Repositories._
-
- // -------------------------------------------------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------------------------------------------------
- val parboiledC = "org.parboiled" % "parboiled-core" % "1.0.2" % "compile" withSources()
- val parboiledS = "org.parboiled" % "parboiled-scala" % "1.0.2" % "compile" withSources()
-
- // -------------------------------------------------------------------------------------------------------------------
- // Testing with Specs2
- // -------------------------------------------------------------------------------------------------------------------
- val specs2 = "org.specs2" %% "specs2" % "1.6.1" % "test" withSources()
-
- def specs2Framework = new TestFramework("org.specs2.runner.SpecsFramework")
- override def testFrameworks = super.testFrameworks ++ Seq(specs2Framework)
-
- // -------------------------------------------------------------------------------------------------------------------
- // Options
- // -------------------------------------------------------------------------------------------------------------------
- override def compileOptions = super.compileOptions ++ Seq("-deprecation", "-encoding", "utf8").map(CompileOption(_))
- override def documentOptions: Seq[ScaladocOption] = documentTitle(name + " " + version) :: Nil
-
- // -------------------------------------------------------------------------------------------------------------------
- // Publishing
- // -------------------------------------------------------------------------------------------------------------------
- val publishTo = "Scala Tools Snapshots" at "http://nexus.scala-tools.org/content/repositories/snapshots/"
- //val publishTo = "Scala Tools Releases" at "http://nexus.scala-tools.org/content/repositories/releases/"
-
- Credentials(Path.userHome / ".ivy2" / ".credentials", log)
- override def managedStyle = ManagedStyle.Maven
- override def packageDocsJar = defaultJarPath("-scaladoc.jar")
- override def packageSrcJar = defaultJarPath("-sources.jar")
- val sourceArtifact = Artifact(artifactID, "src", "jar", Some("sources"), Nil, None)
- val docsArtifact = Artifact(artifactID, "docs", "jar", Some("scaladoc"), Nil, None)
- override def packageToPublishActions = super.packageToPublishActions ++ Seq(packageDocs, packageSrc)
-
- override def pomExtra = (
- <name>spray JSON</name>
- <url>http://spray.cc/</url>
- <inceptionYear>2011</inceptionYear>
- <description>A Scala library for easy and idiomatic JSON (de)serialization</description>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <developers>
- <developer>
- <id>sirthias</id>
- <name>Mathias Doenitz</name>
- <timezone>+1</timezone>
- <email>mathias [at] spray.cc</email>
- </developer>
- </developers>
- <scm>
- <url>http://github.com/spray/spray-json/</url>
- </scm>
- )
-}
diff --git a/project/idea.properties b/project/idea.properties
deleted file mode 100644
index 6716523..0000000
--- a/project/idea.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-include.sbt.project.definition.module = false
-excluded.folders = .idea,lib_managed,target,test-output \ No newline at end of file
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
deleted file mode 100644
index a6b0cfd..0000000
--- a/project/plugins/Plugins.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-import sbt._
-
-class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
-
- // -------------------------------------------------------------------------------------------------------------------
- // All repositories *must* go here! See ModuleConigurations below.
- // -------------------------------------------------------------------------------------------------------------------
- object Repositories {
- // e.g. val akkaRepo = MavenRepository("Akka Repository", "http://akka.io/repository")
- }
-
- // -------------------------------------------------------------------------------------------------------------------
- // ModuleConfigurations
- // Every dependency that cannot be resolved from the built-in repositories (Maven Central and Scala Tools Releases)
- // must be resolved from a ModuleConfiguration. This will result in a significant acceleration of the update action.
- // Therefore, if repositories are defined, this must happen as def, not as val.
- // -------------------------------------------------------------------------------------------------------------------
- import Repositories._
- val posterousSbtModuleConfig = ModuleConfiguration("net.databinder", ScalaToolsReleases)
-
- // -------------------------------------------------------------------------------------------------------------------
- // Plugins
- // -------------------------------------------------------------------------------------------------------------------
-
- val posterousSbt = "net.databinder" % "posterous-sbt" % "0.1.7"
-}