Permalink
Browse files

wip

  • Loading branch information...
1 parent 7e2e619 commit 48ba951977f2979c4459eee541e98721ab03f5d9 @dpsoft dpsoft committed Dec 13, 2016
Showing with 6 additions and 18 deletions.
  1. +2 −4 README.md
  2. +1 −1 build.sbt
  3. +3 −13 project/Dependencies.scala
View
@@ -1,5 +1,5 @@
# Kamon
-<img align="right" src="https://rawgit.com/kamon-io/Kamon/series/0.6.x/kamon-logo.svg" height="150px" style="padding-left: 20px"/>
+<img align="right" src="https://rawgit.com/kamon-io/Kamon/master/kamon-logo.svg" height="150px" style="padding-left: 20px"/>
[![Build Status](https://travis-ci.org/kamon-io/Kamon.svg?branch=kamon-0.6.3x)](https://travis-ci.org/kamon-io/Kamon)
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kamon-io/Kamon?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.kamon/kamon-core_2.10/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.kamon/kamon-core_2.10)
@@ -14,9 +14,7 @@ Supported releases and dependencies are shown below.
| kamon | status | jdk | scala | akka |
|:------:|:------:|:----:|------------------|:------:|
-| 0.7.0 | stable | 1.8+ | 2.11, 2.12 | 2.4.x |
-| 0.6.4 | stable | 1.7+ | 2.10, 2.11 | 2.3.x |
-
+| 0.6.4 | stable | 1.7+, 1.8+ | 2.10, 2.11, 2.12 | 2.3.x, 2.4.x |
To get started with SBT, simply add the following to your `build.sbt`
file:
View
@@ -56,7 +56,7 @@ lazy val testkit = (project in file("kamon-testkit"))
.settings(formatSettings: _*)
.settings(
libraryDependencies ++=
- compileScope(akkaActor, akkaDependency("testkit").value) ++
+ compileScope(akkaDependency("actor").value, akkaDependency("testkit").value) ++
providedScope(aspectJ) ++
testScope(slf4jApi, slf4jnop))
@@ -23,21 +23,11 @@ object Dependencies {
"Kamon Repository Snapshots" at "http://snapshots.kamon.io"
)
- val akkaVersion = "2.3.15"
- val slf4jVersion = "1.7.7"
-
- val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion
- val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion
- val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion
-
- val aspectJ = "org.aspectj" % "aspectjweaver" % "1.8.9"
+ val aspectJ = "org.aspectj" % "aspectjweaver" % "1.8.10"
val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "2.1.9"
-
- val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion
- val slf4jnop = "org.slf4j" % "slf4j-nop" % slf4jVersion
-
+ val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.7"
+ val slf4jnop = "org.slf4j" % "slf4j-nop" % "1.7.7"
val logback = "ch.qos.logback" % "logback-classic" % "1.0.13"
-
val scalatest = "org.scalatest" %% "scalatest" % "3.0.1"
def akkaDependency(moduleName: String) = Def.setting {

0 comments on commit 48ba951

Please sign in to comment.