Skip to content

Upgrade to Scala 2.10.4 & Play 2.3.3 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zamblauskas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to Scala 2.10.4 & Play 2.3.3 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ organization := "eu.teamon"

name := "play-navigator"

version := "0.5.0"
version := "0.5.1"

scalaVersion := "2.10.2"
scalaVersion := "2.10.4"

scalaBinaryVersion := "2.10"

Expand All @@ -19,7 +19,7 @@ resolvers ++= Seq(
Resolver.typesafeRepo("snapshots")
)

val play_version = Option(System.getenv("PLAY_VERSION")).getOrElse("2.2.0")
val play_version = Option(System.getenv("PLAY_VERSION")).getOrElse("2.3.3")

libraryDependencies ++= (
Seq(
Expand Down
4 changes: 1 addition & 3 deletions src/main/scala/play/navigator/PlayNavigator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package play

import scala.language.implicitConversions
import play.api.Mode
import play.api.mvc._
import play.api.mvc.Results.NotFound
import play.core.Router


object navigator {
Expand Down Expand Up @@ -58,7 +56,7 @@ object navigator {

def onHandlerNotFound(request: RequestHeader) = {
NotFound(play.api.Play.maybeApplication.map {
case app if app.mode == Mode.Dev => views.html.defaultpages.devNotFound.f
case app if app.mode == Mode.DEV => views.html.defaultpages.devNotFound.f
case app => views.html.defaultpages.notFound.f
}.getOrElse(views.html.defaultpages.devNotFound.f)(request, Some(router)))
}
Expand Down