Merge branch 'master' into added-monocle

Author: dotbg

.github/workflows/ci.yaml

@@ -283,7 +283,7 @@ jobs:
         run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
 
       - name: Test
-        run: ./project/scripts/sbt sbt-dotty/scripted
+        run: ./project/scripts/sbt "sbt-dotty/scripted; sbt-community-build/scripted"
 
   test_java8:
     runs-on: [self-hosted, Linux]

.gitignore

@@ -84,6 +84,7 @@ vscode-dotty/.vscode-test
 community-build/scala3-bootstrapped.version
 community-build/sbt-dotty-sbt
 community-build/sbt-scalajs-sbt
+community-build/dotty-community-build-deps
 
 # Vulpix output files
 *.check.out

.gitmodules

@@ -187,3 +187,6 @@
 [submodule "community-build/community-projects/Monocle"]
 	path = community-build/community-projects/Monocle
 	url = https://github.com/optics-dev/Monocle.git
+[submodule "community-build/community-projects/protoquill"]
+	path = community-build/community-projects/protoquill
+	url = https://github.com/dotty-staging/protoquill.git

build.sbt

@@ -26,6 +26,7 @@ val `scaladoc-js` = Build.`scaladoc-js`
 val `scala3-bench-run` = Build.`scala3-bench-run`
 val dist = Build.dist
 val `community-build` = Build.`community-build`
+val `sbt-community-build` = Build.`sbt-community-build`
 
 val sjsSandbox = Build.sjsSandbox
 val sjsJUnitTests = Build.sjsJUnitTests

community-build/community-projects/AsyncFile

@@ -39,26 +39,6 @@ def exec(projectDir: Path, binary: String, arguments: String*): Int =
   exitCode
 
 
-/** Versions of published projects, needs to be updated when a project in the build is updated.
- *
- *  TODO: instead of harcoding these numbers, we could get them from the
- *  projects themselves. This likely requires injecting a custom task in the
- *  projects to output the version number to a file.
- */
-object Versions:
-  val cats = "2.3.1-SNAPSHOT"
-  val catsMtl = "1.1+DOTTY-SNAPSHOT"
-  val coop = "1.0+DOTTY-SNAPSHOT"
-  val discipline = "1.1.3-SNAPSHOT"
-  val disciplineMunit = "1.0.3+DOTTY-SNAPSHOT"
-  val disciplineSpecs2 = "1.1.3-SNAPSHOT"
-  val izumiReflect = "1.0.0-SNAPSHOT"
-  val scalacheck = "1.15.2-SNAPSHOT"
-  val scalatest = "3.2.3"
-  val munit = "0.7.19+DOTTY-SNAPSHOT"
-  val scodecBits = "1.1+DOTTY-SNAPSHOT"
-  val simulacrumScalafix = "0.5.1-SNAPSHOT"
-
 sealed trait CommunityProject:
   private var published = false
 
@@ -122,58 +102,17 @@ final case class SbtCommunityProject(
     extraSbtArgs: List[String] = Nil,
     dependencies: List[CommunityProject] = Nil,
     sbtPublishCommand: String = null,
-    sbtDocCommand: String = null
+    sbtDocCommand: String = null,
+    scalacOptions: List[String] = List("-Ycheck-init")
   ) extends CommunityProject:
   override val binaryName: String = "sbt"
 
-  // A project in the community build can depend on an arbitrary version of
-  // another project in the build, so we force the use of the version that is
-  // actually in the community build.
-  val dependencyOverrides = List(
-    // dependencyOverrides doesn't seem to understand `%%%`
-    s""""org.scalacheck" %% "scalacheck" % "${Versions.scalacheck}"""",
-    s""""org.scalacheck" %% "scalacheck_sjs1" % "${Versions.scalacheck}"""",
-    s""""org.scalatest" %% "scalatest" % "${Versions.scalatest}"""",
-    s""""org.scalatest" %% "scalatest_sjs1" % "${Versions.scalatest}"""",
-    s""""org.scalameta" %% "munit" % "${Versions.munit}"""",
-    s""""org.scalameta" %% "munit_sjs1" % "${Versions.munit}"""",
-    s""""org.scalameta" %% "munit-scalacheck" % "${Versions.munit}"""",
-    s""""org.scalameta" %% "munit-scalacheck_sjs1" % "${Versions.munit}"""",
-    s""""org.scalameta" %% "junit-interface" % "${Versions.munit}"""",
-    s""""org.scodec" %% "scodec-bits" % "${Versions.scodecBits}"""",
-    s""""org.scodec" %% "scodec-bits_sjs1" % "${Versions.scodecBits}"""",
-    s""""org.typelevel" %% "discipline-core" % "${Versions.discipline}"""",
-    s""""org.typelevel" %% "discipline-core_sjs1" % "${Versions.discipline}"""",
-    s""""org.typelevel" %% "discipline-munit" % "${Versions.disciplineMunit}"""",
-    s""""org.typelevel" %% "discipline-munit_sjs1" % "${Versions.disciplineMunit}"""",
-    s""""org.typelevel" %% "discipline-specs2" % "${Versions.disciplineSpecs2}"""",
-    s""""org.typelevel" %% "discipline-specs2_sjs1" % "${Versions.disciplineSpecs2}"""",
-    s""""org.typelevel" %% "simulacrum-scalafix-annotations" % "${Versions.simulacrumScalafix}"""",
-    s""""org.typelevel" %% "simulacrum-scalafix-annotations_sjs1" % "${Versions.simulacrumScalafix}"""",
-    s""""org.typelevel" %% "cats-core" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-core_sjs1" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-free" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-free_sjs1" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-kernel" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-kernel_sjs1" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-kernel-laws" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-kernel-laws_sjs1" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-laws" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-laws_sjs1" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-testkit" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-testkit_sjs1" % "${Versions.cats}"""",
-    s""""org.typelevel" %% "cats-mtl" % "${Versions.catsMtl}"""",
-    s""""org.typelevel" %% "cats-mtl_sjs1" % "${Versions.catsMtl}"""",
-    s""""org.typelevel" %% "cats-mtl-laws" % "${Versions.catsMtl}"""",
-    s""""org.typelevel" %% "cats-mtl-laws_sjs1" % "${Versions.catsMtl}"""",
-    s""""org.typelevel" %% "coop" % "${Versions.coop}"""",
-    s""""org.typelevel" %% "coop_sjs1" % "${Versions.coop}"""",
-    s""""dev.zio" %% "izumi-reflect" % "${Versions.izumiReflect}"""",
-  )
+  private def scalacOptionsString: String =
+    scalacOptions.map("\"" + _ + "\"").mkString("List(", ",", ")")
 
   private val baseCommand =
     "clean; set logLevel in Global := Level.Error; set updateOptions in Global ~= (_.withLatestSnapshots(false)); "
-    ++ s"""set dependencyOverrides in ThisBuild ++= ${dependencyOverrides.mkString("Seq(", ", ", ")")}; """
+    ++ (if scalacOptions.isEmpty then "" else s"""set scalacOptions in Global ++= $scalacOptionsString;""")
     ++ s"++$compilerVersion!; "
 
   override val testCommand =
@@ -195,7 +134,8 @@ final case class SbtCommunityProject(
       case _ => Nil
     extraSbtArgs ++ sbtProps ++ List(
       "-sbt-version", "1.4.7",
-       "-Dsbt.supershell=false",
+      "-Dsbt.supershell=false",
+      s"-Ddotty.communitybuild.dir=$communitybuildDir",
       s"--addPluginSbtFile=$sbtPluginFilePath"
     )
 
@@ -384,7 +324,8 @@ object projects:
   lazy val shapeless = SbtCommunityProject(
     project       = "shapeless",
     sbtTestCommand   = "test",
-    sbtDocCommand = forceDoc("typeable", "deriving", "data")
+    sbtDocCommand = forceDoc("typeable", "deriving", "data"),
+    scalacOptions = Nil // disable -Ycheck-init, due to -Xfatal-warnings
   )
 
   lazy val xmlInterpolator = SbtCommunityProject(
@@ -419,6 +360,7 @@ object projects:
     project       = "sconfig",
     sbtTestCommand   = "sconfigJVM/test",
     sbtDocCommand = "sconfigJVM/doc",
+    dependencies = List(scalaCollectionCompat)
   )
 
   lazy val zio = SbtCommunityProject(
@@ -431,17 +373,15 @@ object projects:
   lazy val munit = SbtCommunityProject(
     project = "munit",
     sbtTestCommand  = "testsJVM/test;testsJS/test;",
-    // Hardcode the version to avoid having to deal with something set by sbt-dynver
-    sbtPublishCommand   = s"""set every version := "${Versions.munit}"; munitJVM/publishLocal; munitJS/publishLocal; munitScalacheckJVM/publishLocal; munitScalacheckJS/publishLocal; junit/publishLocal""",
+    sbtPublishCommand = "munitJVM/publishLocal; munitJS/publishLocal; munitScalacheckJVM/publishLocal; munitScalacheckJS/publishLocal; junit/publishLocal",
     sbtDocCommand   = "junit/doc; munitJVM/doc",
     dependencies = List(scalacheck)
   )
 
   lazy val scodecBits = SbtCommunityProject(
     project          = "scodec-bits",
     sbtTestCommand   = "coreJVM/test;coreJS/test",
-    // Hardcode the version to avoid having to deal with something set by sbt-git
-    sbtPublishCommand = s"""set every version := "${Versions.scodecBits}"; coreJVM/publishLocal;coreJS/publishLocal""",
+    sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
     sbtDocCommand   = "coreJVM/doc",
     dependencies = List(munit)
   )
@@ -517,6 +457,7 @@ object projects:
   lazy val scalaCollectionCompat = SbtCommunityProject(
     project        = "scala-collection-compat",
     sbtTestCommand = "compat30/test",
+    sbtPublishCommand = "compat30/publishLocal",
   )
 
   lazy val verify = SbtCommunityProject(
@@ -535,15 +476,16 @@ object projects:
   lazy val disciplineMunit = SbtCommunityProject(
     project = "discipline-munit",
     sbtTestCommand = "test",
-    sbtPublishCommand = s"""set every version := "${Versions.disciplineMunit}";coreJVM/publishLocal;coreJS/publishLocal""",
+    sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
     dependencies = List(discipline, munit)
   )
 
   lazy val disciplineSpecs2 = SbtCommunityProject(
     project = "discipline-specs2",
     sbtTestCommand = "test",
     sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
-    dependencies = List(discipline)
+    dependencies = List(discipline),
+    scalacOptions = Nil // disable -Ycheck-init
   )
 
   lazy val simulacrumScalafixAnnotations = SbtCommunityProject(
@@ -556,20 +498,21 @@ object projects:
     project = "cats",
     sbtTestCommand = "set scalaJSStage in Global := FastOptStage;buildJVM;validateAllJS",
     sbtPublishCommand = "catsJVM/publishLocal;catsJS/publishLocal",
-    dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations)
+    dependencies = List(discipline, disciplineMunit, scalacheck, simulacrumScalafixAnnotations),
+    scalacOptions = Nil  // disable -Ycheck-init, due to -Xfatal-warning
   )
 
   lazy val catsMtl = SbtCommunityProject(
     project = "cats-mtl",
     sbtTestCommand = "testsJVM/test;testsJS/test",
-    sbtPublishCommand = s"""set every version := "${Versions.catsMtl}";coreJVM/publishLocal;coreJS/publishLocal;lawsJVM/publishLocal;lawsJS/publishLocal""",
+    sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal;lawsJVM/publishLocal;lawsJS/publishLocal",
     dependencies = List(cats, disciplineMunit)
   )
 
   lazy val coop = SbtCommunityProject(
     project = "coop",
     sbtTestCommand = "test",
-    sbtPublishCommand = s"""set every version := "${Versions.coop}";coreJVM/publishLocal;coreJS/publishLocal""",
+    sbtPublishCommand = "coreJVM/publishLocal;coreJS/publishLocal",
     dependencies = List(cats, catsMtl)
   )
 
@@ -673,6 +616,14 @@ object projects:
     dependencies = List(cats, munit, discipline, disciplineMunit)
   )
 
+  lazy val protoquill = SbtCommunityProject(
+    project = "protoquill",
+    sbtTestCommand = "test",
+    sbtPublishCommand = "publishLocal",
+    dependencies = List(), // TODO add scalatest and pprint (see protoquill/build.sbt)
+    scalacOptions = List("-language:implicitConversions"), // disabled -Ycheck-init, due to bug in macro
+  )
+
 end projects
 
 def allProjects = List(
@@ -739,6 +690,7 @@ def allProjects = List(
   projects.perspective,
   projects.akka,
   projects.monocle,
+  projects.protoquill,
 )
 
 lazy val projectMap = allProjects.groupBy(_.project)

community-build/community-projects/Equal

@@ -110,6 +110,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
   @Test def upickle = projects.upickle.run()
   @Test def utest = projects.utest.run()
   @Test def zio = projects.zio.run()
+  @Test def protoquill = projects.protoquill.run()
 
   // 'scala-stm' and 'Sciss/Lucre':
   // @Test def scissEqual      = projects.scissEqual     .run()
@@ -121,7 +122,7 @@ class CommunityBuildTestA extends CommunityBuildTest:
   // @Test def scissAsyncFile  = projects.scissAsyncFile .run()
   // @Test def scissSpan       = projects.scissSpan      .run()
   @Test def scalaSTM        = projects.scalaSTM       .run()
-  // @Test def scissLucre      = projects.scissLucre     .run()
+  @Test def scissLucre      = projects.scissLucre     .run()
 
 end CommunityBuildTestA
 

community-build/community-projects/FingerTree

@@ -335,6 +335,14 @@ trait BCodeHelpers extends BCodeIdiomatic with BytecodeWriters {
         emitAssocs(av, assocs, BCodeHelpers.this)(this)
       }
 
+    /*
+     * must-single-thread
+     */
+    def emitParamNames(jmethod: asm.MethodVisitor, params: List[Symbol]) =
+      for param <- params do
+        var access = asm.Opcodes.ACC_FINAL
+        jmethod.visitParameter(param.name.mangledString, access)
+
     /*
      * must-single-thread
      */

community-build/community-projects/Log

@@ -615,7 +615,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
     /*
      * must-single-thread
      */
-    def initJMethod(flags: Int, paramAnnotations: List[List[Annotation]]): Unit = {
+    def initJMethod(flags: Int, params: List[Symbol]): Unit = {
 
       val jgensig = getGenericSignature(methSymbol, claszSymbol)
       val (excs, others) = methSymbol.annotations.partition(_.symbol eq defn.ThrowsAnnot)
@@ -637,7 +637,8 @@ trait BCodeSkelBuilder extends BCodeHelpers {
       // TODO param names: (m.params map (p => javaName(p.sym)))
 
       emitAnnotations(mnode, others)
-      emitParamAnnotations(mnode, paramAnnotations)
+      emitParamNames(mnode, params)
+      emitParamAnnotations(mnode, params.map(_.annotations))
 
     } // end of method initJMethod
 
@@ -749,7 +750,7 @@ trait BCodeSkelBuilder extends BCodeHelpers {
           .addFlagIf(isNative, asm.Opcodes.ACC_NATIVE) // native methods of objects are generated in mirror classes
 
       // TODO needed? for(ann <- m.symbol.annotations) { ann.symbol.initialize }
-      initJMethod(flags, params.map(p => p.symbol.annotations))
+      initJMethod(flags, params.map(_.symbol))
 
 
       if (!isAbstractMethod && !isNative) {

community-build/community-projects/Lucre

@@ -42,7 +42,6 @@ class Compiler {
     List(new semanticdb.ExtractSemanticDB) :: // Extract info into .semanticdb files
     List(new PostTyper) ::          // Additional checks and cleanups after type checking
     List(new sjs.PrepJSInterop) ::  // Additional checks and transformations for Scala.js (Scala.js only)
-    List(new Staging) ::            // Check PCP, heal quoted types and expand macros
     List(new sbt.ExtractAPI) ::     // Sends a representation of the API of classes to sbt via callbacks
     List(new SetRootTree) ::        // Set the `rootTreeOrProvider` on class symbols
     Nil
@@ -51,6 +50,7 @@ class Compiler {
   protected def picklerPhases: List[List[Phase]] =
     List(new Pickler) ::            // Generate TASTY info
     List(new Inlining) ::           // Inline and execute macros
+    List(new Staging) ::            // Check staging levels and heal staged types
     List(new PickleQuotes) ::       // Turn quoted trees into explicit run-time data structures
     Nil