Merge pull request #6 from whisklabs/update

Update

Author: fido-node

.git-blame-ignore-revs

@@ -3,3 +3,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.8.0
 00d482c75c16b0791a717e6374de4adf225f8af1
+
+# Scala Steward: Reformat with scalafmt 3.8.6
+9556ab3724f06bc35adc5f6a1cc4d21043fb3525

.github/workflows/ci.yml

@@ -41,6 +41,8 @@ jobs:
           java-version: "21"
           distribution: 'temurin'
 
+      - uses: sbt/setup-sbt@v1
+
       - name: restore cache
         uses: ./.github/actions/scala_restore_cache
         with:

.scalafmt.conf

@@ -1,4 +1,4 @@
-version=3.8.3
+version=3.9.2
 style = defaultWithAlign
 maxColumn = 100
 assumeStandardLibraryStripMargin = true

README.md

@@ -1,7 +1,5 @@
 sbt-protoc
 ==========
-[![CI](https://github.com/thesamet/sbt-protoc/workflows/CI/badge.svg)](https://github.com/thesamet/sbt-protoc/actions?query=workflow%3ACI)
-
 This plugin uses protoc to generate code from proto files. This SBT plugin is
 meant to supersede
 [sbt-protobuf](https://github.com/sbt/sbt-protobuf/) and

examples/scalapb-crossproject/project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.5
+sbt.version=1.10.7

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.5
+sbt.version=1.10.7

project/plugins.sbt

@@ -1,7 +1,7 @@
 libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")
 
 credentials += Credentials(Path.userHome / ".m2" / ".credentials")
 resolvers += "internal.repo.read" at "https://nexus.whisk-dev.com/repository/whisk-maven-group/"
-addSbtPlugin("com.whisk" % "whisk-sbt-plugin" % "2024.10.29-2357")
+addSbtPlugin("com.whisk" % "whisk-sbt-plugin" % "2025.04.09-3153")

src/main/scala/sbtprotoc/ProtocPlugin.scala

@@ -292,7 +292,7 @@ object ProtocPlugin extends AutoPlugin {
             s"""PB.protocVersion must contain a dot-separated version number. For example: "3.13.0". Got: '${PB.protocVersion.value}'"""
           )
         }
-        ("com.google.protobuf" % "protoc" % version) asProtocBinary (),
+        ("com.google.protobuf" % "protoc" % version) asProtocBinary ()
       },
       PB.protocExecutable := {
         scala.concurrent.Await.result(
@@ -465,7 +465,7 @@ object ProtocPlugin extends AutoPlugin {
 
       targets.flatMap {
         case Target(DescriptorSetGenerator(), outputFile, _) => Seq(outputFile)
-        case Target(_, outputDirectory, _)                   => outputDirectory.allPaths.get
+        case Target(_, outputDirectory, _)                   => outputDirectory.allPaths.get()
       }.toSet
     } else if (schemas.nonEmpty && targets.isEmpty) {
       log.info("Protobufs files found, but PB.targets is empty.")
@@ -552,7 +552,8 @@ object ProtocPlugin extends AutoPlugin {
     sources
       .toSet[File]
       .flatMap(srcDir =>
-        (srcDir ** (toInclude -- toExclude)).get
+        (srcDir ** (toInclude -- toExclude))
+          .get()
           .map(_.getAbsoluteFile)
       ) match {
       case protos if protos.nonEmpty =>
@@ -622,8 +623,7 @@ object ProtocPlugin extends AutoPlugin {
               { (_, prevValue) =>
                 def stampClasspath(files: Seq[File]) =
                   // artifact paths can be JARs or directories, so a recursive stamp is needed
-                  FileInfo.hash(files.toSet[File].allPaths.get.toSet)
-
+                  FileInfo.hash(files.toSet[File].allPaths.get().toSet)
                 if (prevValue == null) {
                   // first time this classpath is requested since the start of sbt
                   val resolved = resolver(artifact)
@@ -711,7 +711,7 @@ object ProtocPlugin extends AutoPlugin {
         val sandboxedArtifactsStamps =
           stampedClassLoadersByArtifact.values.map(_._1).toSeq
         val inputStamp =
-          FileInfo.hash(schemas ++ arguments.includePaths.allPaths.get)
+          FileInfo.hash(schemas ++ arguments.includePaths.allPaths.get())
         cachedCompile((arguments, sandboxedArtifactsStamps :+ inputStamp)).toSeq
       }
     }