Skip to content

Commit

Permalink
Merge pull request #3082 from armanbilge/fix/native-deps-build-config
Browse files Browse the repository at this point in the history
Fix native deps in build
  • Loading branch information
mpilquist authored Dec 16, 2022
2 parents 2fe9d08 + ce7085f commit 571bda5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ lazy val root = tlCrossRootProject

lazy val IntegrationTest = config("it").extend(Test)

lazy val commonNativeSettings = Seq(
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "3.2.15").toMap
lazy val commonNativeSettings = Seq[Setting[_]](
tlVersionIntroduced := List("2.12", "2.13", "3").map(_ -> "3.2.15").toMap,
Test / nativeBrewFormulas += "openssl"
)

lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
Expand Down Expand Up @@ -239,9 +240,6 @@ lazy val coreNative = core.native
.enablePlugins(ScalaNativeBrewedConfigPlugin)
.disablePlugins(DoctestPlugin)
.settings(commonNativeSettings)
.settings(
Test / nativeBrewFormulas += "openssl"
)

lazy val io = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.in(file("io"))
Expand Down Expand Up @@ -334,6 +332,7 @@ lazy val scodec = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.jsSettings(
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
)
.nativeEnablePlugins(ScalaNativeBrewedConfigPlugin)
.nativeSettings(commonNativeSettings)
.dependsOn(core % "compile->compile;test->test", io % "test")

Expand All @@ -347,6 +346,7 @@ lazy val protocols = crossProject(JVMPlatform, JSPlatform, NativePlatform)
.jsSettings(
scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
)
.nativeEnablePlugins(ScalaNativeBrewedConfigPlugin)
.nativeSettings(commonNativeSettings)
.dependsOn(core % "compile->compile;test->test", scodec, io)

Expand Down

0 comments on commit 571bda5

Please sign in to comment.