From b4ba76d96a76d559057e2b39a4eb97f8d7db2e72 Mon Sep 17 00:00:00 2001 From: svroonland Date: Fri, 30 Jul 2021 17:33:41 +0200 Subject: [PATCH 1/2] Remove scala-collection-compat CrossVersion modifier --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 5298adb3..2408dce3 100644 --- a/build.sbt +++ b/build.sbt @@ -52,7 +52,7 @@ lazy val core = crossProject(JSPlatform, JVMPlatform) libraryDependencies ++= Seq( "dev.zio" %%% "zio" % ZioVersion, "dev.zio" %%% "zio-streams" % ZioVersion, - ("org.scala-lang.modules" %%% "scala-collection-compat" % "2.5.0").cross(CrossVersion.for3Use2_13), + "org.scala-lang.modules" %%% "scala-collection-compat" % "2.5.0", "dev.zio" %%% "zio-test" % ZioVersion % Test, "dev.zio" %%% "zio-test-sbt" % ZioVersion % Test ), From f4fd7b0950b4f8c12099c6fa1dd36af55e2aae2e Mon Sep 17 00:00:00 2001 From: Steven Vroonland Date: Fri, 30 Jul 2021 17:40:16 +0200 Subject: [PATCH 2/2] Formatting --- build.sbt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 2408dce3..ad09e840 100644 --- a/build.sbt +++ b/build.sbt @@ -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.5.0", + "dev.zio" %%% "zio-test" % ZioVersion % Test, + "dev.zio" %%% "zio-test-sbt" % ZioVersion % Test ), testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")) )