Skip to content

Commit

Permalink
Merge pull request #4 from jtjeferreira/bump_mongo
Browse files Browse the repository at this point in the history
bump reactivemongo versions from 0.12.7 to 0.16.0 and made sure all versions work.
  • Loading branch information
jtjeferreira authored Aug 6, 2018
2 parents b50a539 + 3764280 commit a7c3f51
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Kamon scala module is currently available for Scala 2.11 and 2.12.

Supported releases and dependencies are shown below.

| kamon | status | jdk | scala
|:----------:|:------:|:----:|------------------
| 0.0.1 | RC | 1.8+ | 2.11, 2.12
| kamon-mongo | reactivemongo | status | jdk | scala
|:-----------:|:-------------:|:------:|:----:|------
| 0.0.1 | 0.12 until 0.16 | stable | 1.8+ | 2.11, 2.12


To get started with SBT, simply add the following to your `build.sbt` file:
Expand Down
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ version := "1.0-SNAPSHOT"

scalaVersion := "2.11.8"

val kamonCore = "io.kamon" %% "kamon-core" % "1.0.0-RC7"
val kamonExecutors = "io.kamon" %% "kamon-executors" % "1.0.0-RC7"
val kamonScala = "io.kamon" %% "kamon-scala-future" % "1.0.0-RC7"
val kamonTestkit = "io.kamon" %% "kamon-testkit" % "1.0.0-RC7"
val kamonCore = "io.kamon" %% "kamon-core" % "1.0.1"
val kamonExecutors = "io.kamon" %% "kamon-executors" % "1.0.1"
val kamonScala = "io.kamon" %% "kamon-scala-future" % "1.0.0"
val kamonTestkit = "io.kamon" %% "kamon-testkit" % "1.0.1"

val dockerTestKit = "com.whisk" %% "docker-testkit-scalatest" % "0.9.5"
val dockerTestKitSpotify = "com.whisk" %% "docker-testkit-impl-spotify" % "0.9.5"

val reactiveMongo = "org.reactivemongo" %% "reactivemongo" % "0.12.7"
val reactiveMongo = "org.reactivemongo" %% "reactivemongo" % "0.16.0"

lazy val root = Project("kamon-mongo", file("."))
.enablePlugins(JavaAgent)
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.15
sbt.version = 0.13.17
2 changes: 1 addition & 1 deletion src/test/scala/kamon/mongo/DockerMongodbService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ trait DockerMongodbService extends DockerKit {
val mongodbContainer = DockerContainer("mongo:3.4")
.withPorts(DefaultMongodbPort -> Some(DefaultMongodbPort))
.withReadyChecker(DockerReadyChecker.LogLineContains("waiting for connections on port"))
.withCommand("mongod", "--nojournal", "--smallfiles", "--syncdelay", "0")
.withCommand("mongod", "--smallfiles", "--syncdelay", "0")

abstract override def dockerContainers: List[DockerContainer] =
mongodbContainer :: super.dockerContainers
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/kamon/mongo/InstrumentationSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class InstrumentationSpec extends WordSpec with MustMatchers
import reactivemongo.api._

val driver = MongoDriver.apply()
lazy val db = driver.connection("localhost:27017").get.database("test")
lazy val db = driver.connection("mongodb://localhost:27017").get.database("test")
def collection: Future[BSONCollection] = db.map(_.collection[BSONCollection]("collection"))
def collectionName = "test.collection"

Expand Down

0 comments on commit a7c3f51

Please sign in to comment.