Merge pull request #10686 from Sciss/wip-community-build-lucre

smarter · web-flow · commit ab5db76fd014 · 2020-12-09T18:31:22.000+01:00
diff --git a/.gitmodules b/.gitmodules
@@ -141,3 +141,36 @@
 [submodule "community-build/community-projects/coop"]
 	path = community-build/community-projects/coop
 	url = https://github.com/dotty-staging/coop.git
+[submodule "community-build/community-projects/AsyncFile"]
+	path = community-build/community-projects/AsyncFile
+	url = https://github.com/dotty-staging/AsyncFile.git
+[submodule "community-build/community-projects/Equal"]
+	path = community-build/community-projects/Equal
+	url = https://github.com/dotty-staging/Equal.git
+[submodule "community-build/community-projects/FingerTree"]
+	path = community-build/community-projects/FingerTree
+	url = https://github.com/dotty-staging/FingerTree.git
+[submodule "community-build/community-projects/Log"]
+	path = community-build/community-projects/Log
+	url = https://github.com/dotty-staging/Log.git
+[submodule "community-build/community-projects/Model"]
+	path = community-build/community-projects/Model
+	url = https://github.com/dotty-staging/Model.git
+[submodule "community-build/community-projects/Numbers"]
+	path = community-build/community-projects/Numbers
+	url = https://github.com/dotty-staging/Numbers.git
+[submodule "community-build/community-projects/Serial"]
+	path = community-build/community-projects/Serial
+	url = https://github.com/dotty-staging/Serial.git
+[submodule "community-build/community-projects/Span"]
+	path = community-build/community-projects/Span
+	url = https://github.com/dotty-staging/Span.git
+[submodule "community-build/community-projects/Lucre"]
+	path = community-build/community-projects/Lucre
+	url = https://github.com/dotty-staging/Lucre.git
+[submodule "community-build/community-projects/scala-stm"]
+	path = community-build/community-projects/scala-stm
+	url = https://github.com/dotty-staging/scala-stm.git
+[submodule "community-build/community-projects/scalatestplus-junit"]
+	path = community-build/community-projects/scalatestplus-junit
+	url = https://github.com/dotty-staging/scalatestplus-junit.git
diff --git a/community-build/community-projects/AsyncFile b/community-build/community-projects/AsyncFile
@@ -0,0 +1 @@
+Subproject commit fe33563b74e1e1df333e86bb04b728feb199eecd
diff --git a/community-build/community-projects/Equal b/community-build/community-projects/Equal
@@ -0,0 +1 @@
+Subproject commit f42b05026591e146d9b4cfdd6418383321a76cd4
diff --git a/community-build/community-projects/FingerTree b/community-build/community-projects/FingerTree
@@ -0,0 +1 @@
+Subproject commit 42b27e008e6f8095a928cbbef8efb4c644e46289
diff --git a/community-build/community-projects/Log b/community-build/community-projects/Log
@@ -0,0 +1 @@
+Subproject commit 02b59d0df788fdbdf602ba7fdd40c63c7aca885f
diff --git a/community-build/community-projects/Lucre b/community-build/community-projects/Lucre
@@ -0,0 +1 @@
+Subproject commit b569546707c55dded1072cd544afd0e01b56d25c
diff --git a/community-build/community-projects/Model b/community-build/community-projects/Model
@@ -0,0 +1 @@
+Subproject commit 0704fa394b39fc80c6292e67561c0884f50fabf7
diff --git a/community-build/community-projects/Numbers b/community-build/community-projects/Numbers
@@ -0,0 +1 @@
+Subproject commit 971a6755c677245678fd97652f9931910b797218
diff --git a/community-build/community-projects/Serial b/community-build/community-projects/Serial
@@ -0,0 +1 @@
+Subproject commit 0a3a39772f6df3fac495f203c8d582d29c72124b
diff --git a/community-build/community-projects/Span b/community-build/community-projects/Span
@@ -0,0 +1 @@
+Subproject commit 8674590a836cb227284eef08a307dbbdb9140f15
diff --git a/community-build/community-projects/scala-stm b/community-build/community-projects/scala-stm
@@ -0,0 +1 @@
+Subproject commit e25579f586a9d92242201d07faff5e586de1af69
diff --git a/community-build/community-projects/scalatestplus-junit b/community-build/community-projects/scalatestplus-junit
@@ -0,0 +1 @@
+Subproject commit 3857010185d95c3b5fece4800759436ceebdc0e7
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -291,6 +291,13 @@ object projects:
     dependencies = List(scalatest, scalacheck)
   )
 
+  lazy val scalatestplusJunit = SbtCommunityProject(
+    project           = "scalatestplus-junit",
+    sbtTestCommand    = "scalatestplus-junit/test",
+    sbtPublishCommand = "scalatestplus-junit/publishLocal",
+    dependencies      = List(scalatest)
+  )
+
   lazy val scalaXml = SbtCommunityProject(
     project       = "scala-xml",
     sbtTestCommand   = "xml/test",
@@ -533,6 +540,78 @@ object projects:
     dependencies = List(cats, catsMtl)
   )
 
+  // 'Sciss/Lucre' with its dependencies:
+
+  lazy val scissEqual = SbtCommunityProject(
+    project           = "Equal",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scalatest),
+  )
+
+  lazy val scissFingerTree = SbtCommunityProject(
+    project           = "FingerTree",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scalatest),
+  )
+
+  lazy val scissLog = SbtCommunityProject(
+    project           = "Log",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+  )
+
+  lazy val scissModel = SbtCommunityProject(
+    project           = "Model",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scalatest),
+  )
+
+  lazy val scissNumbers = SbtCommunityProject(
+    project           = "Numbers",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scalatest),
+  )
+
+  lazy val scissSerial = SbtCommunityProject(
+    project           = "Serial",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scalatest),
+  )
+
+  lazy val scissAsyncFile = SbtCommunityProject(
+    project           = "AsyncFile",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scissLog, scalatest),
+  )
+
+  lazy val scissSpan = SbtCommunityProject(
+    project           = "Span",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scissSerial, scalatest),
+  )
+
+  lazy val scalaSTM = SbtCommunityProject(
+    project           = "scala-stm",
+    sbtTestCommand    = "rootJVM/test",
+    sbtPublishCommand = "rootJVM/publishLocal",
+    dependencies      = List(scalatestplusJunit),
+  )
+
+  lazy val scissLucre = SbtCommunityProject(
+    project           = "Lucre",
+    sbtTestCommand    = "adjunctJVM/test;baseJVM/test;confluentJVM/test;coreJVM/test;dataJVM/test;expr0JVM/test;expr1JVM/test;exprJVM/test;geomJVM/test;lucre-bdb/test;testsJVM/test",
+    extraSbtArgs      = List("-Dde.sciss.lucre.ShortTests=true"),
+    sbtPublishCommand = "adjunctJVM/publishLocal;baseJVM/publishLocal;confluentJVM/publishLocal;coreJVM/publishLocal;dataJVM/publishLocal;expr0JVM/publishLocal;expr1JVM/publishLocal;exprJVM/publishLocal;geomJVM/publishLocal;lucre-bdb/publishLocal",
+    dependencies      = List(scalaSTM, scissAsyncFile, scissEqual, scissFingerTree, scissLog, scissModel, scissNumbers, scissSerial, scissSpan, scalatest),
+  )
+
 end projects
 
 def allProjects = projects.reflectedFields.of[CommunityProject].sortBy(_.project)
diff --git a/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala b/community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala
@@ -102,6 +102,19 @@ class CommunityBuildTestA extends CommunityBuildTest:
   @Test def upickle = projects.upickle.run()
   @Test def utest = projects.utest.run()
   @Test def zio = projects.zio.run()
+
+  // 'scala-stm' and 'Sciss/Lucre':
+  // @Test def scissEqual      = projects.scissEqual     .run()
+  // @Test def scissFingerTree = projects.scissFingerTree.run()
+  // @Test def scissLog        = projects.scissLog       .run()
+  // @Test def scissModel      = projects.scissModel     .run()
+  // @Test def scissNumbers    = projects.scissNumbers   .run()
+  // @Test def scissSerial     = projects.scissSerial    .run()
+  // @Test def scissAsyncFile  = projects.scissAsyncFile .run()
+  // @Test def scissSpan       = projects.scissSpan      .run()
+  @Test def scalaSTM        = projects.scalaSTM       .run()
+  @Test def scissLucre      = projects.scissLucre     .run()
+
 end CommunityBuildTestA
 
 @Category(Array(classOf[TestCategory]))
@@ -134,6 +147,7 @@ class CommunityBuildTestB extends CommunityBuildTest:
   @Test def simulacrumScalafixAnnotations = projects.simulacrumScalafixAnnotations.run()
   @Test def verify = projects.verify.run()
   @Test def xmlInterpolator = projects.xmlInterpolator.run()
+
 end CommunityBuildTestB
 
 class TestCategory
