Skip to content

Commit

Permalink
Merge branch 'master' into renovate/node-18.x
Browse files Browse the repository at this point in the history
  • Loading branch information
justcoon authored Aug 13, 2023
2 parents 7f00493 + 89d9720 commit e2f6e9d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
auto-approve:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: hmarr/[email protected]
if: github.actor == 'scala-steward' || github.actor == 'renovate[bot]'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
update_release_draft:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: release-drafter/release-drafter@v5
env:
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ In order to use this library, we need to add the following line in our `build.sb

```scala
// ZIO Logging backends
libraryDependencies += "dev.zio" %% "zio-logging" % "2.1.13"
libraryDependencies += "dev.zio" %% "zio-logging" % "2.1.14"
```

The main module contains the following features:
Expand All @@ -43,10 +43,10 @@ Other modules:

```scala
// SLF4j v1 integration
libraryDependencies += "dev.zio" %% "zio-logging-slf4j" % "2.1.13"
libraryDependencies += "dev.zio" %% "zio-logging-slf4j" % "2.1.14"

// SLF4j v2 integration
libraryDependencies += "dev.zio" %% "zio-logging-slf4j2" % "2.1.13"
libraryDependencies += "dev.zio" %% "zio-logging-slf4j2" % "2.1.14"
```
When to use this module: you are already using SLF4J logger in some other project, and you like to have same log outputs.
See SLF4J [v2](docs/slf4j2.md) or [v1](docs/slf4j1.md) section for more details.
Expand All @@ -56,10 +56,10 @@ Other modules:

```scala
// Using ZIO Logging for SLF4j v1 loggers, usually third-party non-ZIO libraries
libraryDependencies += "dev.zio" %% "zio-logging-slf4j-bridge" % "2.1.13"
libraryDependencies += "dev.zio" %% "zio-logging-slf4j-bridge" % "2.1.14"

// Using ZIO Logging for SLF4j v2 loggers, usually third-party non-ZIO libraries
libraryDependencies += "dev.zio" %% "zio-logging-slf4j2-bridge" % "2.1.13"
libraryDependencies += "dev.zio" %% "zio-logging-slf4j2-bridge" % "2.1.14"
```

When to use this module: you want to use some zio-logger implementation, but also you are using some java library which using SLF4J interface for logging.
Expand All @@ -70,7 +70,7 @@ Other modules:

```scala
// JPL integration
libraryDependencies += "dev.zio" %% "zio-logging-jpl" % "2.1.13"
libraryDependencies += "dev.zio" %% "zio-logging-jpl" % "2.1.14"
```

When to use this module: you are already using Java Platform/System Logger in some other project, and you like to have same log outputs.
Expand Down
2 changes: 1 addition & 1 deletion project/Versions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ object Versions {
val slf4jVersion = "1.7.36"
val slf4j2Version = "2.0.7"
val logbackVersion = "1.2.12"
val logback2Version = "1.4.9"
val logback2Version = "1.4.11"
val scalaCollectionCompatVersion = "2.11.0"
val logstashLogbackEncoderVersion = "6.6"
val scalaJavaTimeVersion = "2.5.0"
Expand Down

0 comments on commit e2f6e9d

Please sign in to comment.