Upgrades dependencies

gaelrenoux · Jun 12, 2021 · 588f075 · 588f075
1 parent 5688c86
commit 588f075
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -192,7 +192,8 @@ The table below indicates for each version of TranzactIO, the versions of ZIO or
 | 1.2.0      | 1.0.3        | 0.9.2        | 2.6.7        |
 | 1.3.0      | 1.0.5        | 0.9.4        | 2.6.10       |
 | 2.0.0      | 1.0.5        | 0.12.1       | 2.6.10       |
-| master     | 1.0.5        | 0.12.1       | 2.6.10       |
+| 2.1.0      | 1.0.9        | 0.13.4       | 2.6.10       |
+| master     | 1.0.9        | 0.13.4       | 2.6.10       |
 
 
 

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ licenses := Seq("APL2" -> url("https://www.apache.org/licenses/LICENSE-2.0.txt")
 description := "ZIO wrapper for Scala DB libraries (e.g. Doobie)"
 
 val scala212Version = "2.12.14"
-val scala213Version = "2.13.3"
+val scala213Version = "2.13.6"
 val supportedScalaVersions = List(scala212Version, scala213Version)
 
 scalaVersion := scala213Version
@@ -106,9 +106,9 @@ scalacOptions ++= allVersionsOption ++ {
 }
 
 
-val ZioVersion = "1.0.5"
-val ZioCatsVersion = "2.3.1.0"
-val DoobieVersion = "0.12.1"
+val ZioVersion = "1.0.9"
+val ZioCatsVersion = "2.5.1.0"
+val DoobieVersion = "0.13.4"
 val AnormVersion = "2.6.10"
 val H2Version = "1.4.200"
 

diff --git a/src/samples/scala/samples/anorm/LayeredApp.scala b/src/samples/scala/samples/anorm/LayeredApp.scala
@@ -32,13 +32,13 @@ object LayeredApp extends zio.App {
   /** Main code for the application. Results in a big ZIO depending on the AppEnv. */
   def myApp(): ZIO[AppEnv, DbException, List[Person]] = {
     val queries: ZIO[Connection with AppEnv, DbException, List[Person]] = for {
-      _ <- console.putStrLn("Creating the table")
+      _ <- console.putStrLn("Creating the table").orDie
       _ <- PersonQueries.setup
-      _ <- console.putStrLn("Inserting the trio")
+      _ <- console.putStrLn("Inserting the trio").orDie
       _ <- PersonQueries.insert(Person("Buffy", "Summers"))
       _ <- PersonQueries.insert(Person("Willow", "Rosenberg"))
       _ <- PersonQueries.insert(Person("Alexander", "Harris"))
-      _ <- console.putStrLn("Reading the trio")
+      _ <- console.putStrLn("Reading the trio").orDie
       trio <- PersonQueries.list
     } yield trio
 

diff --git a/src/samples/scala/samples/doobie/LayeredApp.scala b/src/samples/scala/samples/doobie/LayeredApp.scala
@@ -32,13 +32,13 @@ object LayeredApp extends zio.App {
   /** Main code for the application. Results in a big ZIO depending on the AppEnv. */
   def myApp(): ZIO[AppEnv, DbException, List[Person]] = {
     val queries: ZIO[Connection with AppEnv, DbException, List[Person]] = for {
-      _ <- console.putStrLn("Creating the table")
+      _ <- console.putStrLn("Creating the table").orDie
       _ <- PersonQueries.setup
-      _ <- console.putStrLn("Inserting the trio")
+      _ <- console.putStrLn("Inserting the trio").orDie
       _ <- PersonQueries.insert(Person("Buffy", "Summers"))
       _ <- PersonQueries.insert(Person("Willow", "Rosenberg"))
       _ <- PersonQueries.insert(Person("Alexander", "Harris"))
-      _ <- console.putStrLn("Reading the trio")
+      _ <- console.putStrLn("Reading the trio").orDie
       trio <- PersonQueries.list
     } yield trio
 

diff --git a/src/samples/scala/samples/doobie/LayeredAppStreaming.scala b/src/samples/scala/samples/doobie/LayeredAppStreaming.scala
@@ -33,14 +33,14 @@ object LayeredAppStreaming extends zio.App {
   /** Main code for the application. Results in a big ZIO depending on the AppEnv. */
   def myApp(): ZIO[AppEnv, DbException, List[Person]] = {
     val queries = for {
-      _ <- console.putStrLn("Creating the table")
+      _ <- console.putStrLn("Creating the table").orDie
       _ <- PersonQueries.setup
-      _ <- console.putStrLn("Inserting the trio")
+      _ <- console.putStrLn("Inserting the trio").orDie
       _ <- PersonQueries.insert(Person("Buffy", "Summers"))
       _ <- PersonQueries.insert(Person("Willow", "Rosenberg"))
       _ <- PersonQueries.insert(Person("Alexander", "Harris"))
       _ <- PersonQueries.insert(Person("Rupert", "Giles")) // insert one more!
-      _ <- console.putStrLn("Reading the trio")
+      _ <- console.putStrLn("Reading the trio").orDie
       trio <- {
         val stream: ZStream[PersonQueries with Connection, DbException, Person] = PersonQueries.listStream.take(3)
         stream.run(Sink.foldLeft(List[Person]()) { (ps, p) => p :: ps })