From 0ac11e3a50453b69af7472f744ac683ff9bea9e2 Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 8 Dec 2016 17:21:21 -0300 Subject: kamon-core-0.6.x series --- README.md | 8 ++++---- project/Dependencies.scala | 2 +- project/Settings.scala | 9 ++------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c51e8d74..9f7a0302 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Kamon - -[![Build Status](https://travis-ci.org/kamon-io/Kamon.svg?branch=master)](https://travis-ci.org/kamon-io/Kamon) + +[![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.11/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.kamon/kamon-core_2.11) +[![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.11) Kamon is a set of tools for monitoring applications running on the JVM. @@ -22,7 +22,7 @@ To get started with SBT, simply add the following to your `build.sbt` file: ```scala -libraryDependencies += "kamon.io" %% "kamon-core" % "0.6.3" +libraryDependencies += "kamon.io" %% "kamon-core" % "0.6.4" ``` ### Documentation diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bcc926f5..0b0f44e8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -22,7 +22,7 @@ object Dependencies { "Kamon Repository Snapshots" at "http://snapshots.kamon.io" ) - val akkaVersion = "2.4.12" + val akkaVersion = "2.3.15" val slf4jVersion = "1.7.7" val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion diff --git a/project/Settings.scala b/project/Settings.scala index 0144d04a..12367b4e 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -23,12 +23,12 @@ import scalariform.formatter.preferences._ object Settings { - val JavaVersion = "1.6" + val JavaVersion = "1.7" val SVersion = "2.11.8" lazy val basicSettings = Seq( scalaVersion := SVersion, - crossScalaVersions := Seq("2.10.5", SVersion, "2.12.0"), + crossScalaVersions := Seq("2.10.5", SVersion), resolvers ++= Dependencies.resolutionRepos, fork in run := true, parallelExecution in Global := false, @@ -50,11 +50,6 @@ object Settings { "-language:postfixOps", "-language:implicitConversions", "-Xlog-reflective-calls" -// "-Yno-adapted-args", -// "-Ywarn-dead-code", -// "-Ywarn-unused-import" - // "-Ywarn-numeric-widen", -// "-Ywarn-value-discard", ) lazy val formatSettings = SbtScalariform.scalariformSettings ++ Seq( -- cgit v1.2.3