Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cross build 2.12.x #197

Open
wants to merge 3 commits into
base: 0.5.x
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
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ git:
depth: 9999

scala:
- 2.11.8
- 2.11.12
- 2.12.8
jdk:
- oraclejdk8

Expand Down
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import com.typesafe.sbt.SbtGhPages.GhPagesKeys._
lazy val docsMappingsAPIDir = settingKey[String]("Name of subdirectory in site target directory for api docs")

val commonSettings = Seq(
scalaVersion := "2.11.8",
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.8"),
scalacOptions ++= Seq(
"-encoding", "UTF-8",
"-deprecation", // warning and location for usages of deprecated APIs
Expand Down Expand Up @@ -67,10 +68,10 @@ val noPublishing = Seq(publish := (), publishLocal := (), publishArtifact := fal


lazy val root = project.in(file("."))
.aggregate(core, cluster)
.settings(crossScalaVersions := Seq("2.11.12", "2.12.8"))
.settings(moduleName := "kanaloa")
.settings(noPublishing)

.aggregate(core, cluster)

lazy val core = project
.configs(Testing.Integration)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
package kanaloa.handler

import kanaloa.handler.AgentHandlerProviderSpec.{TestHandlerProvider, TestHandler}
import kanaloa.handler.HandlerProvider.{HandlersAdded, HandlerChange, Subscriber}
import org.scalatest.concurrent.{Eventually, AsyncAssertions}
import org.scalatest.{AsyncWordSpec, Matchers, WordSpecLike}
import kanaloa.handler.HandlerProvider.{HandlersAdded, HandlerChange}
import org.scalatest.concurrent.Eventually
import org.scalatest.{AsyncWordSpec, Matchers}

import scala.concurrent.ExecutionContext

import scala.concurrent.{Await, ExecutionContext}
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._
class AgentHandlerProviderSpec extends AsyncWordSpec with Matchers with Eventually {
override implicit val executionContext: ExecutionContext = ExecutionContext.global

"AgentHandlerProvider#addHandler" should {
"return true when the handler name is not" in {
val h = new TestHandlerProvider
Expand Down Expand Up @@ -44,10 +45,9 @@ class AgentHandlerProviderSpec extends AsyncWordSpec with Matchers with Eventual
h.addHandler(newHandler)

eventually(changes should contain(HandlersAdded(List(newHandler))))

}

"does not broadcast handler added event if the name is duplicated" in {
"not broadcast handler added event if the name is duplicated" in {
val h = new TestHandlerProvider
@volatile
var changes: List[HandlerChange] = Nil
Expand Down
2 changes: 1 addition & 1 deletion project/ClusterTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object ClusterTests {
libraryDependencies ++= Seq(
"com.typesafe.akka" %% "akka-remote" % Versions.akka,
"com.typesafe.akka" %% "akka-multi-node-testkit" % Versions.akka,
"org.scoverage" %% "scalac-scoverage-runtime" % "1.1.1"
"org.scoverage" %% "scalac-scoverage-runtime" % "1.3.1"
).map(_ % "test,multi-jvm"),

compile in MultiJvm <<= (compile in MultiJvm) triggeredBy (compile in Test),
Expand Down
3 changes: 2 additions & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ object Dependencies {

lazy val settings = Seq(

scalaVersion in Global := "2.11.8",
scalaVersion in Global := "2.11.12",
crossScalaVersions := Seq("2.11.12", "2.12.8"),

resolvers ++= Seq(
Resolver.typesafeRepo("releases"),
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.13
sbt.version=0.13.17
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.1")

addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")

addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0")

Expand Down