.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.7.3
+0025d5c30e455eca8a1ffbf8304e69214f328cab

.github/workflows/ci.yml

@@ -7,11 +7,11 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: ["ubuntu-20.04", "macos-latest", "windows-latest"]
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: olafurpg/setup-scala@v10
+    - uses: actions/checkout@v4
+    - uses: olafurpg/setup-scala@v14
       with:
         java-version: 8
     - name: Mount caches
@@ -22,10 +22,6 @@ jobs:
           ~/.ivy2/cache
           ~/.cache/coursier
         key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}
-    - name: Install tools for Native
-      if: ${{runner.os != 'Windows' }}
-      run: |
-        ./ci_setup.sh
     - name: Remove native tests (Windows only)
       if: ${{ runner.os == 'Windows' }}
       run: |
@@ -46,12 +42,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-20.04", "macos-latest", "windows-latest"]
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
         scripted-sbt: ["1.2.8", "1.3.13", "project"]
 
     steps:
-    - uses: actions/checkout@v1
-    - uses: olafurpg/setup-scala@v10
+    - uses: actions/checkout@v4
+    - uses: olafurpg/setup-scala@v14
       with:
         java-version: 11
     - name: Mount caches
@@ -62,10 +58,6 @@ jobs:
           ~/.ivy2/cache
           ~/.cache/coursier
         key: ${{ runner.os }}-sbt-${{ hashFiles('**/*.sbt') }}
-    - name: Install tools for Native
-      if: ${{runner.os != 'Windows' }}
-      run: |
-        ./ci_setup.sh
     - name: Compile and run scripted tests with older version
       if: ${{ matrix.scripted-sbt != 'project' }}
       env:

.github/workflows/release.yml

@@ -7,9 +7,9 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
     - name: Scala caches
       uses: actions/cache@v2
       with:

.mergify.yml

@@ -1,3 +1,8 @@
+queue_rules:
+  - name: default
+    conditions:
+      - check-success=ci-passed
+
 pull_request_rules:
   - name: assign and label scala-steward's PRs
     conditions:
@@ -10,8 +15,8 @@ pull_request_rules:
   - name: merge scala-steward's PRs
     conditions:
       - author=scala-steward
-      - status-success=ci-passed
+      - check-success=ci-passed
     actions:
-      merge:
+      queue:
         method: squash
-        strict: true
+        name: default

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.3.1
+version=3.7.17
 style = defaultWithAlign
 maxColumn = 100
 assumeStandardLibraryStripMargin = true

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.7]
+* Update default protoc to 3.21.7
+* For nix-os: support executing statically linked protoc (for versions >=3.23.0)
+
 ## [1.0.6]
 * Update default protoc to 3.19.2.
 

README.md

@@ -82,6 +82,8 @@ libraryDependencies ++= Seq(
 )
 ```
 
+**Step 3: Put some protos in src/main/protobuf and compile**
+
 ## Download plugins that are available on maven repository
 
 To download an artifact and use it as a code generator plugin:
@@ -121,8 +123,6 @@ If you need to pass parameters to the plugin, it can be done as follows:
       (grpcWebGen, Seq("mode=grpcwebtext")) -> (Compile / sourceManaged).value / "js"
     )
 
-**Step 3: Put some protos in src/main/protobuf and compile**
-
 Migration notes
 ---------------
 
@@ -160,7 +160,7 @@ you probably want `Compile`)
 Example settings:
 ```scala
 // Force the version for the protoc binary
-PB.protocVersion := "3.19.2"
+PB.protocVersion := "3.21.7"
 
 // Additional directories to search for imports:
 Compile / PB.includePaths ++= Seq(file("/some/other/path"))

build.sbt

@@ -4,14 +4,14 @@ description := "SBT plugin for generating code from Protocol Buffer using protoc
 
 scalacOptions := Seq("-deprecation", "-unchecked", "-Xlint", "-Yno-adapted-args")
 
-scalacOptions += "-target:jvm-1.8"
+scalacOptions += "-release:8"
 
-scalaVersion := "2.12.15"
+scalaVersion := "2.12.17"
 
 addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.1")
 
 libraryDependencies ++= Seq(
-  "com.thesamet.scalapb" %% "protoc-bridge" % "0.9.5"
+  "com.thesamet.scalapb" %% "protoc-bridge" % "0.9.7"
 )
 
 enablePlugins(SbtPlugin)

examples/google-apis-external-jar/build.sbt

@@ -2,7 +2,7 @@ import scalapb.compiler.Version.scalapbVersion
 
 val GrpcProtosArtifact = "com.google.api.grpc" % "grpc-google-common-protos" % "1.17.0"
 
-scalaVersion := "2.12.15"
+scalaVersion := "2.12.16"
 
 // This sub-project will hold the compiled Scala classes from the external
 // jar.

examples/scalajs-multiproject/project/plugins.sbt

@@ -1,7 +1,7 @@
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.0-RC2")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
 
-libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.10.8"
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.10"
 
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.2.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.1")

examples/scalapb-crossproject/build.sbt

@@ -1,10 +1,13 @@
 import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}
 import scalapb.compiler.Version.scalapbVersion
 
+val Scala212 = "2.12.18"
+val Scala213 = "2.13.12"
+
 val sharedSettings = Seq(
   name                      := "example",
   version                   := "0.1.0",
-  scalaVersion              := "2.11.12",
+  scalaVersion              := "2.13.12",
   Compile / PB.protoSources := Seq((ThisBuild / baseDirectory).value / "src" / "main" / "protobuf"),
   Compile / PB.targets := Seq(
     scalapb.gen() -> (Compile / sourceManaged).value / "protos"
@@ -20,9 +23,9 @@ lazy val example = crossProject(JSPlatform, JVMPlatform, NativePlatform)
   .in(file("."))
   .enablePlugins(BuildInfoPlugin)
   .settings(sharedSettings)
-  .jsSettings(crossScalaVersions := Seq("2.12.15", "2.13.4"))
-  .jvmSettings(crossScalaVersions := Seq("2.12.15", "2.13.4"))
-  .nativeSettings(crossScalaVersions := Seq("2.11.12"))
+  .jsSettings(crossScalaVersions := Seq(Scala212, Scala213))
+  .jvmSettings(crossScalaVersions := Seq(Scala212, Scala213))
+  .nativeSettings(crossScalaVersions := Seq("2.12.18", "2.13.12"))
 
 lazy val exampleJS     = example.js
 lazy val exampleJVM    = example.jvm

examples/scalapb-crossproject/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.12
+sbt.version=1.9.8

examples/scalapb-crossproject/project/plugins.sbt

@@ -1,10 +1,10 @@
-addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "0.6.0")
-addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "0.6.0")
-addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "0.6.23")
-addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.3.7")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"      % "1.2.0")
+addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"                   % "1.13.2")
+addSbtPlugin("org.scala-native"   % "sbt-scala-native"              % "0.4.15")
 
 addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
 
-addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.25")
+addSbtPlugin("com.thesamet" % "sbt-protoc" % "1.0.6")
 
-libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.8.4"
+libraryDependencies += "com.thesamet.scalapb" %% "compilerplugin" % "0.11.13"

examples/scalapb-dotty/src/main/scala/Main.scala

@@ -1,7 +1,7 @@
 import myproto.test.TestMessage
 
 @main def hello() = {
-  val x = TestMessage(foo=Some(3))
+  val x = TestMessage(foo = Some(3))
   println("Welcome!")
   println(x)
   println(x.serializedSize)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.1
+sbt.version=1.9.8

project/plugins.sbt

@@ -1,5 +1,5 @@
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")

src/main/scala/sbtprotoc/ProtocPlugin.scala

@@ -173,7 +173,7 @@ object ProtocPlugin extends AutoPlugin {
 
   private[this] def protobufGlobalSettings: Seq[Def.Setting[_]] =
     Seq(
-      PB.protocVersion            := "3.19.2",
+      PB.protocVersion            := "3.21.7",
       PB.deleteTargetDirectory    := true,
       PB.cacheArtifactResolution  := true,
       PB.cacheClassLoaders        := true,
@@ -331,7 +331,7 @@ object ProtocPlugin extends AutoPlugin {
         .value,
       PB.runProtoc := Def.taskDyn {
         val s = streams.value
-        if (PB.targets.value == Nil) {
+        if (PB.targets.value.isEmpty || schemasTask(PB.generate).value.isEmpty) {
           Def.task {
             // return a dummy instance that should never be evaluated
             protocbridge.ProtocRunner.fromFunction[Int] { (_, _) =>
@@ -542,31 +542,36 @@ object ProtocPlugin extends AutoPlugin {
       (FilesInfo[ModifiedFileInfo], URLClassLoader)
     ]
 
-  private[this] def sourceGeneratorTask(key: TaskKey[Seq[File]]): Def.Initialize[Task[Seq[File]]] =
+  private[this] def schemasTask(key: TaskKey[_]): Def.Initialize[Task[Set[File]]] = Def.task {
+    val toInclude        = (key / includeFilter).value
+    val toExclude        = (key / excludeFilter).value
+    val processManifests = (key / PB.manifestProcessing).value
+    val dependencies     = (key / PB.unpackDependencies).value
+    val sources          = (key / PB.protoSources).value
+
+    sources
+      .toSet[File]
+      .flatMap(srcDir =>
+        (srcDir ** (toInclude -- toExclude)).get
+          .map(_.getAbsoluteFile)
+      ) match {
+      case protos if protos.nonEmpty =>
+        if (!processManifests) protos
+        else {
+          val optionProtos = dependencies.mappedFiles.values.flatMap(_.optionProtos)
+          protos ++ optionProtos
+        }
+      case _ => Set.empty[File]
+    }
+  }
+
+  private[this] def sourceGeneratorTask(key: TaskKey[_]): Def.Initialize[Task[Seq[File]]] =
     Def.task {
-      val log       = (key / streams).value.log
-      val resolver  = (key / PB.artifactResolver).value
-      val cache     = (key / PB.cacheClassLoaders).value && (key / PB.cacheArtifactResolution).value
-      val targets   = (key / PB.targets).value
-      val toInclude = (key / includeFilter).value
-      val toExclude = (key / excludeFilter).value
-      val schemas = (key / PB.protoSources).value
-        .toSet[File]
-        .flatMap(srcDir =>
-          (srcDir ** (toInclude -- toExclude)).get
-            .map(_.getAbsoluteFile)
-        ) match {
-        case protos if protos.nonEmpty =>
-          val processManifests = (key / PB.manifestProcessing).value
-          val dependencies     = (key / PB.unpackDependencies).value
-
-          if (!processManifests) protos
-          else {
-            val optionProtos = dependencies.mappedFiles.values.flatMap(_.optionProtos)
-            protos ++ optionProtos
-          }
-        case _ => Set.empty[File]
-      }
+      val log      = (key / streams).value.log
+      val resolver = (key / PB.artifactResolver).value
+      val cache    = (key / PB.cacheClassLoaders).value && (key / PB.cacheArtifactResolution).value
+      val targets  = (key / PB.targets).value
+      val schemas  = schemasTask(key).value
 
       // Include Scala binary version like "_2.11" for cross building.
       val cacheFile =

src/sbt-test/settings/include-protos-in-jar/build.sbt

@@ -1,4 +1,4 @@
-val protobufVersion = "3.11.4"
+val protobufVersion = "3.21.7"
 
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % protobufVersion % "protobuf"
 

src/sbt-test/settings/itconfig/build.sbt

@@ -1,4 +1,4 @@
-val protobufVersion = "3.11.4"
+val protobufVersion = "3.21.7"
 
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % protobufVersion % "protobuf"
 

src/sbt-test/settings/lazy-protoc-resolution/b/src/main/protobuf/b.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package sub.b;
+
+message msg1 {
+  int32 thing = 1;
+}

src/sbt-test/settings/lazy-protoc-resolution/build.sbt

@@ -1 +1,20 @@
-PB.protocDependency := "non" % "existing" % "artifact"
+// PB.targets, no proto
+lazy val a = project
+  .settings(
+    PB.protocVersion     := "1.2.3+non-existing-a",
+    Compile / PB.targets := Seq(PB.gens.java -> (Compile / sourceManaged).value)
+  )
+
+// no PB.targets, one proto
+lazy val b = project
+  .settings(
+    PB.protocVersion := "1.2.3+non-existing-b"
+  )
+
+// PB.targets, one ignored proto
+lazy val c = project
+  .settings(
+    PB.protocVersion            := "1.2.3+non-existing-c",
+    Compile / PB.targets        := Seq(PB.gens.java -> (Compile / sourceManaged).value),
+    PB.generate / excludeFilter := "ignored.proto"
+  )

src/sbt-test/settings/lazy-protoc-resolution/c/src/main/protobuf/ignored.proto

@@ -0,0 +1,5 @@
+syntax = "proto3";
+
+message ignored {
+  int32 thing = 1;
+}

src/sbt-test/settings/non-jvm/build.sbt

@@ -1,6 +1,6 @@
 Compile / PB.targets := Seq(
   PB.gens.descriptorSet -> (Compile / resourceManaged).value / "newdirectory" / "descriptorset.pb",
-  PB.gens.js            -> (Compile / resourceManaged).value / "js",
+  PB.gens.ruby          -> (Compile / resourceManaged).value / "ruby",
   PB.gens.java          -> (Compile / sourceManaged).value
 )
 

src/sbt-test/settings/non-jvm/test

@@ -1,9 +1,9 @@
 > package
 $ exists target/scala-2.12/classes/newdirectory/descriptorset.pb
-$ exists target/scala-2.12/classes/js/test1.js
+$ exists target/scala-2.12/classes/ruby/test1_pb.rb
 $ exists target/scala-2.12/classes/test/Test1.class
 
 # make sure the cleanup before the call to protoc does not wipe anything else in the descriptorset directory
 $ touch target/scala-2.12/resource_managed/main/newdirectory/dontdeleteme
 > protocGenerate
-$ exists target/scala-2.12/resource_managed/main/newdirectory/dontdeleteme
+$ exists target/scala-2.12/resource_managed/main/newdirectory/dontdeleteme

src/sbt-test/settings/sandboxed/project/plugins.sbt

@@ -9,5 +9,5 @@
 }
 
 libraryDependencies ++= Seq(
-  "com.thesamet.scalapb" %% "protoc-bridge" % "0.8.4"
+  "com.thesamet.scalapb" %% "protoc-bridge" % "0.9.6"
 )

src/sbt-test/settings/testconfig/build.sbt

@@ -1,4 +1,4 @@
-val protobufVersion = "3.11.4"
+val protobufVersion = "3.21.7"
 
 libraryDependencies += "com.google.protobuf" % "protobuf-java" % protobufVersion % "protobuf"