Skip to content

Commit ab5db76

Browse files
authored
Merge pull request #10686 from Sciss/wip-community-build-lucre
2 parents 73c8849 + 2990b57 commit ab5db76

File tree

14 files changed

+137
-0
lines changed

14 files changed

+137
-0
lines changed

.gitmodules

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,3 +141,36 @@
141141
[submodule "community-build/community-projects/coop"]
142142
path = community-build/community-projects/coop
143143
url = https://github.com/dotty-staging/coop.git
144+
[submodule "community-build/community-projects/AsyncFile"]
145+
path = community-build/community-projects/AsyncFile
146+
url = https://github.com/dotty-staging/AsyncFile.git
147+
[submodule "community-build/community-projects/Equal"]
148+
path = community-build/community-projects/Equal
149+
url = https://github.com/dotty-staging/Equal.git
150+
[submodule "community-build/community-projects/FingerTree"]
151+
path = community-build/community-projects/FingerTree
152+
url = https://github.com/dotty-staging/FingerTree.git
153+
[submodule "community-build/community-projects/Log"]
154+
path = community-build/community-projects/Log
155+
url = https://github.com/dotty-staging/Log.git
156+
[submodule "community-build/community-projects/Model"]
157+
path = community-build/community-projects/Model
158+
url = https://github.com/dotty-staging/Model.git
159+
[submodule "community-build/community-projects/Numbers"]
160+
path = community-build/community-projects/Numbers
161+
url = https://github.com/dotty-staging/Numbers.git
162+
[submodule "community-build/community-projects/Serial"]
163+
path = community-build/community-projects/Serial
164+
url = https://github.com/dotty-staging/Serial.git
165+
[submodule "community-build/community-projects/Span"]
166+
path = community-build/community-projects/Span
167+
url = https://github.com/dotty-staging/Span.git
168+
[submodule "community-build/community-projects/Lucre"]
169+
path = community-build/community-projects/Lucre
170+
url = https://github.com/dotty-staging/Lucre.git
171+
[submodule "community-build/community-projects/scala-stm"]
172+
path = community-build/community-projects/scala-stm
173+
url = https://github.com/dotty-staging/scala-stm.git
174+
[submodule "community-build/community-projects/scalatestplus-junit"]
175+
path = community-build/community-projects/scalatestplus-junit
176+
url = https://github.com/dotty-staging/scalatestplus-junit.git
Submodule AsyncFile added at fe33563
Submodule Equal added at f42b050
Submodule FingerTree added at 42b27e0
Submodule Log added at 02b59d0
Submodule Lucre added at b569546
Submodule Model added at 0704fa3
Submodule Numbers added at 971a675
Submodule Serial added at 0a3a397
Submodule Span added at 8674590
Submodule scala-stm added at e25579f

community-build/src/scala/dotty/communitybuild/projects.scala

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,13 @@ object projects:
291291
dependencies = List(scalatest, scalacheck)
292292
)
293293

294+
lazy val scalatestplusJunit = SbtCommunityProject(
295+
project = "scalatestplus-junit",
296+
sbtTestCommand = "scalatestplus-junit/test",
297+
sbtPublishCommand = "scalatestplus-junit/publishLocal",
298+
dependencies = List(scalatest)
299+
)
300+
294301
lazy val scalaXml = SbtCommunityProject(
295302
project = "scala-xml",
296303
sbtTestCommand = "xml/test",
@@ -533,6 +540,78 @@ object projects:
533540
dependencies = List(cats, catsMtl)
534541
)
535542

543+
// 'Sciss/Lucre' with its dependencies:
544+
545+
lazy val scissEqual = SbtCommunityProject(
546+
project = "Equal",
547+
sbtTestCommand = "rootJVM/test",
548+
sbtPublishCommand = "rootJVM/publishLocal",
549+
dependencies = List(scalatest),
550+
)
551+
552+
lazy val scissFingerTree = SbtCommunityProject(
553+
project = "FingerTree",
554+
sbtTestCommand = "rootJVM/test",
555+
sbtPublishCommand = "rootJVM/publishLocal",
556+
dependencies = List(scalatest),
557+
)
558+
559+
lazy val scissLog = SbtCommunityProject(
560+
project = "Log",
561+
sbtTestCommand = "rootJVM/test",
562+
sbtPublishCommand = "rootJVM/publishLocal",
563+
)
564+
565+
lazy val scissModel = SbtCommunityProject(
566+
project = "Model",
567+
sbtTestCommand = "rootJVM/test",
568+
sbtPublishCommand = "rootJVM/publishLocal",
569+
dependencies = List(scalatest),
570+
)
571+
572+
lazy val scissNumbers = SbtCommunityProject(
573+
project = "Numbers",
574+
sbtTestCommand = "rootJVM/test",
575+
sbtPublishCommand = "rootJVM/publishLocal",
576+
dependencies = List(scalatest),
577+
)
578+
579+
lazy val scissSerial = SbtCommunityProject(
580+
project = "Serial",
581+
sbtTestCommand = "rootJVM/test",
582+
sbtPublishCommand = "rootJVM/publishLocal",
583+
dependencies = List(scalatest),
584+
)
585+
586+
lazy val scissAsyncFile = SbtCommunityProject(
587+
project = "AsyncFile",
588+
sbtTestCommand = "rootJVM/test",
589+
sbtPublishCommand = "rootJVM/publishLocal",
590+
dependencies = List(scissLog, scalatest),
591+
)
592+
593+
lazy val scissSpan = SbtCommunityProject(
594+
project = "Span",
595+
sbtTestCommand = "rootJVM/test",
596+
sbtPublishCommand = "rootJVM/publishLocal",
597+
dependencies = List(scissSerial, scalatest),
598+
)
599+
600+
lazy val scalaSTM = SbtCommunityProject(
601+
project = "scala-stm",
602+
sbtTestCommand = "rootJVM/test",
603+
sbtPublishCommand = "rootJVM/publishLocal",
604+
dependencies = List(scalatestplusJunit),
605+
)
606+
607+
lazy val scissLucre = SbtCommunityProject(
608+
project = "Lucre",
609+
sbtTestCommand = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test",
610+
extraSbtArgs = List("-Dde.sciss.lucre.ShortTests=true"),
611+
sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal",
612+
dependencies = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest),
613+
)
614+
536615
end projects
537616

538617
def allProjects = projects.reflectedFields.of[CommunityProject].sortBy(_.project)

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,19 @@ class CommunityBuildTestA extends CommunityBuildTest:
102102
@Test def upickle = projects.upickle.run()
103103
@Test def utest = projects.utest.run()
104104
@Test def zio = projects.zio.run()
105+
106+
// 'scala-stm' and 'Sciss/Lucre':
107+
// @Test def scissEqual = projects.scissEqual .run()
108+
// @Test def scissFingerTree = projects.scissFingerTree.run()
109+
// @Test def scissLog = projects.scissLog .run()
110+
// @Test def scissModel = projects.scissModel .run()
111+
// @Test def scissNumbers = projects.scissNumbers .run()
112+
// @Test def scissSerial = projects.scissSerial .run()
113+
// @Test def scissAsyncFile = projects.scissAsyncFile .run()
114+
// @Test def scissSpan = projects.scissSpan .run()
115+
@Test def scalaSTM = projects.scalaSTM .run()
116+
@Test def scissLucre = projects.scissLucre .run()
117+
105118
end CommunityBuildTestA
106119

107120
@Category(Array(classOf[TestCategory]))
@@ -134,6 +147,7 @@ class CommunityBuildTestB extends CommunityBuildTest:
134147
@Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()
135148
@Test def verify = projects.verify.run()
136149
@Test def xmlInterpolator = projects.xmlInterpolator.run()
150+
137151
end CommunityBuildTestB
138152

139153
class TestCategory

0 commit comments

Comments
 (0)