package com.github.jt.sbt

import sbt._

/**
 * Dependencies which work together.
 */
object Deps {
  object Json {
    private val version = "3.3.0"
    val json4s    = "org.json4s" %% "json4s-jackson" % version
    val json4sExt = "org.json4s" %% "json4s-ext" % version
  }

  object Scalatra {
    private val version = "2.4.0"
    private def module(name: String) = "org.scalatra" %% name % version
    val scalatra  = module("scalatra")
    val json      = module("scalatra-json")
    val swagger   = module("scalatra-swagger")
    val scalatest = module("scalatra-scalatest") % "it;test"

    val servletApi = "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
  }
}

package com.github.jt.sbt

import sbt._

/**
 * Dependencies which work together.
 */
object Deps {
  // Upgrade Scalatra + Json together
  // Scalatra 2.3 -> Json 3.2
  // Scalatra 2.4 -> Json 3.3
  object Json {
    private val version = "3.2.11"
    val json4s    = "org.json4s" %% "json4s-jackson" % version
    val json4sExt = "org.json4s" %% "json4s-ext" % version
  }

  object Scalatra {
    private val version = "2.3.1"
    private def module(name: String) = "org.scalatra" %% name % version
    val scalatra  = module("scalatra")
    val json      = module("scalatra-json")
    val swagger   = module("scalatra-swagger")
    val scalatest = module("scalatra-scalatest") % "it;test"

    val servletApi = "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided"
  }
}

--- 
+++ 
@@ -6,17 +6,14 @@
  * Dependencies which work together.
  */
 object Deps {
-  // Upgrade Scalatra + Json together
-  // Scalatra 2.3 -> Json 3.2
-  // Scalatra 2.4 -> Json 3.3
   object Json {
-    private val version = "3.2.11"
+    private val version = "3.3.0"
     val json4s    = "org.json4s" %% "json4s-jackson" % version
     val json4sExt = "org.json4s" %% "json4s-ext" % version
   }
 
   object Scalatra {
-    private val version = "2.3.1"
+    private val version = "2.4.0"
     private def module(name: String) = "org.scalatra" %% name % version
     val scalatra  = module("scalatra")
     val json      = module("scalatra-json")
Use Scalatra 2.4, Json 3.3
