diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..c547352 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: scala +scala: +- 2.11.7 +jdk: +- oraclejdk8 +sudo: false +script: ./.travis_scripts/validate.sh diff --git a/.travis_scripts/validate.sh b/.travis_scripts/validate.sh new file mode 100755 index 0000000..143d586 --- /dev/null +++ b/.travis_scripts/validate.sh @@ -0,0 +1,12 @@ +#! /bin/bash + +SCRIPT_DIR=`dirname $0 | sed -e "s|^\./|$PWD/|"` + +# Sonatype staging (avoid Central sync delay) +perl -pe 's|:= buildVersion|:= buildVersion\r\n\r\nresolvers += "Sonatype Staging" at "https://oss.sonatype.org/content/repositories/staging/"|' < "$SCRIPT_DIR/../build.sbt" > /tmp/build.sbt && mv /tmp/build.sbt "$SCRIPT_DIR/../build.sbt" + +if [ `sbt 'show version' 2>&1 | tail -n 1 | cut -d ' ' -f 2 | grep -- '-SNAPSHOT' | wc -l` -eq 1 ]; then + perl -pe 's|:= buildVersion|:= buildVersion\r\n\r\nresolvers += "Sonatype Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/"|' < "$SCRIPT_DIR/../build.sbt" > /tmp/build.sbt && mv /tmp/build.sbt "$SCRIPT_DIR/../build.sbt" +fi + +sbt +testOnly diff --git a/app/controllers/Articles.scala b/app/controllers/Articles.scala index a35e3af..fb955ce 100644 --- a/app/controllers/Articles.scala +++ b/app/controllers/Articles.scala @@ -26,7 +26,8 @@ import models.Article, Article._ class Articles @Inject() ( val messagesApi: MessagesApi, - val reactiveMongoApi: ReactiveMongoApi) + val reactiveMongoApi: ReactiveMongoApi, + implicit val materializer: akka.stream.Materializer) extends Controller with MongoController with ReactiveMongoComponents { import java.util.UUID diff --git a/app/views/articles.scala.html b/app/views/articles.scala.html index 5b6ad0c..d9c9339 100644 --- a/app/views/articles.scala.html +++ b/app/views/articles.scala.html @@ -1,6 +1,6 @@ @(articles: List[models.Article], activeSort: String) -@main("Welcome to Play 2.0") { +@main("Welcome to ReactiveMongo Demo") {

Available articles

diff --git a/app/views/editArticle.scala.html b/app/views/editArticle.scala.html index 3e06edf..1c47b38 100644 --- a/app/views/editArticle.scala.html +++ b/app/views/editArticle.scala.html @@ -1,6 +1,6 @@ @(id: Option[String], form: Form[models.Article], files: Option[List[(play.api.libs.json.JsString, reactivemongo.api.gridfs.ReadFile[reactivemongo.play.json.JSONSerializationPack.type, play.api.libs.json.JsString])]])(implicit lang: play.api.i18n.Messages) -@main("Welcome to ReactiveMongo on Play 2.4") { +@main("Welcome to ReactiveMongo Demo") {

diff --git a/build.sbt b/build.sbt index c38f3a2..df31b69 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,14 @@ -import play.PlayImport.PlayKeys._ - name := "reactivemongo-demo-app" -version := "0.11.10" +val buildVersion = "0.11.11" + +version := buildVersion + +resolvers += "Sonatype Staging" at "https://oss.sonatype.org/content/repositories/staging/" scalaVersion := "2.11.7" -libraryDependencies += "org.reactivemongo" %% "play2-reactivemongo" % "0.11.10" +libraryDependencies += "org.reactivemongo" %% "play2-reactivemongo" % buildVersion routesGenerator := InjectedRoutesGenerator diff --git a/conf/application.conf b/conf/application.conf index 68e8c90..6b1bdd3 100644 --- a/conf/application.conf +++ b/conf/application.conf @@ -26,6 +26,7 @@ play.modules.enabled += "play.modules.reactivemongo.ReactiveMongoModule" # Simple configuration (by URI) mongodb.uri = "mongodb://localhost:27017/reactivemongo-demo-app" +mongodb.uri = ${?MONGO_URI} # URI + Authentication # mongodb.uri = "mongodb://jack:jack@localhost:27017/toto" @@ -36,4 +37,4 @@ mongodb.uri = "mongodb://localhost:27017/reactivemongo-demo-app" # If you want to turn on logging for ReactiveMongo, uncomment and customize this line # logger.reactivemongo=DEBUG -logger.reactivemongo=INFO \ No newline at end of file +logger.reactivemongo=INFO diff --git a/project/build.properties b/project/build.properties index 748703f..43b8278 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.7 +sbt.version=0.13.11 diff --git a/project/plugins.sbt b/project/plugins.sbt index ac7576e..2eefbca 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ resolvers ++= Seq( "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" ) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.6") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.0")