Skip to content

Commit

Permalink
#100 Update library version
Browse files Browse the repository at this point in the history
  • Loading branch information
To-om committed Oct 30, 2020
1 parent eacc29b commit 26a4e50
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## [1.11.8](https://github.com/TheHive-Project/elastic4play/milestone/42) (2020-10-30)

**Fixed bugs:**

- Fix library conflicts [\#100](https://github.com/TheHive-Project/elastic4play/issues/100)

## [1.11.7](https://github.com/TheHive-Project/elastic4play/milestone/41) (2020-10-29)

**Fixed bugs:**
Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ scalaVersion := "2.12.12"

resolvers += "elasticsearch-releases" at "https://artifacts.elastic.co/maven"

val elastic4sVersion = "6.5.1"
val elastic4sVersion = "6.7.8"
libraryDependencies ++= Seq(
cacheApi,
"com.sksamuel.elastic4s" %% "elastic4s-core" % elastic4sVersion,
"com.sksamuel.elastic4s" %% "elastic4s-http-streams" % elastic4sVersion,
"com.sksamuel.elastic4s" %% "elastic4s-http" % elastic4sVersion,
"com.typesafe.akka" %% "akka-stream-testkit" % play.core.PlayVersion.akkaVersion % Test,
"com.typesafe.akka" %% "akka-stream-testkit" % "2.5.31" % Test,
"org.scalactic" %% "scalactic" % "3.0.5",
"org.bouncycastle" % "bcprov-jdk15on" % "1.58",
specs2 % Test
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
logLevel := Level.Info

// Use the Play sbt plugin for Play projects
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.3")
addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.6")
addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.0")
addSbtPlugin("org.thehive-project" % "sbt-github-changelog" % "0.3.0")
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version := "1.11.7"
version := "1.11.8"

0 comments on commit 26a4e50

Please sign in to comment.