diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb36056..3f59448 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,14 +71,11 @@ jobs: check-latest: true - name: Cache scala dependencies uses: coursier/cache-action@v6 - - name: Run Scala 2.11 - if: ${{ startsWith(matrix.scala, '2.11.') && matrix.platform != 'JS' }} - run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }} - - name: Run Scala 2.[12|13] tests - if: ${{ startsWith(matrix.scala, '2.12.') || startsWith(matrix.scala, '2.13.') }} + - name: Run Scala 2 tests + if: ${{ startsWith(matrix.scala, '2.') }} run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }} - name: Run Scala 3 tests - if: ${{ startsWith(matrix.scala, '3.2.') && matrix.platform == 'JVM' }} + if: ${{ startsWith(matrix.scala, '3.') && matrix.platform == 'JVM' }} run: sbt ++${{ matrix.scala }}! testJVM ci: diff --git a/build.sbt b/build.sbt index ca166e1..180a5af 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,7 @@ import BuildHelper._ +Global / onChangedBuildSource := ReloadOnSourceChanges + inThisBuild( List( organization := "dev.zio", @@ -37,7 +39,7 @@ addCommandAlias( ";zioCacheNative/test:compile" ) -val zioVersion = "2.0.5" +val zioVersion = "2.0.6" lazy val root = project .in(file(".")) diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index af5795d..31f203f 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -293,10 +293,7 @@ object BuildHelper { } ) - def jsSettings = Seq( - libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.5.0", - libraryDependencies += "io.github.cquiroz" %%% "scala-java-time-tzdb" % "2.5.0" - ) + def jsSettings = Seq() def nativeSettings = Seq( Test / test := (Test / compile).value, @@ -316,7 +313,8 @@ object BuildHelper { def welcomeMessage = onLoadMessage := { def header(text: String): String = s"${scala.Console.RED}$text${scala.Console.RESET}" - def item(text: String): String = s"${scala.Console.GREEN}> ${scala.Console.CYAN}$text${scala.Console.RESET}" + def item(text: String): String = s"${scala.Console.GREEN}> ${scala.Console.CYAN}$text${scala.Console.RESET}" + def subItem(text: String): String = s" ${scala.Console.YELLOW}> ${scala.Console.CYAN}$text${scala.Console.RESET}" s"""|${header(" ________ ___")}