Merge pull request #3 from scalableminds/scala-version-2.11

Update Scala Version to 2.11.7

.gitignore

@@ -16,3 +16,4 @@ project/plugins/project/
 .settings/
 .cache
 .project
+.idea/

project/Build.scala

@@ -1,21 +1,20 @@
 import sbt._
 import sbt.Keys._
-import play.Project._
 import sbt.Task
 import sbtassembly.PathList
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global
+import play.sbt.routes.RoutesKeys._
 
 object Dependencies{
-  val braingamesVersion = "6.10.16-master-fix"
+  val braingamesVersion = "8.9.1"
 
   val braingamesDataStore = "com.scalableminds" %% "braingames-datastore" % braingamesVersion
 }
 
 object Resolvers {
-  val scmRel = Resolver.url("Scalableminds REL Repo", url("http://scalableminds.github.com/releases/"))(Resolver.ivyStylePatterns)
-  val scmIntRel = "scm.io intern releases repo" at "http://maven.scm.io/releases/"
-  val scmIntSnaps = "scm.io intern snapshots repo" at "http://maven.scm.io/snapshots/"
+  val scmRel = "scm.io releases S3 bucket" at "https://s3-eu-central-1.amazonaws.com/maven.scm.io/releases/"
+  val scmSnaps = "scm.io snapshots S3 bucket" at "https://s3-eu-central-1.amazonaws.com/maven.scm.io/snapshots/"
 }
 
 object ApplicationBuild extends Build with sbtassembly.AssemblyKeys {
@@ -25,12 +24,14 @@ object ApplicationBuild extends Build with sbtassembly.AssemblyKeys {
 
 
   lazy val datastoreSettings = Seq(
-    scalaVersion := "2.10.3",
+    version := braingamesVersion,
+    libraryDependencies += braingamesDataStore,
+    scalaVersion := "2.11.7",
       resolvers ++= Seq(
       scmRel,
-      scmIntRel,
-      scmIntSnaps
+      scmSnaps
     ),
+    routesGenerator := InjectedRoutesGenerator,
     assemblyMergeStrategy in assembly := {
       case "application.conf"                                                  => MergeStrategy.concat
       case "package-info.class"                                                => MergeStrategy.concat
@@ -57,10 +58,8 @@ object ApplicationBuild extends Build with sbtassembly.AssemblyKeys {
     }
   )
 
-  lazy val standaloneDatastore: Project = play.Project(
-    "standalone-datastore", 
-    braingamesVersion, 
-    dependencies = Seq(braingamesDataStore), 
-    settings = datastoreSettings)
+  lazy val standaloneDatastore: Project = Project("standalone-datastore", file("."))
+    .enablePlugins(play.PlayScala)
+    .settings(datastoreSettings:_*)
 }
 

project/plugins.sbt

@@ -3,4 +3,4 @@ resolvers ++= Seq(
     "Typesafe Repository" at "http://repo.typesafe.com/typesafe/releases/"
 )
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.6")