Merge branch 'Baeldung:master' into transparent-scala3

Author: yadavan88

app-packaging/build.sbt

@@ -1,7 +1,7 @@
 name := "app-packaging"
 version := "1.0.2"
 
-ThisBuild / scalaVersion := "3.1.0"
+ThisBuild / scalaVersion := "3.2.0"
 
 libraryDependencies ++= Seq(
   "com.lihaoyi" %% "os-lib" % "0.7.8"

build.sbt

@@ -1,13 +1,13 @@
-val scalaV = "2.12.15"
+val scalaV = "2.13.10"
 ThisBuild / scalaVersion := scalaV
 ThisBuild / version := "1.0-SNAPSHOT"
 ThisBuild / organization := "com.baeldung"
 ThisBuild / organizationName := "core-scala"
 
 val scalaTest = "org.scalatest" %% "scalatest" % "3.1.2" % Test
 val junit = "com.novocode" % "junit-interface" % "0.11" % "test"
-val catsEffect = "org.typelevel" % "cats-effect_2.12" % "2.1.4"
-val catsCore = "org.typelevel" % "cats-effect_2.12" % "2.1.4"
+val catsEffect = "org.typelevel" %% "cats-effect" % "2.1.4"
+val catsCore = "org.typelevel" %% "cats-effect" % "2.1.4"
 
 lazy val scala_core = (project in file("scala-core"))
   .settings(
@@ -24,15 +24,15 @@ lazy val scala_core = (project in file("scala-core"))
 lazy val scala_core_2 = (project in file("scala-core-2"))
   .settings(
     name := "scala-core-2",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
   )
 
 lazy val scala_core_3 = (project in file("scala-core-3"))
   .settings(
     name := "scala-core-3",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
     libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1"
@@ -41,7 +41,7 @@ lazy val scala_core_3 = (project in file("scala-core-3"))
 lazy val scala_core_4 = (project in file("scala-core-4"))
   .settings(
     name := "scala-core-4",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
     libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1"
@@ -50,7 +50,7 @@ lazy val scala_core_4 = (project in file("scala-core-4"))
 lazy val scala_core_5 = (project in file("scala-core-5"))
   .settings(
     name := "scala-core-5",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaV,
     libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1",
@@ -62,15 +62,15 @@ lazy val scala_core_5 = (project in file("scala-core-5"))
 lazy val scala_core_6 = (project in file("scala-core-6"))
   .settings(
     name := "scala-core-6",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
   )
 
 lazy val scala_core_7 = (project in file("scala-core-7"))
   .settings(
     name := "scala-core-7",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",
     libraryDependencies += "com.github.scopt" %% "scopt" % "4.0.1",
@@ -114,24 +114,24 @@ lazy val scala_core_fp = (project in file("scala-core-fp"))
 lazy val scala_lang = (project in file("scala-lang"))
   .settings(
     name := "scala-lang",
-    scalacOptions += "-Ypartial-unification",
     libraryDependencies ++=
       Seq(scalaTest, junit)
   )
 
 lazy val scala_lang_2 = (project in file("scala-lang-2"))
   .settings(
     name := "scala-lang",
-    scalacOptions += "-Ypartial-unification",
     libraryDependencies ++=
       Seq(scalaTest, junit)
   )
 
 lazy val scala_core_collections = (project in file("scala-core-collections"))
   .settings(
     name := "scala-core-collections",
-    libraryDependencies +=
-      scalaTest
+    libraryDependencies ++= Seq(
+      scalaTest,
+      "org.scala-lang.modules" %% "scala-parallel-collections" % "1.0.4"
+    )
   )
 
 lazy val scala_core_collections_2 = (project in file("scala-core-collections-2"))
@@ -154,14 +154,14 @@ lazy val scala_test = (project in file("scala-test"))
   )
 
 lazy val scala_akka_dependencies: Seq[ModuleID] = Seq(
-  "com.typesafe.akka" % "akka-actor-typed_2.12" % "2.6.19",
+  "com.typesafe.akka" %% "akka-actor-typed" % "2.6.19",
   "ch.qos.logback" % "logback-classic" % "1.2.3",
-  "com.typesafe.akka" % "akka-actor-testkit-typed_2.12" % "2.6.19" % Test,
+  "com.typesafe.akka" %% "akka-actor-testkit-typed" % "2.6.19" % Test,
   "com.lightbend.akka" %% "akka-stream-alpakka-mongodb" % "2.0.1",
   "com.typesafe.akka" %% "akka-stream" % "2.6.19",
   "org.mongodb.scala" %% "mongo-scala-driver" % "2.9.0",
   "com.lightbend.akka" %% "akka-stream-alpakka-file" % "2.0.2",
-  "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+  "org.scalatest" %% "scalatest" % "3.1.2" % Test,
   "com.novocode" % "junit-interface" % "0.11" % "test",
   "de.flapdoodle.embed" % "de.flapdoodle.embed.mongo" % "2.2.0" % Test,
   "com.typesafe.akka" %% "akka-http" % "10.2.7"
@@ -237,6 +237,7 @@ val sparkVersion = "3.2.1"
 
 lazy val scala_libraries_2 = (project in file("scala-libraries-2"))
   .settings(
+    scalaVersion := "2.12.15",
     name := "scala-libraries",
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies ++= Seq(
@@ -339,14 +340,14 @@ lazy val scala_libraries_4 = (project in file("scala-libraries-4"))
 lazy val scala_strings = (project in file("scala-strings"))
   .settings(
     name := "scala-strings",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
   )
 
 lazy val scala_design_patterns = (project in file("scala-design-patterns"))
   .settings(
     name := "scala-design-patterns",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.2" % Test,
     libraryDependencies += "org.scalamock" %% "scalamock" % "4.4.0" % Test,
     libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test
   )
@@ -405,3 +406,12 @@ lazy val scala3_libraries = (project in file("scala3-libraries"))
   )
 
 Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-eG")
+
+lazy val scala212 = (project in file("scala212"))
+  .settings(
+    scalaVersion := "2.12.17",
+    name := "scala212",
+    libraryDependencies ++= Seq(
+      scalaTest
+    )
+  )

scala-akka/src/main/scala/com/baeldung/scala/akka/supervision/SupervisionApplication.scala

@@ -123,7 +123,7 @@ object SupervisionApplication {
             .supervise(search)
             .onFailure[IOException](SupervisorStrategy.resume))
         .onFailure[Exception](SupervisorStrategy.restart.withLimit(
-          maxNrOfRetries = 10, withinTimeRange = 5 minutes))
+          maxNrOfRetries = 10, withinTimeRange = 5.minutes))
     }
 
     private def search: Behavior[FsFind] =

scala-akka/src/test/scala/com/baeldung/scala/akka/supervision/SupervisionApplicationUnitTest.scala

@@ -38,7 +38,7 @@ class SupervisionApplicationUnitTest extends FlatSpec with BeforeAndAfterAll {
     val webServerClient = testKit.createTestProbe[Response]()
     webServer ! Get("http://restart", webServerClient.ref)
     webServer ! Get("http://a-valid-uri", webServerClient.ref)
-    webServerClient.expectMessageType[Ok](5 seconds)
+    webServerClient.expectMessageType[Ok](5.seconds)
   }
 
   "The Cache actor" should "resume from an error" in {
@@ -47,7 +47,7 @@ class SupervisionApplicationUnitTest extends FlatSpec with BeforeAndAfterAll {
     val cacheClient = testKit.createTestProbe[Cache.Response]()
     cache ! Find("http://resume", cacheClient.ref)
     cache ! Find("http://a-valid-uri", cacheClient.ref)
-    cacheClient.expectMessageType[Hit](5 seconds)
+    cacheClient.expectMessageType[Hit](5.seconds)
   }
 
   override protected def afterAll(): Unit = testKit.shutdownTestKit()

scala-core-3/src/main/scala/com/baeldung/scala/iteratorsvsstreamsvsviews/NonStrictDataStructures.scala

@@ -6,7 +6,9 @@ object NonStrictDataStructures {
   val data = Seq.range(0, 3)
   val iter = data.iterator
   val stream = data.toStream
-  val view: AnyRef with SeqView[Int, Seq[Int]] = data.view
+  //todo: check if this is ok, better to separate into separate module
+  //val view: AnyRef with SeqView[Int, Seq[Int]] = data.view
+  val view: AnyRef with SeqView[Int] = data.view
 }
 
 case class Factorial() {

scala-core-3/src/test/scala/com/baeldung/scala/await/AwaitFutureUnitTest.scala

@@ -16,7 +16,7 @@ class AwaitFutureUnitTest extends AwaitFutureTestUtil {
       val fut = AwaitFuture.fetchDataFrom(url)
 
       fut.isCompleted shouldBe false
-      val completedFuture = Await.ready(fut, 2 seconds)
+      val completedFuture = Await.ready(fut, 2.seconds)
 
       fut shouldBe completedFuture
       completedFuture.isCompleted shouldBe true
@@ -31,7 +31,7 @@ class AwaitFutureUnitTest extends AwaitFutureTestUtil {
     "throw a timeout Exception when the future doesn't complete within the stipulated time" in {
       val fut = AwaitFuture.fetchDataFrom(url, 3000)
       fut.isCompleted shouldBe false
-      val exception = intercept[Exception](Await.ready(fut, 2 seconds))
+      val exception = intercept[Exception](Await.ready(fut, 2.seconds))
 
       val assertion = exception match {
         case _ : TimeoutException => true
@@ -45,7 +45,7 @@ class AwaitFutureUnitTest extends AwaitFutureTestUtil {
       val fut = AwaitFuture.futureWithException()
 
       fut.isCompleted shouldBe false
-      val completedFuture = Await.ready(fut, 2 seconds)
+      val completedFuture = Await.ready(fut, 2.seconds)
 
       fut shouldBe completedFuture
       completedFuture.isCompleted shouldBe true
@@ -62,13 +62,13 @@ class AwaitFutureUnitTest extends AwaitFutureTestUtil {
       val fut = AwaitFuture.fetchDataFrom(url)
 
       fut.isCompleted shouldBe false
-      val completedFutureResult = Await.result(fut, 2 seconds)
+      val completedFutureResult = Await.result(fut, 2.seconds)
       completedFutureResult.isInstanceOf[String] shouldBe true
     }
     "throw a timeout Exception when the future doesn't complete within the stipulated time" in {
       val fut = AwaitFuture.fetchDataFrom("https://www.facebook.com", 5000)
       fut.isCompleted shouldBe false
-      val exception = intercept[Exception](Await.result(fut, 2 seconds))
+      val exception = intercept[Exception](Await.result(fut, 2.seconds))
 
       val assertion = exception match {
         case _ : TimeoutException => true
@@ -81,7 +81,7 @@ class AwaitFutureUnitTest extends AwaitFutureTestUtil {
       val fut = AwaitFuture.futureWithException()
 
       fut.isCompleted shouldBe false
-      val exception = intercept[Exception](Await.result(fut, 2 seconds))
+      val exception = intercept[Exception](Await.result(fut, 2.seconds))
 
       val assertion = exception match {
         case _ : NullPointerException => true

scala-core-4/src/test/scala/com/baeldung/scala/structuraltypes/ResourceClosingUnitTest.scala

@@ -1,11 +1,10 @@
 package com.baeldung.scala.structuraltypes
 
 import org.scalatest.{FlatSpec, Matchers}
-
-import scala.collection.convert.DecorateAsScala
+import scala.jdk.CollectionConverters._
 import scala.io.Source
 
-class ResourceClosingUnitTest extends FlatSpec with Matchers with DecorateAsScala with ResourceClosing {
+class ResourceClosingUnitTest extends FlatSpec with Matchers with ResourceClosing {
   "Scala Sources" should "be closed" in {
      val file = Source.fromResource("animals")
      using(file) {

scala-core-4/src/test/scala/com/baeldung/scala/withfilter/WithFilterVsFilterUnitTest.scala

@@ -1,10 +1,9 @@
 package com.baeldung.scala.withfilter
 
 import java.util.concurrent.atomic.AtomicInteger
-
 import org.scalatest.{Matchers, WordSpec}
 
-import scala.collection.generic.FilterMonadic
+import scala.collection.WithFilter
 
 class WithFilterVsFilterUnitTest extends WordSpec with Matchers {
 
@@ -71,7 +70,7 @@ class WithFilterVsFilterUnitTest extends WordSpec with Matchers {
     "filter programmers" in {
       implicit val counter: AtomicInteger = new AtomicInteger(0)
 
-      val desiredProgrammers: FilterMonadic[Programmer, List[Programmer]] =
+      val desiredProgrammers: WithFilter[Programmer, List] =
         programmers
           .withFilter(isMidOrSenior)
           .withFilter(knowsMoreThan1Language)

scala-core-6/src/main/scala/com/baeldung/scala/functionalloops/FunctionalLoops.scala

@@ -1,5 +1,5 @@
 package com.baeldung.scala.functionalloops
-
+import scala.language.postfixOps
 object FunctionalLoops {
   def getSumOfList(list: List[Int]): Int = {
     var sum = 0