From 84ec1747a5986e0a31f42e58c2f2ab2e4c022fe4 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Sun, 4 Apr 2021 15:40:42 +0200 Subject: [PATCH 1/3] Scala 3.0.0-RC2 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 2 +- project/BuildHelper.scala | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6d0f7fc14d2..dda53e480906 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ env: SCALA_211: 2.11.12 SCALA_212: 2.12.13 SCALA_213: 2.13.5 - SCALA_3: 3.0.0-RC1 + SCALA_3: 3.0.0-RC2 JAVA_OPTS: -Xms2048M -Xmx3072M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 JVM_OPTS: -Xms2048M -Xmx3072M -Xss6M -XX:ReservedCodeCacheSize=256M -Dfile.encoding=UTF-8 @@ -52,7 +52,7 @@ jobs: fail-fast: false matrix: java: ['adopt@1.8', 'adopt@1.11'] - scala: ['2.11.12', '2.12.13', '2.13.5', '3.0.0-RC1'] + scala: ['2.11.12', '2.12.13', '2.13.5', '3.0.0-RC2'] platform: ['JVM', 'JS', 'Native'] steps: - name: Checkout current branch diff --git a/build.sbt b/build.sbt index a83a324462cf..57ddef77563a 100644 --- a/build.sbt +++ b/build.sbt @@ -125,7 +125,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform) .settings(stdSettings("zio")) .settings(crossProjectSettings) .settings(buildInfoSettings("zio")) - .settings(libraryDependencies += "dev.zio" %%% "izumi-reflect" % "1.0.0-M16") + .settings(libraryDependencies += "dev.zio" %%% "izumi-reflect" % "1.0.0-M17") .enablePlugins(BuildInfoPlugin) lazy val coreJVM = core.jvm diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index a5be8da79d2e..28680c89c056 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -12,7 +12,7 @@ object BuildHelper { val Scala211 = "2.11.12" val Scala212 = "2.12.13" val Scala213 = "2.13.5" - val ScalaDotty = "3.0.0-RC1" + val ScalaDotty = "3.0.0-RC2" val SilencerVersion = "1.7.3" From 0ee5584f93a4b8e856ae1df3374dd2d1d7d54f31 Mon Sep 17 00:00:00 2001 From: Adam Fraser Date: Mon, 5 Apr 2021 18:04:49 -0700 Subject: [PATCH 2/3] add type alias --- .../src/test/scala/zio/test/MutableRunnableSpecSpec.scala | 8 ++++++-- .../test/scala/zio/test/mock/ComposedEmptyMockSpec.scala | 6 +++++- .../main/scala/zio/test/DefaultMutableRunnableSpec.scala | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala b/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala index 143f33301a00..fbede7250390 100644 --- a/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala @@ -3,10 +3,10 @@ package zio.test import zio.test.Assertion._ import zio.test.TestAspect._ import zio.test.environment.TestEnvironment -import zio.{Ref, ZIO} +import zio.{Has, Ref, ZIO} object MutableRunnableSpecSpec - extends MutableRunnableSpec( + extends MutableRunnableSpec[MutableRunnableSpecSpecCompat.Environment]( TestEnvironment.any ++ Ref.make(0).toLayer, sequential >>> samples(10) >>> before(ZIO.service[Ref[Int]].flatMap(_.update(_ + 1))) ) { @@ -26,3 +26,7 @@ object MutableRunnableSpecSpec } yield assert(value)(equalTo(13)) } } + +object MutableRunnableSpecSpecCompat { + type Environment = TestEnvironment with Has[Ref[Int]] +} diff --git a/test-tests/shared/src/test/scala/zio/test/mock/ComposedEmptyMockSpec.scala b/test-tests/shared/src/test/scala/zio/test/mock/ComposedEmptyMockSpec.scala index ee913a317939..6e91b4c1c4ff 100644 --- a/test-tests/shared/src/test/scala/zio/test/mock/ComposedEmptyMockSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/mock/ComposedEmptyMockSpec.scala @@ -8,7 +8,7 @@ import zio.{ZIO, clock, console} import java.io.IOException -object ComposedEmptyMockSpec extends ZIOBaseSpec with MockSpecUtils[Console with Clock] { +object ComposedEmptyMockSpec extends ZIOBaseSpec with MockSpecUtils[ComposedEmptyMockSpecCompat.Environment] { import Assertion._ import Expectation._ @@ -63,3 +63,7 @@ object ComposedEmptyMockSpec extends ZIOBaseSpec with MockSpecUtils[Console with ) ) } + +object ComposedEmptyMockSpecCompat { + type Environment = Console with Clock +} diff --git a/test/shared/src/main/scala/zio/test/DefaultMutableRunnableSpec.scala b/test/shared/src/main/scala/zio/test/DefaultMutableRunnableSpec.scala index 670d412845a5..a163733b26f9 100644 --- a/test/shared/src/main/scala/zio/test/DefaultMutableRunnableSpec.scala +++ b/test/shared/src/main/scala/zio/test/DefaultMutableRunnableSpec.scala @@ -19,4 +19,5 @@ import zio.test.environment.TestEnvironment * } * }}} */ -class DefaultMutableRunnableSpec extends MutableRunnableSpec(ZLayer.identity[TestEnvironment], TestAspect.identity) +class DefaultMutableRunnableSpec + extends MutableRunnableSpec[TestEnvironment](ZLayer.identity[TestEnvironment], TestAspect.identity) From b35255240b5e933b220b0c3789944943aba81ad0 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Tue, 6 Apr 2021 17:12:28 +0200 Subject: [PATCH 3/3] Apply suggestions from code review Co-authored-by: Adam Fraser --- .../src/test/scala/zio/test/MutableRunnableSpecSpec.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala b/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala index fbede7250390..54bde3e5553d 100644 --- a/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala +++ b/test-tests/shared/src/test/scala/zio/test/MutableRunnableSpecSpec.scala @@ -3,11 +3,11 @@ package zio.test import zio.test.Assertion._ import zio.test.TestAspect._ import zio.test.environment.TestEnvironment -import zio.{Has, Ref, ZIO} +import zio.{Has, Ref, ZIO, ZLayer} object MutableRunnableSpecSpec extends MutableRunnableSpec[MutableRunnableSpecSpecCompat.Environment]( - TestEnvironment.any ++ Ref.make(0).toLayer, + TestEnvironment.any ++ ZLayer.fromEffect(Ref.make(0)), sequential >>> samples(10) >>> before(ZIO.service[Ref[Int]].flatMap(_.update(_ + 1))) ) { testM("ref 1") {