Skip to content

Commit 20d8579

Browse files
dominiqueplantedominiqueplante
authored
Merge branch 'master' into SCALA-356
2 parents cd518a2 + 1a6a269 commit 20d8579

File tree

204 files changed

+589
-569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+589
-569
lines changed

‎build.sbt

Lines changed: 113 additions & 114 deletions
Large diffs are not rendered by default.

‎cats-effects/src/main/scala/com/baeldung/scala/catseffects/NotParallelApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.scala.catseffects
22

33
import cats.effect.{ExitCode, IO, IOApp}
4-
import com.baeldung.scala.catseffects.Utils.ShowThread
54
import cats.implicits._
5+
import com.baeldung.scala.catseffects.Utils.ShowThread
66

77
object NotParallelApp extends IOApp {
88
val tasks: List[IO[Int]] = (1 to 10).map(IO.pure).map(_.showThread).toList

‎cats-effects/src/main/scala/com/baeldung/scala/catseffects/ParallelApp.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.scala.catseffects
22

33
import cats.effect.{ExitCode, IO, IOApp}
4-
import com.baeldung.scala.catseffects.Utils.ShowThread
54
import cats.implicits._
5+
import com.baeldung.scala.catseffects.Utils.ShowThread
66

77
object ParallelApp extends IOApp {
88
val tasks: List[IO[Int]] = (1 to 10).map(IO.pure).map(_.showThread).toList

‎cats-effects/src/main/scala/com/baeldung/scala/differences/Differences.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.scala.differences
2-
import cats.effect.IO
3-
import scala.concurrent.duration._
2+
import cats.effect.{IO, IOApp}
43
import cats.effect.kernel.Deferred
5-
import cats.effect.IOApp
4+
5+
import scala.concurrent.duration._
66

77
object Differences extends IOApp.Simple {
88

‎cats-effects/src/main/scala/com/baeldung/scala/differences/FlatEvalDiff.scala

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.baeldung.scala.differences
22

3-
import cats.effect.IOApp
4-
import cats.effect.IO
5-
import cats.effect.Resource
6-
import cats.effect.std.Random
3+
import cats.effect.{IO, IOApp, Resource}
74

85
object FlatEvalDiff extends IOApp.Simple {
96

‎cats-effects/src/main/scala/com/baeldung/scala/fibers/Fibers.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.scala.fibers
22

3-
import cats.effect.{FiberIO, IO, IOApp, OutcomeIO}
4-
import IOExtensions._
53
import cats.effect.kernel.Outcome
4+
import cats.effect.{FiberIO, IO, IOApp, OutcomeIO}
5+
import com.baeldung.scala.fibers.IOExtensions._
66

77
import scala.concurrent.duration._
88
import scala.util.Random

‎doobie/src/main/scala/com/baeldung/scala/doobie/DoobieFragments.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.scala.doobie
22

33
import cats.effect.{IO, IOApp}
4-
import doobie.{Fragment, Transactor}
54
import doobie.implicits._
5+
import doobie.{Fragment, Transactor}
66

77
object DoobieFragments extends IOApp.Simple {
88

‎doobie/src/main/scala/com/baeldung/scala/doobie/DoobieQuickStart.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.scala.doobie
22

33
import cats.effect.{IO, IOApp}
4-
import doobie.{ConnectionIO, Transactor}
54
import doobie.implicits._
5+
import doobie.{ConnectionIO, Transactor}
66

77
// Equivalent to world db city table
88
case class City(id: Long, name: String, countryCode: String, district: String, population: Int)

‎play-scala/dependency-injection/test/macwire/service/ServiceWithRemoteCallTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package macwire.service
22

33
import macwire.components.{ApiComponents, MockApiComponents, ServiceComponents}
4-
import org.scalatest.WordSpec
4+
import org.scalatest.wordspec.AnyWordSpec
55

6-
class ServiceWithRemoteCallTest extends WordSpec {
6+
class ServiceWithRemoteCallTest extends AnyWordSpec {
77

88
"ServiceWithRemoteCall call" should {
99

‎scala-akka-2/src/main/scala/com/baeldung/scala/akka/http/MovieServer.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.baeldung.scala.akka.http
22

33
import akka.actor.ActorSystem
4-
import akka.http.scaladsl.model._
5-
import akka.http.scaladsl.server.Directives._
64
import akka.http.scaladsl.Http
7-
import scala.concurrent.ExecutionContext.Implicits.global
8-
import scala._
95
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
6+
import akka.http.scaladsl.model._
7+
import akka.http.scaladsl.model.headers.RawHeader
8+
import akka.http.scaladsl.server.Directives._
109
import spray.json.DefaultJsonProtocol._
10+
11+
import scala.concurrent.ExecutionContext.Implicits.global
1112
import scala.util._
12-
import akka.http.scaladsl.model.headers.RawHeader
1313

1414
object MovieServer extends App {
1515

0 commit comments

Comments
 (0)