Skip to content
This repository has been archived by the owner on Jun 1, 2021. It is now read-only.

Commit

Permalink
Allow travis scala 2.12.0 cross builds
Browse files Browse the repository at this point in the history
- requires scalatest upgrade to 3.0.0
- upgrade kamon to 0.6.3
- do not aggregate kamon-metrics as there is no kamon build for 2.12
- upgrade to eventuate 0.8.1
  • Loading branch information
volkerstampa committed Nov 14, 2016
1 parent a5df5cf commit 7a38db9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ cache:
- $HOME/.ivy2/cache
- $HOME/.sbt/boot/
script:
- sbt ++$TRAVIS_SCALA_VERSION test package universal:packageBin
- if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then kamon_tasks="kamon-metrics/test kamon-metrics/package"; else kamon_tasks=""; fi && sbt ++$TRAVIS_SCALA_VERSION test package universal:packageBin $kamon_tasks
- find $HOME/.sbt -name "*.lock" -exec rm {} +
- find $HOME/.ivy2 -name "ivydata-*.properties" -exec rm {} +
after_success:
- if [ "$TRAVIS_PULL_REQUEST" = false ] && [ "$TRAVIS_BRANCH" = master -o -n "$TRAVIS_TAG" ]; then sbt ++$TRAVIS_SCALA_VERSION publish; fi
- if [ "$TRAVIS_PULL_REQUEST" = false ] && [ "$TRAVIS_BRANCH" = master -o -n "$TRAVIS_TAG" ]; then if [[ "$TRAVIS_SCALA_VERSION" == 2.11.* ]]; then kamon_tasks="kamon/publish"; else kamon_tasks=""; fi && sbt ++$TRAVIS_SCALA_VERSION publish $kamon_tasks; fi
scala:
- 2.11.7
- 2.11.8
- 2.12.0
jdk:
- oraclejdk8
3 changes: 3 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ lazy val dropwizardMetrics = subProject("dropwizard-metrics").dependsOn(testCore
lazy val kamonMetrics = subProject("kamon-metrics").dependsOn(testCore % "test->test")
lazy val dropwizardHealth = subProject("dropwizard-healthchecks").dependsOn(testCore % "test->test")

// exclude kamon by default as there is no scala 2.12 build yet
lazy val root = (project in file(".")).aggregate(testCore, logViewer, dropwizardMetrics, dropwizardHealth)

// release
releaseProcess := Seq[ReleaseStep](
checkSnapshotDependencies,
Expand Down
2 changes: 1 addition & 1 deletion kamon-metrics/build.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libraryDependencies += "io.kamon" %% "kamon-core" % "0.6.0"
libraryDependencies += "io.kamon" %% "kamon-core" % "0.6.3"
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import sbt._

object Dependencies {

val eventuateVersion = "0.8"
val eventuateVersion = "0.8.1"
val akkaVersion = "2.4.12"
val dropWizardMetricsVersion = "3.1.0"

Expand All @@ -19,7 +19,7 @@ object Dependencies {
"com.typesafe.akka" %% "akka-testkit" % akkaVersion
)
lazy val scalaTest = Seq(
"org.scalatest" %% "scalatest" % "2.2.6"
"org.scalatest" %% "scalatest" % "3.0.0"
)
lazy val dropWizardMetrics = Seq(
dropwizardMetricsGroup % "metrics-core" % dropWizardMetricsVersion
Expand Down

0 comments on commit 7a38db9

Please sign in to comment.