Merge branch 'master' into fix-oneof-import-conflict-test

Author: i-am-the-slime

.direnv/bin/nix-direnv-reload

@@ -137,7 +137,7 @@ jobs:
 
   gh_release:
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [native, scalapbc]
     steps:
       - uses: actions/checkout@v4

.direnv/nix-profile-25.05-vj980b72z6zb0yg6

@@ -1,6 +1,7 @@
 .vscode/
 .bloop/
 .metals/
+.direnv
 project/.bloop/
 metals.sbt
 

.direnv/nix-profile-25.05-vj980b72z6zb0yg6.rc

@@ -3,7 +3,7 @@ import BuildHelper._
 import Dependencies._
 import sbtassembly.AssemblyPlugin.defaultUniversalScript
 
-val protobufCompilerVersion = "4.28.3"
+val protobufCompilerVersion = "4.32.0"
 
 val MimaPreviousVersion = "0.11.0"
 
@@ -71,7 +71,10 @@ lazy val runtime = (projectMatrix in file("scalapb-runtime"))
           Seq(
             "-Wconf:msg=[Uu]nused&origin=scala[.]collection[.]compat._:s",
             "-Wconf:cat=deprecation&msg=.*[Jj]avaGenerateEqualsAndHash.*deprecated.*:s",
-            "-Wconf:cat=deprecation&msg=.*[dD]eprecatedLegacyJsonFieldConflicts:s"
+            "-Wconf:cat=deprecation&msg=.*[dD]eprecatedLegacyJsonFieldConflicts:s",
+            "-Wconf:cat=deprecation&msg=.*[eE]dition.*deprecated.*:s",
+            "-Wconf:cat=deprecation&msg=.*[wW]eak.*:s",
+            "-Wconf:cat=deprecation&msg=.*[sS]yntax.*:s"
           )
         case _ => Seq.empty // Scala 2.12 or other (e.g. pre-2.13)
       }

.github/workflows/release.yml

@@ -203,6 +203,9 @@ class DescriptorImplicits private[compiler] (
 
     def isSealedOneofType: Boolean = fd.isMessage && fd.getMessageType.isSealedOneofType
 
+    // isOptional is deprecated in protobuf-java.
+    def isSingularOptional: Boolean = !fd.isRequired() && !fd.isRepeated()
+
     def scalaName: String =
       if (fieldOptions.getScalaName.nonEmpty) fieldOptions.getScalaName
       else
@@ -261,7 +264,7 @@ class DescriptorImplicits private[compiler] (
     // Is this field boxed inside an Option in Scala. Equivalent, does the Java API
     // support hasX methods for this field.
     def supportsPresence: Boolean =
-      fd.hasPresence() && fd.isOptional() && !fd.isInOneof && !noBox && !fd.isSealedOneofType
+      fd.hasPresence() && fd.isSingularOptional && !fd.isInOneof && !noBox && !fd.isSealedOneofType
 
     // Is the Scala representation of this field a singular type.
     def isSingular =

.gitignore

@@ -213,7 +213,7 @@ private[compiler] object FieldTransformations {
     }
 
     val knownFields = m.getAllFields().asScala.map { case (field, value) =>
-      if (field.getType() == Type.MESSAGE && !field.isOptional()) {
+      if (field.getType() == Type.MESSAGE && (field.isRepeated() || field.isRequired())) {
         throw new GeneratorException(
           s"${context.currentFile}: matching is supported only for scalar types and optional message fields."
         )
@@ -230,7 +230,7 @@ private[compiler] object FieldTransformations {
       m: Message,
       ext: FieldDescriptor
   ): Message = {
-    if (ext.getType != Type.MESSAGE || !ext.isOptional) {
+    if (ext.getType != Type.MESSAGE || ext.isRepeated() || ext.isRequired()) {
       throw new GeneratorException(
         s"Unknown extension fields must be optional message types: ${ext}"
       )

build.sbt

@@ -145,7 +145,7 @@ class ProtoValidation(implicits: DescriptorImplicits) {
       throw new GeneratorException(
         s"${fd.getFullName}: Field ${fd.getName} is a map and has type specified. Use key_type or value_type instead."
       )
-    if (!fd.isOptional && fd.fieldOptions.hasNoBox)
+    if (!fd.isSingularOptional && fd.fieldOptions.hasNoBox)
       throw new GeneratorException(
         s"${fd.getFullName}: Field ${fd.getName} has no_box set but is not an optional field."
       )

compiler-plugin/src/main/scala/scalapb/compiler/DescriptorImplicits.scala

@@ -400,7 +400,7 @@ class ProtobufGenerator(
             )
           if (f.supportsPresence || f.isInOneof)
             fp.add(s"case ${f.getNumber} => $e.orNull")
-          else if (f.isOptional && !f.noBoxRequired) {
+          else if (f.isSingularOptional && !f.noBoxRequired) {
             // In proto3, drop default value
             fp.add(s"case ${f.getNumber} => {")
               .indent
@@ -554,7 +554,7 @@ class ProtobufGenerator(
            |  }
            |};""".stripMargin
       )
-    } else if (field.isOptional) {
+    } else if (field.isSingularOptional) {
       fp.add(
         s"""if ($fieldNameSymbol.isDefined) {
            |  val __value = ${toBaseType(field)(fieldNameSymbol + ".get")}
@@ -754,7 +754,7 @@ class ProtobufGenerator(
         val typeName = field.scalaTypeName
         val ctorDefaultValue: Option[String] =
           if (field.noDefaultValueInConstructor) None
-          else if (field.isOptional && field.supportsPresence) Some(C.None)
+          else if (field.isSingularOptional && field.supportsPresence) Some(C.None)
           else if (field.isSingular && !field.isRequired && !field.noBoxRequired)
             Some(defaultValueForGet(field).toString)
           else if (field.isRepeated && !field.collection.nonEmptyType)