Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scala-parallel-collections native #1441

Merged
merged 4 commits into from
Jan 8, 2025
Merged

scala-parallel-collections native #1441

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34afe1a
scala-parallel-collections native
sideeffffect Dec 26, 2024
8dfabfe
scala-parallel-collections native
sideeffffect Jan 3, 2025
a53ca29
scala-parallel-collections native
sideeffffect Jan 4, 2025
fee883d
Merge branch 'series/2.x' into scala-parallel-collections-native
guizmaii Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ val projectsCommon = List(

val projectsJvmOnly = List[ProjectReference](
benchmarks,
docs,
scalaParallelCollections
docs
)

lazy val rootJVM = project
.in(file("target/rootJVM"))
.settings(publish / skip := true)
.aggregate(projectsCommon.map(_.jvm: ProjectReference): _*)
.aggregate(scalaParallelCollections.jvm)
.aggregate(projectsJvmOnly: _*)

lazy val rootJS = project
Expand All @@ -74,17 +74,19 @@ lazy val rootNative = project
.in(file("target/rootNative"))
.settings(publish / skip := true)
.aggregate(projectsCommon.map(_.native: ProjectReference): _*)
.aggregate(scalaParallelCollections.native)

lazy val root212 = project
.in(file("target/root212"))
.settings(publish / skip := true)
.aggregate(projectsCommon.map(_.jvm: ProjectReference): _*)
.aggregate(benchmarks, scalaParallelCollections)
.aggregate(benchmarks, scalaParallelCollections.jvm)

lazy val root213 = project
.in(file("target/root213"))
.settings(publish / skip := true)
.aggregate(projectsCommon.map(_.jvm: ProjectReference): _*)
.aggregate(scalaParallelCollections.jvm)
.aggregate(projectsJvmOnly: _*)

lazy val root3 = project
Expand All @@ -96,6 +98,7 @@ lazy val root = project
.in(file("."))
.settings(publish / skip := true)
.aggregate(projectsCommon.flatMap(p => List[ProjectReference](p.jvm, p.js, p.native)): _*)
.aggregate(scalaParallelCollections.jvm, scalaParallelCollections.native)
.aggregate(projectsJvmOnly: _*)

lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
Expand Down Expand Up @@ -237,9 +240,9 @@ lazy val experimentalTests = crossProject(JSPlatform, JVMPlatform, NativePlatfor
.nativeSettings(nativeSettings)
.enablePlugins(BuildInfoPlugin)

lazy val scalaParallelCollections = project
lazy val scalaParallelCollections = crossProject(JVMPlatform, NativePlatform)
.in(file("scala-parallel-collections"))
.dependsOn(core.jvm, coreTests.jvm % "test->test")
.dependsOn(core, coreTests % "test->test")
.settings(stdSettings("zio-prelude-scala-parallel-collections"))
.settings(buildInfoSettings("zio.prelude.scalaparallelcollections"))
.settings(testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")))
Expand All @@ -256,7 +259,8 @@ lazy val scalaParallelCollections = project
}
)
.settings(libraryDependencies += "dev.zio" %%% "zio-test-sbt" % zioVersion % Test)
.settings(scalaReflectTestSettings)
.jvmSettings(scalaReflectTestSettings)
.nativeSettings(nativeSettings)
.enablePlugins(BuildInfoPlugin)

lazy val benchmarks = project
Expand Down Expand Up @@ -289,11 +293,11 @@ lazy val docs = project
experimental.jvm,
experimentalLaws.jvm,
laws.jvm,
scalaParallelCollections
scalaParallelCollections.jvm
)
)
.settings(macroDefinitionSettings)
.dependsOn(core.jvm, experimental.jvm, experimentalLaws.jvm, laws.jvm, scalaParallelCollections)
.dependsOn(core.jvm, experimental.jvm, experimentalLaws.jvm, laws.jvm, scalaParallelCollections.jvm)
.enablePlugins(WebsitePlugin)

lazy val examples =
Expand Down