Skip to content

Commit 7fdd2ba

Browse files
authored
Merge pull request #8 from exon-it/release-5.0.0-rc4
Release 5.0.0-rc4
2 parents 8c9b495 + 1cb1441 commit 7fdd2ba

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

build.sbt

+1-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ lazy val commonSettings = Seq(
1010

1111
startYear := Some(2015),
1212

13-
version := "5.0.0-rc3",
13+
version := "5.0.0-rc4",
1414

1515
scalaVersion := "2.11.11",
1616
scalacOptions ++= Seq(
@@ -72,7 +72,6 @@ lazy val `client-api` = (project in file("client-api")).
7272
Dependencies.json4sCore,
7373
Dependencies.scalaLogging,
7474
Dependencies.slf4jJdk14 % Test,
75-
Dependencies.junit % Test,
7675
Dependencies.scalatest % Test
7776
)
7877
)
@@ -94,7 +93,6 @@ lazy val `client-core` = (project in file("client-core")).
9493
Dependencies.slf4jApi,
9594
Dependencies.scalaLogging,
9695
Dependencies.slf4jJdk14 % Test,
97-
Dependencies.junit % Test,
9896
Dependencies.scalatest % Test,
9997
Dependencies.restClientDriver % Test
10098
)
@@ -110,7 +108,6 @@ lazy val `client-play25-ws` = (project in file("client-play25-ws")).
110108
libraryDependencies ++= Seq(
111109
Dependencies.play25Ws,
112110
Dependencies.slf4jJdk14 % Test,
113-
Dependencies.junit % Test,
114111
Dependencies.scalatest % Test,
115112
Dependencies.restClientDriver % Test,
116113
Dependencies.scalaArm % Test
@@ -127,7 +124,6 @@ lazy val `client-play26-ws` = (project in file("client-play26-ws")).
127124
libraryDependencies ++= Seq(
128125
Dependencies.play26Ws,
129126
Dependencies.slf4jJdk14 % Test,
130-
Dependencies.junit % Test,
131127
Dependencies.scalatest % Test,
132128
Dependencies.restClientDriver % Test,
133129
Dependencies.scalaArm % Test
@@ -144,7 +140,6 @@ lazy val `client-play-ws-standalone` = (project in file("client-play-ws-standalo
144140
libraryDependencies ++= Seq(
145141
Dependencies.playWsStandalone,
146142
Dependencies.slf4jJdk14 % Test,
147-
Dependencies.junit % Test,
148143
Dependencies.scalatest % Test,
149144
Dependencies.restClientDriver % Test,
150145
Dependencies.scalaArm % Test

project/Dependencies.scala

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
import sbt._
22

33
object Dependencies {
4-
val junit : ModuleID = "junit" % "junit" % "4.12"
54
val slf4jApi : ModuleID = "org.slf4j" % "slf4j-api" % "1.7.25"
65
val slf4jJdk14 : ModuleID = "org.slf4j" % "slf4j-jdk14" % "1.7.25"
76
val jodaTime : ModuleID = "joda-time" % "joda-time" % "2.9.9"
8-
val jodaConvert : ModuleID = "org.joda" % "joda-convert" % "1.8.2"
9-
val play25Ws : ModuleID = "com.typesafe.play" %% "play-ws" % "2.5.16"
10-
val play26Ws : ModuleID = "com.typesafe.play" %% "play-ahc-ws" % "2.6.3"
11-
val playWsStandalone : ModuleID = "com.typesafe.play" %% "play-ahc-ws-standalone" % "1.0.4"
7+
val jodaConvert : ModuleID = "org.joda" % "joda-convert" % "1.9.2"
8+
val play25Ws : ModuleID = "com.typesafe.play" %% "play-ws" % "2.5.17"
9+
val play26Ws : ModuleID = "com.typesafe.play" %% "play-ahc-ws" % "2.6.5"
10+
val playWsStandalone : ModuleID = "com.typesafe.play" %% "play-ahc-ws-standalone" % "1.1.1"
1211
val json4sCore : ModuleID = "org.json4s" %% "json4s-core" % "3.5.3"
1312
val json4sJackson : ModuleID = "org.json4s" %% "json4s-jackson" % "3.5.3"
1413
val scalaLogging : ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
1514
val scalatest : ModuleID = "org.scalatest" %% "scalatest" % "3.0.3"
1615
val restClientDriver : ModuleID = "com.github.rest-driver" % "rest-client-driver" % "2.0.0"
17-
val catsFree : ModuleID = "org.typelevel" %% "cats-free" % "1.0.0-MF"
16+
val catsFree : ModuleID = "org.typelevel" %% "cats-free" % "0.9.0"
1817
val scalaArm : ModuleID = "com.jsuereth" %% "scala-arm" % "2.0"
1918
val monixEval : ModuleID = "io.monix" %% "monix-eval" % "2.3.0"
2019
}

0 commit comments

Comments
 (0)