Skip to content

Commit

Permalink
[2.8] Fix play-scala-tls-example on Java 11 (#19)
Browse files Browse the repository at this point in the history
[2.8] Fix play-scala-tls-example on Java 11
  • Loading branch information
dwijnand committed May 28, 2019
2 parents ec17d62 + 18179f8 commit f09dff8
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 12 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,6 @@ env:
- SCRIPT="cd play-scala-tls-example && scripts/test-sbt" TRAVIS_JDK=adopt@1.11.0-2
- SCRIPT="cd play-scala-websocket-example && scripts/test-sbt" TRAVIS_JDK=adopt@1.11.0-2

matrix:
fast_finish: true
allow_failures:
# Java 11 is not fully supported, look at and resolve these issues
- env: SCRIPT="cd play-scala-tls-example && scripts/test-sbt" TRAVIS_JDK=adopt@1.11.0-2

before_install:
- sudo add-apt-repository -y ppa:ondrej/php && sudo apt-get -qq update && sudo apt-get install -y libsodium-dev # for secure session examples
- curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
Expand Down
4 changes: 0 additions & 4 deletions play-scala-tls-example/conf/ws.conf
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
play.ws.ssl {

debug = {
handshake = true
}

keyManager = {
stores = [
// Note: must be run from ./play, which loads the KEY_PASSWORD environment variable.
Expand Down
3 changes: 1 addition & 2 deletions play-scala-tls-example/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
// The Play plugin
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")

addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.0-M1")

0 comments on commit f09dff8

Please sign in to comment.