diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 965fc7e2..579a4373 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: java: ['adopt@1.8', 'adopt@1.11'] - scala: ['2.11.12', '2.12.11', '2.13.3', '0.27.0-RC1'] + scala: ['2.11.12', '2.12.13', '2.13.4', '3.0.0-M3'] steps: - uses: actions/checkout@v2.3.4 - uses: olafurpg/setup-scala@v10 diff --git a/nio-core/src/test/scala/zio/nio/core/channels/ChannelSpec.scala b/nio-core/src/test/scala/zio/nio/core/channels/ChannelSpec.scala index ce5cf42b..2f37951a 100644 --- a/nio-core/src/test/scala/zio/nio/core/channels/ChannelSpec.scala +++ b/nio-core/src/test/scala/zio/nio/core/channels/ChannelSpec.scala @@ -3,7 +3,6 @@ package zio.nio.core.channels import java.io.{ EOFException, FileNotFoundException, IOException } import zio.nio.core.{ BaseSpec, Buffer, EffectOps, SocketAddress } -import zio.test.{ suite, testM } import zio.{ IO, _ } import zio.test._ import zio.test.Assertion._ diff --git a/nio-core/src/test/scala/zio/nio/core/channels/DatagramChannelSpec.scala b/nio-core/src/test/scala/zio/nio/core/channels/DatagramChannelSpec.scala index f6ccdac5..973742c3 100644 --- a/nio-core/src/test/scala/zio/nio/core/channels/DatagramChannelSpec.scala +++ b/nio-core/src/test/scala/zio/nio/core/channels/DatagramChannelSpec.scala @@ -4,7 +4,7 @@ import java.io.IOException import zio.nio.core._ import zio.test.Assertion._ -import zio.test.{ suite, testM, _ } +import zio.test._ import zio.{ IO, _ } object DatagramChannelSpec extends BaseSpec { diff --git a/nio/src/test/scala/zio/nio/channels/ChannelSpec.scala b/nio/src/test/scala/zio/nio/channels/ChannelSpec.scala index 2c04a3c8..0653b543 100644 --- a/nio/src/test/scala/zio/nio/channels/ChannelSpec.scala +++ b/nio/src/test/scala/zio/nio/channels/ChannelSpec.scala @@ -2,7 +2,6 @@ package zio.nio.channels import zio.nio.BaseSpec import zio.nio.core.{ Buffer, SocketAddress } -import zio.test.{ suite, testM } import zio.{ IO, _ } import zio.test._ import zio.test.Assertion._ diff --git a/nio/src/test/scala/zio/nio/channels/DatagramChannelSpec.scala b/nio/src/test/scala/zio/nio/channels/DatagramChannelSpec.scala index dcd46a5b..cfab45b9 100644 --- a/nio/src/test/scala/zio/nio/channels/DatagramChannelSpec.scala +++ b/nio/src/test/scala/zio/nio/channels/DatagramChannelSpec.scala @@ -3,7 +3,7 @@ package zio.nio.channels import zio.nio._ import zio.nio.core.{ Buffer, SocketAddress } import zio.test.Assertion._ -import zio.test.{ suite, testM, _ } +import zio.test._ import zio._ object DatagramChannelSpec extends BaseSpec { diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 9b2535fb..1d62eab5 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -51,7 +51,7 @@ object BuildHelper { } ) - val ZioCoreVersion = "1.0.3" + val ZioCoreVersion = "1.0.4-2" private val Scala211 = "2.11.12" private val Scala212 = "2.12.12" diff --git a/project/plugins.sbt b/project/plugins.sbt index 57a68431..07717a48 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.6") addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5") addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.0") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.10") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.17") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")