diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 972cd4bf1f..ed135607c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.12.18, 2.13.10, 3.3.0] + scala: [2.12.18, 2.13.12, 3.3.1] java: [graal_graalvm@17, temurin@8] runs-on: ${{ matrix.os }} timeout-minutes: 60 @@ -54,8 +54,8 @@ jobs: cache: sbt - name: Check formatting - if: matrix.scala == '2.13.10' - run: sbt ++2.13.10 fmtCheck + if: matrix.scala == '2.13.12' + run: sbt ++2.13.12 fmtCheck - name: Check that workflows are up to date run: sbt '++ ${{ matrix.scala }}' githubWorkflowCheck @@ -65,10 +65,10 @@ jobs: - name: Check doc generation if: ${{ github.event_name == 'pull_request' }} - run: sbt ++2.13.10 doc + run: sbt ++2.13.12 doc - name: zio-http-shaded Tests - if: matrix.scala == '2.13.10' + if: matrix.scala == '2.13.12' env: PUBLISH_SHADED: true run: sbt '++ ${{ matrix.scala }}' zioHttpShadedTests/test @@ -89,7 +89,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] + scala: [2.13.12] java: [graal_graalvm@17] runs-on: ${{ matrix.os }} steps: @@ -126,22 +126,22 @@ jobs: tar xf targets.tar rm targets.tar - - name: Download target directories (2.13.10) + - name: Download target directories (2.13.12) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-2.13.10-${{ matrix.java }} + name: target-${{ matrix.os }}-2.13.12-${{ matrix.java }} - - name: Inflate target directories (2.13.10) + - name: Inflate target directories (2.13.12) run: | tar xf targets.tar rm targets.tar - - name: Download target directories (3.3.0) + - name: Download target directories (3.3.1) uses: actions/download-artifact@v3 with: - name: target-${{ matrix.os }}-3.3.0-${{ matrix.java }} + name: target-${{ matrix.os }}-3.3.1-${{ matrix.java }} - - name: Inflate target directories (3.3.0) + - name: Inflate target directories (3.3.1) run: | tar xf targets.tar rm targets.tar @@ -182,7 +182,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] + scala: [2.13.12] java: [temurin@8] runs-on: ${{ matrix.os }} steps: @@ -193,7 +193,7 @@ jobs: - name: Add Scoverage id: add_plugin - run: sed -i -e '$aaddSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")' project/plugins.sbt + run: sed -i -e '$aaddSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")' project/plugins.sbt - name: Update Build Definition id: update_build_definition @@ -215,7 +215,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - scala: [2.13.10] + scala: [2.13.12] java: [temurin@8] runs-on: ${{ matrix.os }} steps: diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 039dcaf6ed..cdd39c839e 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -6,11 +6,11 @@ import de.heikoseeberger.sbtheader.HeaderPlugin.autoImport.{headerLicense, Heade object BuildHelper extends ScalaSettings { val Scala212 = "2.12.18" - val Scala213 = "2.13.10" - val Scala3 = "3.3.0" - val ScoverageVersion = "1.9.3" + val Scala213 = "2.13.12" + val Scala3 = "3.3.1" + val ScoverageVersion = "2.0.9" val JmhVersion = "0.4.3" - val SilencerVersion = "1.17.13" + val SilencerVersion = "1.7.14" private val stdOptions = Seq( "-deprecation", diff --git a/project/plugins.sbt b/project/plugins.sbt index 540cfc7eff..56a2650f15 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,5 +7,5 @@ addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.19.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10") addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.1.3") diff --git a/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala b/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala index c1ea30143e..9904cd3c09 100644 --- a/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala +++ b/zio-http/src/main/scala/zio/http/netty/EventLoopGroups.scala @@ -51,11 +51,12 @@ object EventLoopGroups { def make(config: Config, eventLoopGroup: UIO[EventLoopGroup])(implicit trace: Trace, ): ZIO[Scope, Nothing, EventLoopGroup] = - ZIO.acquireRelease(eventLoopGroup)(ev => + ZIO.acquireRelease(eventLoopGroup) { ev => + val future = ev.shutdownGracefully(config.shutdownQuietPeriod, config.shutdownTimeOut, config.shutdownTimeUnit) NettyFutureExecutor - .executed(ev.shutdownGracefully(config.shutdownQuietPeriod, config.shutdownTimeOut, config.shutdownTimeUnit)) - .orDie, - ) + .executed(future) + .orDie + } def epoll(config: Config)(implicit trace: Trace): ZIO[Scope, Nothing, EventLoopGroup] = make(config, ZIO.succeed(new EpollEventLoopGroup(config.nThreads)))