Skip to content

Commit 65ccdfb

Browse files
committed
Fix compilation of non-core modules
1 parent 3e98b2a commit 65ccdfb

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

build.sbt

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -158,19 +158,8 @@ ThisBuild / mimaBinaryIssueFilters ++= Seq(
158158
lazy val root = tlCrossRootProject
159159
.aggregate(coreJVM, coreJS, io, reactiveStreams, benchmark, experimental)
160160

161-
lazy val core = crossProject(JVMPlatform, JSPlatform)
162-
.in(file("core"))
163-
.settings(
164-
name := "fs2-core",
165-
libraryDependencies ++= Seq(
166-
"org.typelevel" %%% "cats-core" % "2.6.1",
167-
"org.typelevel" %%% "cats-laws" % "2.6.1" % Test,
168-
"org.typelevel" %%% "cats-effect" % "2.5.4",
169-
"org.typelevel" %%% "cats-effect-laws" % "2.5.4" % Test,
170-
"org.scodec" %%% "scodec-bits" % "1.1.28",
171-
"org.typelevel" %%% "scalacheck-effect-munit" % "1.0.2" % Test,
172-
"org.typelevel" %%% "munit-cats-effect-2" % "1.0.5" % Test
173-
) ++ (
161+
val compilerSettings = Seq(
162+
libraryDependencies ++= (
174163
if (scalaVersion.value.startsWith("3.")) Nil
175164
else
176165
Seq(
@@ -189,7 +178,23 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
189178
"-source:3.0-migration"
190179
)
191180
else Nil)
181+
)
182+
183+
lazy val core = crossProject(JVMPlatform, JSPlatform)
184+
.in(file("core"))
185+
.settings(
186+
name := "fs2-core",
187+
libraryDependencies ++= Seq(
188+
"org.typelevel" %%% "cats-core" % "2.6.1",
189+
"org.typelevel" %%% "cats-laws" % "2.6.1" % Test,
190+
"org.typelevel" %%% "cats-effect" % "2.5.4",
191+
"org.typelevel" %%% "cats-effect-laws" % "2.5.4" % Test,
192+
"org.scodec" %%% "scodec-bits" % "1.1.28",
193+
"org.typelevel" %%% "scalacheck-effect-munit" % "1.0.2" % Test,
194+
"org.typelevel" %%% "munit-cats-effect-2" % "1.0.5" % Test
195+
),
192196
)
197+
.settings(compilerSettings)
193198

194199
lazy val coreJVM = core.jvm
195200
.enablePlugins(SbtOsgi)
@@ -232,6 +237,7 @@ lazy val io = project
232237
OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
233238
osgiSettings
234239
)
240+
.settings(compilerSettings)
235241
.dependsOn(coreJVM % "compile->compile;test->test")
236242

237243
lazy val reactiveStreams = project
@@ -257,6 +263,7 @@ lazy val reactiveStreams = project
257263
OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
258264
osgiSettings
259265
)
266+
.settings(compilerSettings)
260267
.dependsOn(coreJVM % "compile->compile;test->test")
261268

262269
lazy val benchmark = project
@@ -267,6 +274,7 @@ lazy val benchmark = project
267274
Test / run / javaOptions := (Test / run / javaOptions).value
268275
.filterNot(o => o.startsWith("-Xmx") || o.startsWith("-Xms")) ++ Seq("-Xms256m", "-Xmx256m")
269276
)
277+
.settings(compilerSettings)
270278
.dependsOn(io)
271279

272280
lazy val experimental = project
@@ -287,4 +295,5 @@ lazy val experimental = project
287295
OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
288296
osgiSettings
289297
)
298+
.settings(compilerSettings)
290299
.dependsOn(coreJVM % "compile->compile;test->test")

0 commit comments

Comments
 (0)