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") {