@@ -12,7 +12,8 @@ val scala3 = List("3.1.0")
12
12
val sttpModelVersion = " 1.4.18"
13
13
14
14
val scalaTestVersion = " 3.2.10"
15
- val zioVersion = " 1.0.13"
15
+ val zio1Version = " 1.0.13"
16
+ val zio2Version = " 2.0.0-RC1"
16
17
val fs2_2_version : Option [(Long , Long )] => String = {
17
18
case Some ((2 , 11 )) => " 2.1.0"
18
19
case _ => " 2.5.9"
@@ -71,27 +72,15 @@ val commonNativeSettings = commonSettings ++ Seq(
71
72
)
72
73
)
73
74
75
+ lazy val allProjectRefs =
76
+ core.projectRefs ++ ws.projectRefs ++ akka.projectRefs ++ fs2ce2.projectRefs ++ fs2.projectRefs ++ monix.projectRefs ++ zio1.projectRefs ++ zio.projectRefs
77
+
74
78
lazy val projectAggregates : Seq [ProjectReference ] = if (sys.env.isDefinedAt(" STTP_NATIVE" )) {
75
79
println(" [info] STTP_NATIVE defined, including sttp-native in the aggregate projects" )
76
- core.projectRefs ++ ws.projectRefs ++ akka.projectRefs ++ fs2ce2.projectRefs ++ fs2.projectRefs ++ monix.projectRefs ++ zio.projectRefs
80
+ allProjectRefs
77
81
} else {
78
82
println(" [info] STTP_NATIVE *not* defined, *not* including sttp-native in the aggregate projects" )
79
- scala2.flatMap(v => List [ProjectReference ](core.js(v), ws.js(v))) ++
80
- scala2.flatMap(v => List [ProjectReference ](core.jvm(v), ws.jvm(v), fs2ce2.jvm(v), zio.jvm(v))) ++
81
- scala3.flatMap(v => List [ProjectReference ](core.jvm(v), ws.jvm(v), fs2ce2.jvm(v), fs2.jvm(v))) ++
82
- scala3.flatMap(v => List [ProjectReference ](core.js(v), ws.js(v))) ++
83
- List [ProjectReference ](
84
- akka.jvm(scala2_12),
85
- akka.jvm(scala2_13),
86
- fs2.jvm(scala2_12),
87
- fs2.jvm(scala2_13),
88
- monix.jvm(scala2_12),
89
- monix.jvm(scala2_13),
90
- monix.js(scala2_12),
91
- monix.js(scala2_13),
92
- zio.js(scala2_12),
93
- zio.js(scala2_13)
94
- )
83
+ allProjectRefs.filterNot(_.toString.contains(" Native" ))
95
84
}
96
85
97
86
val compileAndTest = " compile->compile;test->test"
@@ -202,10 +191,25 @@ lazy val monix = (projectMatrix in file("monix"))
202
191
)
203
192
.dependsOn(core)
204
193
194
+ lazy val zio1 = (projectMatrix in file(" zio1" ))
195
+ .settings(
196
+ name := " zio1" ,
197
+ libraryDependencies ++= Seq (" dev.zio" %% " zio-streams" % zio1Version, " dev.zio" %% " zio" % zio1Version)
198
+ )
199
+ .jvmPlatform(
200
+ scalaVersions = scala2 ++ scala3,
201
+ settings = commonJvmSettings
202
+ )
203
+ .jsPlatform(
204
+ scalaVersions = List (scala2_12, scala2_13) ++ scala3,
205
+ settings = commonJsSettings ++ browserChromeTestSettings
206
+ )
207
+ .dependsOn(core)
208
+
205
209
lazy val zio = (projectMatrix in file(" zio" ))
206
210
.settings(
207
211
name := " zio" ,
208
- libraryDependencies ++= Seq (" dev.zio" %% " zio-streams" % zioVersion , " dev.zio" %% " zio" % zioVersion )
212
+ libraryDependencies ++= Seq (" dev.zio" %% " zio-streams" % zio2Version , " dev.zio" %% " zio" % zio2Version )
209
213
)
210
214
.jvmPlatform(
211
215
scalaVersions = scala2 ++ scala3,
0 commit comments