Skip to content

Commit

Permalink
bumps (#36)
Browse files Browse the repository at this point in the history
  • Loading branch information
jacum authored Feb 16, 2021
1 parent 0d41706 commit b86f535
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ Sensors' bundled dashboards will be imported.
```
libraryDependencies ++=
Seq(
"nl.pragmasoft.sensors" %% "sensors-core" % "0.0.7",
"nl.pragmasoft.sensors" %% "sensors-cassandra" % "0.0.7"
"nl.pragmasoft.sensors" %% "sensors-core" % "0.1.0",
"nl.pragmasoft.sensors" %% "sensors-cassandra" % "0.1.0"
)
```

Expand Down
7 changes: 4 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sbt.file

val commonSettings = Defaults.coreDefaultSettings ++ Seq(
organization := "nl.pragmasoft.sensors",
crossScalaVersions := Seq("2.13.4", "2.12.12"),
crossScalaVersions := Seq("2.13.4", "2.12.13"),
scalaVersion := "2.13.4",
testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"),
parallelExecution in Test := false,
Expand Down Expand Up @@ -61,7 +61,8 @@ lazy val `sensors-cassandra` = project.in(file("sensors-cassandra"))
.settings(commonSettings)
.settings(
moduleName := "sensors-cassandra",
libraryDependencies ++= Akka.deps ++ Prometheus.deps ++ Cassandra.deps ++ Logging.deps ++ TestTools.deps,
libraryDependencies ++= Akka.deps ++ Prometheus.deps ++
(Cassandra.deps :+ Cassandra.cassandraUnit % Test) ++ Logging.deps ++ TestTools.deps,
dependencyOverrides ++= Akka.deps
)
.dependsOn(`sensors-core`)
Expand All @@ -74,7 +75,7 @@ lazy val `app` = project.in(file("examples/app"))
mainClass in Compile := Some("nl.pragmasoft.app.Main"),
version in Docker := Keys.version.value,
dockerUpdateLatest := true,
libraryDependencies ++= App.deps,
libraryDependencies ++= App.deps :+ Cassandra.cassandraUnit,
dependencyOverrides ++= Akka.deps
).dependsOn(`sensors-core`,`sensors-cassandra`)

Expand Down
16 changes: 8 additions & 8 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object Dependencies {
}

object Akka {
val akkaVersion = "2.6.10"
val akkaVersion = "2.6.12"
val akkaManagementVersion = "1.0.9"
val akkaPersistenceCassandraVersion = "1.0.4"
val akkaHttpVersion = "10.2.1"
Expand All @@ -36,15 +36,15 @@ object Dependencies {
}

object Prometheus {
val hotspot = "io.prometheus" % "simpleclient_hotspot" % "0.9.0"
val common = "io.prometheus" % "simpleclient_common" % "0.9.0"
val jmx = "io.prometheus.jmx" % "collector" % "0.14.0"
val hotspot = "io.prometheus" % "simpleclient_hotspot" % "0.10.0"
val common = "io.prometheus" % "simpleclient_common" % "0.10.0"
val jmx = "io.prometheus.jmx" % "collector" % "0.15.0"

val deps = Seq(hotspot, common, jmx)
}

object App {
val http4sVersion = "0.21.15"
val http4sVersion = "0.21.19"
val circeVersion = "0.13.0"
val http4s = "org.http4s" %% "http4s-core" % http4sVersion
val http4sDsl = "org.http4s" %% "http4s-dsl" % http4sVersion
Expand All @@ -63,15 +63,15 @@ object Dependencies {

object Cassandra {
val akkaPersistenceCassandraVersion = "1.0.4"
val cassandraDriverVersion = "4.9.0"
val cassandraDriverVersion = "4.10.0"

val cassandraDriverCore = "com.datastax.oss" % "java-driver-core" % cassandraDriverVersion
val cassandraDriverQueryBuilder = "com.datastax.oss" % "java-driver-query-builder" % cassandraDriverVersion
val cassandraDriverMetrics = "io.dropwizard.metrics" % "metrics-jmx" % "4.1.16"
val cassandraDriverMetrics = "io.dropwizard.metrics" % "metrics-jmx" % "4.1.17"
val akkaPersistenceCassandra = "com.typesafe.akka" %% "akka-persistence-cassandra" % akkaPersistenceCassandraVersion
val cassandraUnit = "org.cassandraunit" % "cassandra-unit" % "4.3.1.0"

val deps = Seq(akkaPersistenceCassandra, cassandraDriverCore, cassandraUnit, cassandraDriverQueryBuilder, cassandraDriverMetrics)
val deps = Seq(akkaPersistenceCassandra, cassandraDriverCore, cassandraDriverQueryBuilder, cassandraDriverMetrics)
}

object TestTools {
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
sbt.version=1.4.6
sbt.version=1.4.7

6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import sbt.addSbtPlugin
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("no.arktekk.sbt" % "aether-deploy" % "0.26.0")
addSbtPlugin("com.twilio" % "sbt-guardrail" % "0.62.0")
addSbtPlugin("com.twilio" % "sbt-guardrail" % "0.62.2")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.13")
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "3.0.0")
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "3.1.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.0")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1") // 2.1.2 is released but unavailable??
addSbtPlugin("no.arktekk.sbt" % "aether-deploy" % "0.26.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<logger name="io.netty" level="ERROR"/>
<logger name="org.cassandraunit" level="ERROR"/>
<logger name="org.apache.cassandra" level="ERROR"/>
<logger name="org.apache.cassandra.service.StartupChecks" level="OFF"/>
<logger name="com.datastax" level="ERROR"/>

</configuration>
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version in ThisBuild := "0.0.8"
version in ThisBuild := "0.1.0"

0 comments on commit b86f535

Please sign in to comment.