Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/develop' into develop

  • Loading branch information
daniel0611 committed Oct 24, 2019
2 parents d83bfee + 00d8b34 commit 45ff8c661ca62d6238ec2bf7d1d0c5cdb69793a6
Showing with 3 additions and 3 deletions.
  1. +1 −1 build.sbt
  2. +1 −1 build/build.sbt
  3. +1 −1 src/main/scala/ScalatraBootstrap.scala
@@ -22,7 +22,7 @@
*/

name := "ChatOverflow"
version := "0.3"
version := "3.0.0"
mainClass := Some("org.codeoverflow.chatoverflow.Launcher")

// One version for all sub projects. Use "retrieveManaged := true" to download and show all library dependencies.
@@ -1,5 +1,5 @@
name := "chatoverflow-meta-build"
version := "0.3"
version := "3.0.0"
sbtPlugin := true

// With 2.12.5 the code doesn't compile when java >= 9 is used
@@ -11,7 +11,7 @@ import org.scalatra._
* This class provides all runtime information for Scalatra. Servlets are mounted here.
*/
class ScalatraBootstrap extends LifeCycle {
val apiVersion = "0.3"
val apiVersion = "3.0.0-0"
implicit val swagger: CodeOverflowSwagger = new CodeOverflowSwagger(apiVersion)

override def init(context: ServletContext) {

0 comments on commit 45ff8c6

Please sign in to comment.
You can’t perform that action at this time.