Skip to content

Commit fb75e30

Browse files
authored
Merge pull request #1 from yadavan88/lib-version-updates
Lib version updates
2 parents 575af73 + 042b0ef commit fb75e30

File tree

2 files changed

+60
-64
lines changed

2 files changed

+60
-64
lines changed

build.sbt

Lines changed: 59 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ ThisBuild / version := "1.0-SNAPSHOT"
44
ThisBuild / organization := "com.baeldung"
55
ThisBuild / organizationName := "core-scala"
66

7-
val junit = "com.novocode" % "junit-interface" % "0.11" % "test"
8-
val catsEffect = "org.typelevel" %% "cats-effect" % "2.1.4"
9-
val catsCore = "org.typelevel" %% "cats-effect" % "2.1.4"
7+
val jUnitInterface = "com.novocode" % "junit-interface" % "0.11" % "test"
8+
val catsEffect = "org.typelevel" %% "cats-effect" % "3.4.5"
9+
val scalaReflection = "org.scala-lang" % "scala-reflect" % scalaV
10+
val logback = "ch.qos.logback" % "logback-classic" % "1.2.3"
1011

1112
val scalaTestDeps = Seq(
1213
"org.scalatest" %% "scalatest" % "3.2.15" % Test,
1314
"org.scalatest" %% "scalatest-shouldmatchers" % "3.2.15" % Test,
1415
"org.scalatest" %% "scalatest-wordspec" % "3.2.15" % Test,
1516
"org.scalatest" %% "scalatest-flatspec" % "3.2.15" % Test,
1617
)
17-
18+
val zioVersion = "2.0.6"
1819

1920
lazy val scala_core = (project in file("scala-core"))
2021
.settings(
2122
name := "scala-core",
2223
libraryDependencies ++=
2324
Seq(
24-
junit,
25-
catsCore,
25+
jUnitInterface,
2626
catsEffect
2727
) ++ scalaTestDeps
2828
)
@@ -31,55 +31,51 @@ lazy val scala_core_2 = (project in file("scala-core-2"))
3131
.settings(
3232
name := "scala-core-2",
3333
libraryDependencies ++= scalaTestDeps,
34-
libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
35-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
34+
libraryDependencies += "org.scalamock" %% "scalamock" % "5.2.0" % Test,
35+
libraryDependencies += jUnitInterface
3636
)
3737

3838
lazy val scala_core_3 = (project in file("scala-core-3"))
3939
.settings(
4040
name := "scala-core-3",
4141
libraryDependencies ++= scalaTestDeps,
42-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
43-
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
44-
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1"
42+
libraryDependencies += jUnitInterface,
43+
libraryDependencies += scalaReflection,
44+
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.1.0"
4545
)
4646

4747
lazy val scala_core_4 = (project in file("scala-core-4"))
4848
.settings(
4949
name := "scala-core-4",
5050
libraryDependencies ++= scalaTestDeps,
51-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
52-
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
53-
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1"
51+
libraryDependencies += jUnitInterface,
52+
libraryDependencies += scalaReflection,
5453
)
5554

5655
lazy val scala_core_5 = (project in file("scala-core-5"))
5756
.settings(
5857
name := "scala-core-5",
5958
libraryDependencies ++= scalaTestDeps,
60-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
61-
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
62-
libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1",
63-
libraryDependencies += "joda-time" % "joda-time" % "2.9.9",
64-
libraryDependencies += "org.joda" % "joda-convert" % "2.2.1",
65-
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.28.0"
59+
libraryDependencies += jUnitInterface,
60+
libraryDependencies += scalaReflection,
61+
libraryDependencies += "joda-time" % "joda-time" % "2.12.2",
62+
libraryDependencies += "org.joda" % "joda-convert" % "2.2.2",
63+
libraryDependencies += "com.github.nscala-time" %% "nscala-time" % "2.32.0"
6664
)
6765

6866
lazy val scala_core_6 = (project in file("scala-core-6"))
6967
.settings(
7068
name := "scala-core-6",
7169
libraryDependencies ++= scalaTestDeps,
72-
libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
73-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
70+
libraryDependencies += jUnitInterface
7471
)
7572

7673
lazy val scala_core_7 = (project in file("scala-core-7"))
7774
.settings(
7875
name := "scala-core-7",
7976
libraryDependencies ++= scalaTestDeps,
80-
libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
81-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
82-
libraryDependencies += "com.github.scopt" %% "scopt" % "4.0.1",
77+
libraryDependencies += jUnitInterface,
78+
libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0",
8379
libraryDependencies += "org.rogach" %% "scallop" % "4.1.0",
8480
libraryDependencies += "org.backuity.clist" %% "clist-core" % "3.5.1",
8581
libraryDependencies += "org.backuity.clist" %% "clist-macros" % "3.5.1" % "provided",
@@ -89,7 +85,7 @@ lazy val scala_core_7 = (project in file("scala-core-7"))
8985
lazy val scala_core_8 = (project in file("scala-core-8"))
9086
.settings(
9187
name := "scala-core-8",
92-
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
88+
libraryDependencies += scalaReflection,
9389
libraryDependencies ++= scalaTestDeps,
9490
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % "test"
9591
// scalacOptions += "-Ymacro-debug-lite"
@@ -99,36 +95,36 @@ lazy val scala_core_io = (project in file("scala-core-io"))
9995
.settings(
10096
name := "scala-core-io",
10197
libraryDependencies ++= scalaTestDeps,
102-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
103-
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaV
98+
libraryDependencies += jUnitInterface,
99+
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
104100
)
105101

106102
lazy val scala_core_oop = (project in file("scala-core-oop"))
107103
.settings(
108104
name := "scala-core-oop",
109105
libraryDependencies ++=
110-
Seq(catsCore, junit) ++ scalaTestDeps
106+
Seq(catsEffect, jUnitInterface) ++ scalaTestDeps
111107
)
112108

113109
lazy val scala_core_fp = (project in file("scala-core-fp"))
114110
.settings(
115111
name := "scala-core-fp",
116112
libraryDependencies ++=
117-
Seq(catsCore, junit) ++ scalaTestDeps
113+
Seq(catsEffect, jUnitInterface) ++ scalaTestDeps
118114
)
119115

120116
lazy val scala_lang = (project in file("scala-lang"))
121117
.settings(
122118
name := "scala-lang",
123119
libraryDependencies ++=
124-
Seq(junit) ++ scalaTestDeps
120+
Seq(jUnitInterface) ++ scalaTestDeps
125121
)
126122

127123
lazy val scala_lang_2 = (project in file("scala-lang-2"))
128124
.settings(
129125
name := "scala-lang",
130126
libraryDependencies ++=
131-
Seq(junit) ++ scalaTestDeps
127+
Seq(jUnitInterface) ++ scalaTestDeps
132128
)
133129

134130
lazy val scala_core_collections = (project in file("scala-core-collections"))
@@ -151,20 +147,20 @@ lazy val scala_test = (project in file("scala-test"))
151147
libraryDependencies ++=
152148
Seq(
153149
"org.scalatestplus" %% "mockito-3-4" % "3.2.10.0" % Test,
154-
junit,
150+
jUnitInterface,
155151
"org.scalamock" %% "scalamock" % "4.4.0" % Test
156152
) ++ scalaTestDeps
157153
)
158154

159155
lazy val scala_akka_dependencies: Seq[ModuleID] = Seq(
160156
"com.typesafe.akka" %% "akka-actor-typed" % "2.6.19",
161-
"ch.qos.logback" % "logback-classic" % "1.2.3",
157+
logback,
162158
"com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.19" % Test,
163159
"com.lightbend.akka" %% "akka-stream-alpakka-mongodb" % "2.0.1",
164160
"com.typesafe.akka" %% "akka-stream" % "2.6.19",
165161
"org.mongodb.scala" %% "mongo-scala-driver" % "2.9.0",
166162
"com.lightbend.akka" %% "akka-stream-alpakka-file" % "2.0.2",
167-
"com.novocode" % "junit-interface" % "0.11" % "test",
163+
jUnitInterface,
168164
"de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "2.2.0" % Test,
169165
"com.typesafe.akka" %% "akka-http" % "10.2.7"
170166
) ++ scalaTestDeps
@@ -174,7 +170,7 @@ lazy val scala_test_junit4 = (project in file("scala-test-junit4"))
174170
libraryDependencies ++=
175171
Seq(
176172
"org.scalatestplus" %% "junit-4-12" % "3.2.2.0" % Test,
177-
junit
173+
jUnitInterface
178174
)
179175
)
180176

@@ -196,8 +192,8 @@ lazy val scala_akka_2 = (project in file("scala-akka-2"))
196192
"com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.19" % Test,
197193
) ++ scalaTestDeps
198194
)
199-
val monocleVersion = "2.0.4"
200-
val slickVersion = "3.3.2"
195+
val monocleVersion = "2.1.0"
196+
val slickVersion = "3.4.1"
201197
val shapelessVersion = "2.3.3"
202198
val scalazVersion = "7.3.2"
203199
val fs2Version = "2.5-15-e328d68"
@@ -223,14 +219,14 @@ lazy val scala_libraries = (project in file("scala-libraries"))
223219
"org.reactivemongo" %% "reactivemongo" % reactiveMongo,
224220
"org.reactivemongo" %% "reactivemongo-akkastream" % reactiveMongo,
225221
"de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "3.0.0" % Test,
226-
"ch.qos.logback" % "logback-classic" % "1.2.3" % Test,
222+
logback % Test,
227223
"com.typesafe.akka" %% "akka-actor-typed" % AkkaVersion,
228224
"com.typesafe.akka" %% "akka-stream" % AkkaVersion,
229225
"com.typesafe.akka" %% "akka-protobuf" % AkkaVersion
230226
)
231227
)
232228

233-
val circeVersion = "0.14.1"
229+
val circeVersion = "0.14.3"
234230
val monixVersion = "3.4.0"
235231
val elastic4sVersion = "7.16.0"
236232
val sparkVersion = "3.2.1"
@@ -250,11 +246,11 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
250246
"com.github.cb372" %% "scalacache-guava" % "0.28.0",
251247
"com.github.cb372" %% "scalacache-cats-effect" % "0.28.0",
252248
"com.github.cb372" %% "scalacache-caffeine" % "0.28.0",
253-
"com.beachape" %% "enumeratum" % "1.7.0"
249+
"com.beachape" %% "enumeratum" % "1.7.2"
254250
),
255251
libraryDependencies ++= Seq(
256252
"com.typesafe.play" %% "play-slick" % "5.1.0",
257-
"org.postgresql" % "postgresql" % "42.2.12"
253+
"org.postgresql" % "postgresql" % "42.5.1"
258254
),
259255
libraryDependencies ++= Seq(
260256
"io.monix" %% "monix" % monixVersion
@@ -266,13 +262,13 @@ lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
266262
),
267263
libraryDependencies ++= Seq(
268264
"com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.19" % Test,
269-
"org.scalacheck" %% "scalacheck" % "1.14.1" % Test,
265+
"org.scalacheck" %% "scalacheck" % "1.17.0" % Test,
270266
"com.lihaoyi" %% "requests" % "0.6.9"
271267
) ++ scalaTestDeps,
272268
libraryDependencies ++= Seq(
273269
"com.sksamuel.elastic4s" %% "elastic4s-client-esjava" % elastic4sVersion,
274270
"com.sksamuel.elastic4s" %% "elastic4s-core" % elastic4sVersion,
275-
"ch.qos.logback" % "logback-classic" % "1.2.3"
271+
logback
276272
)
277273
)
278274

@@ -290,19 +286,19 @@ lazy val scala_libraries_3 = (project in file("scala-libraries-3"))
290286
"org.http4s" %% "http4s-dsl" % http4sVersion,
291287
"org.http4s" %% "http4s-blaze-server" % http4sVersion,
292288
"org.http4s" %% "http4s-blaze-client" % http4sVersion,
293-
"com.beachape" %% "enumeratum" % "1.7.0",
294-
"com.github.pureconfig" %% "pureconfig" % "0.17.1",
295-
"com.github.pureconfig" %% "pureconfig-enumeratum" % "0.17.1",
289+
"com.beachape" %% "enumeratum" % "1.7.2",
290+
"com.github.pureconfig" %% "pureconfig" % "0.17.2",
291+
"com.github.pureconfig" %% "pureconfig-enumeratum" % "0.17.2",
296292
"com.typesafe" % "config" % "1.4.2",
297293
"org.scalameta" %% "munit" % "0.7.29" % Test
298294
),
299-
libraryDependencies += "org.scalamock" %% "scalamock" % "5.1.0" % Test,
300-
libraryDependencies += "com.softwaremill.retry" %% "retry" % "0.3.5",
295+
libraryDependencies += "org.scalamock" %% "scalamock" % "5.2.0" % Test,
296+
libraryDependencies += "com.softwaremill.retry" %% "retry" % "0.3.6",
301297
libraryDependencies ++= Seq(
302298
"org.apache.logging.log4j" %% "log4j-api-scala" % "12.0",
303-
"org.apache.logging.log4j" % "log4j-core" % "2.13.0" % Runtime
299+
"org.apache.logging.log4j" % "log4j-core" % "2.19.0" % Runtime
304300
),
305-
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.8.1"
301+
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.9.0"
306302
)
307303

308304
lazy val scala_libraries_os = (project in file("scala-libraries-os"))
@@ -311,9 +307,9 @@ lazy val scala_libraries_os = (project in file("scala-libraries-os"))
311307
libraryDependencies ++= scalaTestDeps,
312308
libraryDependencies ++= Seq(
313309
"org.apache.logging.log4j" %% "log4j-api-scala" % "12.0",
314-
"org.apache.logging.log4j" % "log4j-core" % "2.13.0" % Runtime
310+
"org.apache.logging.log4j" % "log4j-core" % "2.19.0" % Runtime
315311
),
316-
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.8.1"
312+
libraryDependencies += "com.lihaoyi" %% "os-lib" % "0.9.0"
317313
)
318314

319315
lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
@@ -324,7 +320,7 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
324320
libraryDependencies ++= scalaTestDeps,
325321
libraryDependencies ++= Seq(
326322
"org.scala-lang.modules" %% "scala-async" % "1.0.1",
327-
"org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided,
323+
scalaReflection % Provided,
328324
"org.tpolecat" %% "skunk-core" % "0.3.2",
329325
sparkSqlDep,
330326
sparkCoreDep
@@ -336,14 +332,14 @@ lazy val scala_strings = (project in file("scala-strings"))
336332
.settings(
337333
name := "scala-strings",
338334
libraryDependencies ++= scalaTestDeps,
339-
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
335+
libraryDependencies += jUnitInterface
340336
)
341337

342338
lazy val scala_design_patterns = (project in file("scala-design-patterns"))
343339
.settings(
344340
name := "scala-design-patterns",
345341
libraryDependencies ++= scalaTestDeps,
346-
libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
342+
libraryDependencies += "org.scalamock" %% "scalamock" % "5.2.0" % Test,
347343
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
348344
)
349345

@@ -360,15 +356,15 @@ lazy val cats_effects = (project in file("cats-effects"))
360356
name := "cats-effects",
361357
libraryDependencies += "org.typelevel" %% "cats-effect" % "3.3.13",
362358
libraryDependencies += "org.typelevel" %% "munit-cats-effect-3" % "1.0.7" % Test,
363-
libraryDependencies += "junit" % "junit" % "4.13" % Test
359+
libraryDependencies += "junit" % "junit" % "4.13.2" % Test
364360
)
365361

366362
lazy val zio = (project in file("zio"))
367363
.settings(
368364
name := "zio",
369-
libraryDependencies += "dev.zio" %% "zio" % "2.0.3",
370-
libraryDependencies += "dev.zio" %% "zio-streams" % "2.0.3",
371-
libraryDependencies += "dev.zio" %% "zio-test-sbt" % "2.0.3" % "test",
365+
libraryDependencies += "dev.zio" %% "zio" % zioVersion,
366+
libraryDependencies += "dev.zio" %% "zio-streams" % zioVersion,
367+
libraryDependencies += "dev.zio" %% "zio-test-sbt" % zioVersion % Test,
372368
testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework")
373369
)
374370

@@ -390,16 +386,16 @@ lazy val doobie = (project in file("doobie"))
390386
lazy val reflection = (project in file("reflection"))
391387
.settings(
392388
name := "reflection",
393-
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
394-
libraryDependencies += "junit" % "junit" % "4.13" % Test
389+
libraryDependencies += scalaReflection,
390+
libraryDependencies += "junit" % "junit" % "4.13.2" % Test
395391
)
396392

397393
lazy val scala3_libraries = (project in file("scala3-libraries"))
398394
.settings(
399395
scalaVersion := "3.1.1",
400396
name := "scala3-libraries",
401397
libraryDependencies ++= Seq(
402-
"com.github.japgolly.clearconfig" %% "core" % "3.0.0",
398+
"com.github.japgolly.clearconfig" %% "core" % "3.1.0",
403399
"org.scalameta" %% "munit" % "0.7.29" % Test
404400
)
405401
)

scala-libraries-2/src/test/scala/com/baeldung/requests/RequestsScalaHttpClientLiveTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class RequestsScalaHttpClientLiveTest
109109
assert(r.text().contains("gzip"))
110110
assert(
111111
r.text()
112-
.contains("data:application/octet-stream;base64,H4sIAAAAAAAAAA==")
112+
.contains("data:application/octet-stream;base64")
113113
)
114114

115115
val r2 = requests.post(

0 commit comments

Comments
 (0)