Skip to content
This repository has been archived by the owner on Apr 23, 2019. It is now read-only.

Commit

Permalink
Upgrade branch 2.7.x using TemplateControl (#86)
Browse files Browse the repository at this point in the history
* Updated with template-control on 2019-01-04T21:47:48.107Z
  /.travis.yml:
    wrote /.travis.yml
  **build.sbt:
    scalaVersion := "2.12.8"
  **/build.properties:
    sbt.version=1.2.8
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.0-RC3")
  **/plugins.sbt:
    addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "5.0.0-RC1")

* Update plugins.sbt
  • Loading branch information
marcospereira authored and mergify[bot] committed Jan 5, 2019
1 parent b4edb9c commit a815b81
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 22 deletions.
56 changes: 36 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,50 @@
language: scala
scala:
- 2.12.7
jdk:
- oraclejdk8
- openjdk11
- 2.12.8

before_install:
- curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh

env:
global:
- JABBA_HOME=$HOME/.jabba
matrix:
- SCRIPT=scripts/test-sbt
script:
- $SCRIPT
cache:
directories:
- "$HOME/.ivy2/cache"
before_cache:
- rm -rf $HOME/.ivy2/cache/com.typesafe.play/*
- rm -rf $HOME/.ivy2/cache/scala_*/sbt_*/com.typesafe.play/*
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print0 | xargs -n10 -0 rm
# There is no concise way to specify multi-dimensional build matrix:
# https://github.com/travis-ci/travis-ci/issues/1519
- SCRIPT=scripts/test-sbt [email protected]
- SCRIPT=scripts/test-sbt [email protected]
- SCRIPT=scripts/test-gradle [email protected]
- SCRIPT=scripts/test-gradle [email protected]

# Exclude some combinations from build matrix. See:
# https://docs.travis-ci.com/user/customizing-the-build/#Build-Matrix
matrix:
fast_finish: true
allow_failures:
# Current release of Gradle still does not supports Play 2.7.x releases
# As soon as there is a release of Gradle that fixes that, we can then
# remove this allowed failure.
- env: SCRIPT=scripts/test-gradle [email protected]
- env: SCRIPT=scripts/test-gradle [email protected]
# Java 11 is still not fully supported. It is good that we are already
# testing our sample applications to better discover possible problems
# but we can allow failures here too.
- jdk: openjdk11
- env: SCRIPT=scripts/test-sbt [email protected]

install:
- $JABBA_HOME/bin/jabba install $TRAVIS_JDK
- unset _JAVA_OPTIONS
- export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version

# See https://blog.travis-ci.com/2014-03-13-slack-notifications/
# created with travis encrypt command line tool
notifications:
slack:
secure: K6HWTI6zJpQfxS7sH5ZQ1jEK5TkkUl5GtcGinNecHMBqvfS4IXAnU23lz/kLqCqMVPIFaRx1g6UwgJgMvR4XWeIhpzLOzAnOOcmv+kQzv7A8vEJBM20z1HNzDcxzvuNNO2BHn8EjXh5VD65vXMcA+lKzUxASey/Rs+CBReQWE7M=
script:
- $SCRIPT

before_cache:
- find $HOME/.ivy2 -name "ivydata-*.properties" -delete
- find $HOME/.sbt -name "*.lock" -delete

cache:
directories:
- "$HOME/.ivy2/cache"
- "$HOME/.gradle/caches"
- "$HOME/.jabba/jdk"
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "play-java-ebean-example"

version := "1.0.0-SNAPSHOT"

scalaVersion := "2.12.7"
scalaVersion := "2.12.8"

lazy val root = (project in file(".")).enablePlugins(PlayJava, PlayEbean)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.1
sbt.version=1.2.8

0 comments on commit a815b81

Please sign in to comment.