Skip to content

Commit 10b0796

Browse files
author
Matteo Di Pirro
committed
Merge branch 'upstream-master' into scala-429
# Conflicts: # build.sbt
2 parents c6abe40 + 49005b9 commit 10b0796

File tree

286 files changed

+2869
-1167
lines changed

Some content is hidden

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

286 files changed

+2869
-1167
lines changed

‎app-packaging/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "app-packaging"
22
version := "1.0.2"
33

4-
ThisBuild / scalaVersion := "3.1.0"
4+
ThisBuild / scalaVersion := "3.2.0"
55

66
libraryDependencies ++= Seq(
77
"com.lihaoyi" %% "os-lib" % "0.7.8"

‎build.sbt

Lines changed: 157 additions & 119 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

‎cats-effects/src/main/scala/com/baeldung/scala/resources/ResourceHandling.scala

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
package com.baeldung.scala.resources
22

3-
import cats.effect.IO
4-
import java.io.File
5-
import scala.io.Source
6-
import cats.effect.IOApp
7-
import scala.io.BufferedSource
3+
import cats.effect.{IO, IOApp, Resource}
4+
85
import java.io.FileWriter
9-
import cats.effect.Resource
6+
import scala.io.Source
107

118
object ResourceHandling extends IOApp.Simple {
129

‎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)

0 commit comments

Comments
 (0)