Merge branch 'release/1.0.0' into develop

5 files changed, 13 insertions, 13 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 643dae3..5a8765b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,3 @@
-Version 1.0.0 (2011-xx-xx)
+Version 1.0.0 (2011-07-18)
 --------------------------
 first public release
diff --git a/README.markdown b/README.markdown
index 752ccdf..1d1edec 100644
--- a/README.markdown
+++ b/README.markdown
@@ -4,22 +4,22 @@ It sports the following features:
   
 * Simple immutable model of the JSON language elements
 * An efficient JSON PEG parser (implemented with [parboiled][])
-* Choice of either compact or pretty JSON to-string-printing
+* Choice of either compact or pretty JSON-to-string printing
 * Type-class based (de)serialization of custom objects (no reflection, no intrusion)
 
 
 ### Installation
 
 _spray-json_ is available from the [scala-tools.org][] repositories.  
-There is no official release yet, but the current snapshot is `1.0-SNAPSHOT`.
-It is built against Scala 2.9.0-1, but backporting to 2.8.1 is no problem (let me know if you need a 2.8.1 compatible version).
+The latest release is `1.0.0`.
+It's built against Scala 2.9.0-1, but backporting to 2.8.1 is no problem (let me know if you need a 2.8.1 compatible version).
 
 If you use SBT you can include _spray-json_ in your project with
 
-    val sprayJsonModuleConfig = ModuleConfiguration("cc.spray.json", ScalaToolsSnapshots)
-    val sprayJson = "cc.spray.json" %% "spray-json" % "1.0.0-SNAPSHOT" % "compile" withSources()
+    val sprayJson = "cc.spray.json" %% "spray-json" % "1.0.0" % "compile" withSources()
 
-_spray-json_ has only one dependency: the parsing library [parboiled][] (which is also a dependency of _spray-server_ and _spray-client_, so if you use _spray-json_ with either of them you are not incurring any additional dependency).
+_spray-json_ has only one dependency: the parsing library [parboiled][]
+(which is also a dependency of _spray-server_ and _spray-client_, so if you use _spray-json_ with either of them you are not incurring any additional dependency).
 
 
 ### Usage
diff --git a/notes/1.0.0.markdown b/notes/1.0.0.markdown
index 052244f..b8da79e 100644
--- a/notes/1.0.0.markdown
+++ b/notes/1.0.0.markdown
@@ -4,7 +4,7 @@ It sports the following features:
 
 * Simple immutable model of the JSON language elements
 * An efficient JSON PEG parser (implemented with [parboiled][])
-* Choice of either compact or pretty JSON to-string-printing
+* Choice of either compact or pretty JSON-to-string printing
 * Type-class based (de)serialization of custom objects (no reflection, no intrusion)
 
   [JSON]: http://json.org
diff --git a/project/build.properties b/project/build.properties
index 3dbea88..1d7351e 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,6 +1,6 @@
 project.organization=cc.spray.json
 project.name=spray-json
 sbt.version=0.7.7
-project.version=1.0.0-SNAPSHOT
+project.version=1.0.0
 build.scala.versions=2.9.0-1
 project.initialize=false
diff --git a/project/build/Project.scala b/project/build/Project.scala
index a520152..adea045 100644
--- a/project/build/Project.scala
+++ b/project/build/Project.scala
@@ -21,8 +21,8 @@ class Project(info: ProjectInfo) extends DefaultProject(info) with posterous.Pub
   // -------------------------------------------------------------------------------------------------------------------
   // Dependencies
   // -------------------------------------------------------------------------------------------------------------------
-  val parboiledC = "org.parboiled" % "parboiled-core" % "1.0.0" % "compile" withSources()
-  val parboiledS = "org.parboiled" % "parboiled-scala" % "1.0.0" % "compile" withSources()
+  val parboiledC = "org.parboiled" % "parboiled-core" % "1.0.1" % "compile" withSources()
+  val parboiledS = "org.parboiled" % "parboiled-scala" % "1.0.1" % "compile" withSources()
   
   val specs = "org.scala-tools.testing" %% "specs" % "1.6.8" % "test" withSources()
   
@@ -35,8 +35,8 @@ class Project(info: ProjectInfo) extends DefaultProject(info) with posterous.Pub
   // -------------------------------------------------------------------------------------------------------------------
   // 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/"
+  //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