Skip to content

Commit 4a742ee

Browse files
committed
WIP native
1 parent ad9af59 commit 4a742ee

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

build.sc

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ object versions {
2222
val scalaNativeVersion = "0.4.7"
2323
val munitVersion = "0.7.29"
2424
val munitNativeVersion = "1.0.0-M6"
25-
val fs2 = "3.2.13"
25+
val fs2 = "3.2.14-75-7902cbf"
26+
val weaver = "0.7.15+40-63a2a6dd+20220914-1514"
2627

2728
val scala213 = "2.13"
2829
val scala212 = "2.12"
@@ -75,6 +76,11 @@ object fs2 extends RPCCrossPlatformModule { cross =>
7576
object test extends WeaverTests
7677
}
7778

79+
object native extends mill.Cross[NativeModule](scala213, scala3)
80+
class NativeModule(cv: String) extends cross.Native(cv) {
81+
object test extends WeaverTests
82+
}
83+
7884
}
7985

8086
object examples extends mill.define.Module {
@@ -86,8 +92,8 @@ object examples extends mill.define.Module {
8692
}
8793

8894
object client extends ScalaModule {
89-
def ivyDeps = Agg(ivy"co.fs2::fs2-io:${versions.fs2}")
90-
def moduleDeps = Seq(fs2.jvm(versions.scala213))
95+
def ivyDeps = Agg(ivy"co.fs2::fs2-io::${versions.fs2}")
96+
def moduleDeps = Seq(fs2.native(versions.scala213))
9197
def scalaVersion = versions.scala213Version
9298
def forkEnv: Target[Map[String, String]] = T {
9399
val assembledServer = server.assembly()
@@ -112,7 +118,7 @@ trait RPCCrossPlatformModule extends Module { shared =>
112118
override def platformLabel: String = "jvm"
113119

114120
trait WeaverTests extends Tests {
115-
def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.disneystreaming::weaver-cats:0.7.15")
121+
def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.disneystreaming::weaver-cats:${versions.weaver}")
116122
def testFramework = "weaver.framework.CatsEffect"
117123
}
118124

@@ -173,6 +179,11 @@ trait RPCCrossPlatformModule extends Module { shared =>
173179
override def skipIdea = true
174180
override def skipBloop = true
175181

182+
trait WeaverTests extends Tests {
183+
def ivyDeps = super.ivyDeps() ++ Agg(ivy"com.disneystreaming::weaver-cats::${versions.weaver}")
184+
def testFramework = "weaver.framework.CatsEffect"
185+
}
186+
176187
trait MunitTests extends Tests with TestModule.Munit {
177188
def ivyDeps = super.ivyDeps() ++ Agg(ivy"org.scalameta::munit::$munitNativeVersion")
178189
}

0 commit comments

Comments
 (0)