Skip to content

Commit

Permalink
update zio to 1.0.18 (#652)
Browse files Browse the repository at this point in the history
* update zio

* update scala

* update silencer-lib

* update sbt-scalafix

* update scalajs

* update sbt
  • Loading branch information
tellnobody1 authored Feb 14, 2023
1 parent ec502d7 commit a077fbd
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 17 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
fail-fast: false
matrix:
java: ['[email protected]', '[email protected]']
scala: ['2.11.12', '2.12.15', '2.13.6', '3.0.2']
scala: ['2.11.12', '2.12.17', '2.13.10', '3.2.2']
platform: ['JVM', 'JS']
steps:
- name: Checkout current branch
Expand All @@ -62,13 +62,13 @@ jobs:
- name: Cache scala dependencies
uses: coursier/cache-action@v6
- name: Run tests
if: ${{ !startsWith(matrix.scala, '3.0.') }}
if: ${{ !startsWith(matrix.scala, '3.') }}
run: sbt ++${{ matrix.scala }}! test${{ matrix.platform }}
- name: Run dotty tests
if: ${{ startsWith(matrix.scala, '3.0.') && matrix.platform == 'JVM' }}
run: sbt ++${{ matrix.scala }}! testJVM
if: ${{ startsWith(matrix.scala, '3.') }}
run: sbt ++${{ matrix.scala }} test${{ matrix.platform }}
- name: Compile additional subprojects
if: ${{ !startsWith(matrix.scala, '3.0.') }}
if: ${{ !startsWith(matrix.scala, '3.') }}
run: sbt ++${{ matrix.scala }}! examples/compile docs/compile benchmarks/compile

ci:
Expand Down
17 changes: 10 additions & 7 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ inThisBuild(
)
)

val ZioVersion = "1.0.12"
val ZioVersion = "1.0.18"
val scalaJavaTimeVersion = "2.3.0"
val slf4jVersion = "1.7.33"

Expand Down Expand Up @@ -50,11 +50,11 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
.settings(stdSettings("zio-logging"))
.settings(
libraryDependencies ++= Seq(
"dev.zio" %%% "zio" % ZioVersion,
"dev.zio" %%% "zio-streams" % ZioVersion,
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.5.0",
"dev.zio" %%% "zio-test" % ZioVersion % Test,
"dev.zio" %%% "zio-test-sbt" % ZioVersion % Test
"dev.zio" %%% "zio" % ZioVersion,
"dev.zio" %%% "zio-streams" % ZioVersion,
("org.scala-lang.modules" %%% "scala-collection-compat" % "2.9.0").cross(CrossVersion.for3Use2_13),
"dev.zio" %%% "zio-test" % ZioVersion % Test,
"dev.zio" %%% "zio-test-sbt" % ZioVersion % Test
),
testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))
)
Expand All @@ -65,7 +65,10 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
lazy val coreJVM = core.jvm
.settings(dottySettings)
lazy val coreJS = core.js.settings(
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.3.0" % Test
libraryDependencies += "io.github.cquiroz" %%% "scala-java-time" % "2.3.0" % Test,
libraryDependencies += ("org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0").cross(
CrossVersion.for3Use2_13
) % Test
)

lazy val slf4j = project
Expand Down
2 changes: 2 additions & 0 deletions core/shared/src/main/scala/zio/logging/LogAnnotation.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package zio.logging

import com.github.ghik.silencer.silent
import zio.Cause

import java.time.OffsetDateTime
Expand Down Expand Up @@ -40,6 +41,7 @@ object LogAnnotation {
* If a value for the annotation is present, it will be rendered using the provided function. When
* absent, it will be rendered as an empty string.
*/
@silent("evidence")
def optional[A: ClassTag](name: String, render: A => String): LogAnnotation[Option[A]] =
LogAnnotation(
name = name,
Expand Down
4 changes: 2 additions & 2 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ object BuildHelper {
val Scala211: String = versions("2.11")
val Scala212: String = versions("2.12")
val Scala213: String = versions("2.13")
val ScalaDotty: String = versions("3.0")
val ScalaDotty: String = versions("3.2")

val SilencerVersion = "1.7.8"
val SilencerVersion = "1.7.12"

private val stdOptions = Seq(
"-deprecation",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.5.5
sbt.version = 1.8.2
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.12")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.33")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.10.0")
addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
Expand All @@ -9,7 +9,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin"
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.7.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.12.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
Expand Down

0 comments on commit a077fbd

Please sign in to comment.