Update dependencies and cleanup (#426)

* Update dependencies and cleanup * More fixes
zio · Aug 2, 2024 · ed063ba · ed063ba
1 parent 4b6a2af
commit ed063ba
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         java: ['17']
-        scala: ['2.12.17', '2.13.11', '3.3.1']
+        scala: ['2.12.19', '2.13.14', '3.3.3']
         platform: ['JVM', 'Native', 'JS']
     steps:
       - name: Checkout current branch

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -62,7 +62,7 @@ jobs:
   generate-readme:
     name: Generate README
     runs-on: ubuntu-latest
-    if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event_name == 'published')) }}
+    if: ${{ (github.event_name == 'push') || ((github.event_name == 'release') && (github.event.action == 'published')) }}
     steps:
     - name: Git Checkout
       uses: actions/[email protected]

diff --git a/build.sbt b/build.sbt
@@ -40,18 +40,19 @@ logo :=
      |""".stripMargin
 logoColor := scala.Console.RED
 usefulTasks := Seq(
-  UsefulTask("a", "~compile", "Compile all modules with file-watch enabled"),
-  UsefulTask("b", "fmt", "Run scalafmt on the entire project"),
-  UsefulTask("c", "docs/docusaurusCreateSite", "Generates the microsite"),
-  UsefulTask("", "testOnly *.YourSpec -- -t \"YourLabel\"", "Only runs tests with matching term")
+  UsefulTask("~compile", "Compile all modules with file-watch enabled"),
+  UsefulTask("fmt", "Run scalafmt on the entire project"),
+  UsefulTask("docs/docusaurusCreateSite", "Generates the microsite"),
+  UsefulTask("testOnly *.YourSpec -- -t \"YourLabel\"", "Only runs tests with matching term").noAlias
 )
 
-val zioVersion = "2.0.21"
+val zioVersion = "2.1.6"
 
 lazy val root =
   project
     .in(file("."))
     .settings(
+      name := "zio-process",
       publish / skip := true,
       crossScalaVersions := Nil
     )
@@ -84,7 +85,7 @@ lazy val zioProcess =
     .jsSettings(Test / fork := false)
     .jsSettings(
       libraryDependencies ++= Seq(
-        "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" % Test
+        "io.github.cquiroz" %%% "scala-java-time" % "2.6.0" % Test
       )
     )
     .jsSettings(

diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala
@@ -6,9 +6,9 @@ import sbtcrossproject.CrossPlugin.autoImport._
 
 object BuildHelper {
 
-  val Scala212 = "2.12.18"
-  val Scala213 = "2.13.11"
-  val Scala3   = "3.3.1"
+  val Scala212 = "2.12.19"
+  val Scala213 = "2.13.14"
+  val Scala3   = "3.3.3"
 
   private val stdOptions = Seq(
     "-encoding",

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version = 1.9.8
+sbt.version = 1.10.1
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,17 +1,30 @@
-addSbtPlugin("org.scalameta"       % "sbt-scalafmt"                  % "2.5.0")
-addSbtPlugin("pl.project13.scala"  % "sbt-jmh"                       % "0.4.5")
-addSbtPlugin("com.eed3si9n"        % "sbt-buildinfo"                 % "0.11.0")
-addSbtPlugin("org.scoverage"       % "sbt-scoverage"                 % "2.0.7")
-addSbtPlugin("org.scalameta"       % "sbt-mdoc"                      % "2.3.7")
-addSbtPlugin("ch.epfl.scala"       % "sbt-bloop"                     % "1.5.9")
-addSbtPlugin("com.github.sbt"      % "sbt-unidoc"                    % "0.5.0")
-addSbtPlugin("com.github.sbt"      % "sbt-ci-release"                % "1.5.11")
-addSbtPlugin("com.github.reibitto" % "sbt-welcome"                   % "0.2.2")
-addSbtPlugin("dev.zio"             % "zio-sbt-website"               % "0.3.4")
-addSbtPlugin("org.portable-scala"  % "sbt-scala-native-crossproject" % "1.3.2")
-addSbtPlugin("org.scala-native"    % "sbt-scala-native"              % "0.4.17")
-addSbtPlugin("org.portable-scala"  % "sbt-scalajs-crossproject"      % "1.3.2")
-addSbtPlugin("org.scala-js"        % "sbt-scalajs"                   % "1.15.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
+
+addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.5")
+
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
+
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.12")
+
+addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
+
+addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.18")
+
+addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
+
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
+
+addSbtPlugin("com.github.reibitto" % "sbt-welcome" % "0.4.0")
+
+addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10")
+
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
+
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
+
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
+
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
 
 libraryDependencies += "org.snakeyaml" % "snakeyaml-engine" % "2.6"
 

diff --git a/zio-process/shared/src/main/scala/zio/process/ProcessStream.scala b/zio-process/shared/src/main/scala/zio/process/ProcessStream.scala
@@ -46,7 +46,6 @@ final case class ProcessStream(
     ZIO
       .scoped[Any][Throwable, Chunk[String]] {
         for {
-          _      <- zio.Console.printLine("reading")
           _      <- close
           _      <- ProcessPlatformSpecific.wait(inputStream)
           reader <- ZIO.fromAutoCloseable(ZIO.succeed(new BufferedReader(new InputStreamReader(inputStream, charset))))