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

Update dependencies #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
sudo: false
language: scala

jdk:
- oraclejdk8
env:
- TRAVIS_JDK=8
mkurz marked this conversation as resolved.
Show resolved Hide resolved
- TRAVIS_JDK=11

before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version

script:
- sbt +test
- sbt +publishLocal
- sbt +test +publishLocal

sudo: false

cache:
directories:
- $HOME/.ivy2/cache

- "$HOME/.coursier/cache"
- "$HOME/.ivy2/cache"
- "$HOME/.jabba/jdk"

before_cache:
# Delete all ivydata files
- find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm

10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@ organization := "com.typesafe"
name := "jse"

scalaVersion := "2.10.7"
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.7")
crossScalaVersions := Seq(scalaVersion.value, "2.11.12", "2.12.10")

libraryDependencies ++= {
val akkaVersion = scalaBinaryVersion.value match {
case "2.10" => "2.3.16"
case "2.11" => "2.3.16"
case "2.12" => "2.5.18"
case "2.11" => "2.5.26"
case "2.12" => "2.6.0"
}
Seq(
"com.typesafe.akka" %% "akka-actor" % akkaVersion,
"io.apigee.trireme" % "trireme-core" % "0.9.4",
"io.apigee.trireme" % "trireme-node10src" % "0.9.4",
"io.spray" %% "spray-json" % "1.3.5",
"org.slf4j" % "slf4j-api" % "1.7.25",
"org.slf4j" % "slf4j-api" % "1.7.29",
"com.typesafe.akka" %% "akka-testkit" % akkaVersion % "test",
"junit" % "junit" % "4.12" % "test",
"org.slf4j" % "slf4j-simple" % "1.7.25" % "test",
"org.slf4j" % "slf4j-simple" % "1.7.29" % "test",
"org.specs2" %% "specs2-core" % "3.10.0" % "test"
)
}
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=0.13.17
sbt.version=0.13.18
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ libraryDependencies ++= Seq(
"org.scala-sbt" % "scripted-plugin" % sbtVersion.value
)

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.12")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
5 changes: 3 additions & 2 deletions src/test/scala-2.11/com/typesafe/jse/AkkaCompat.scala
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.typesafe.jse

import akka.actor.ActorSystem
import scala.concurrent.Await
import scala.concurrent.duration._

object AkkaCompat {
def terminate(system: ActorSystem): Unit = {
system.shutdown()
system.awaitTermination()
Await.ready(system.terminate(), 10.seconds)
mkurz marked this conversation as resolved.
Show resolved Hide resolved
}
}