Skip to content

Commit

Permalink
[internal] fix code path in generate_all_lockfiles_helper (#14379)
Browse files Browse the repository at this point in the history
#14351 removed Java/Scala codegen backends temporarilly to ensure they were not released with 2.10. That PR was apparently incomplete. Removal of the `DefaultTool.jvm` entries for those backends is also necessary since those entries refer to the names of the removed backends.
  • Loading branch information
asherf committed Feb 7, 2022
1 parent c2f6404 commit 0ee3b04
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions build-support/bin/_generate_all_lockfiles_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
import sys
from dataclasses import dataclass

from pants.backend.codegen.avro.java.subsystem import AvroSubsystem
from pants.backend.codegen.protobuf.python.python_protobuf_subsystem import PythonProtobufMypyPlugin
from pants.backend.codegen.protobuf.scala.subsystem import ScalaPBSubsystem
from pants.backend.codegen.thrift.scrooge.subsystem import ScroogeSubsystem
from pants.backend.docker.subsystems.dockerfile_parser import DockerfileParser
from pants.backend.java.lint.google_java_format.subsystem import GoogleJavaFormatSubsystem
from pants.backend.java.subsystems.junit import JUnit
Expand Down Expand Up @@ -115,12 +112,7 @@ def jvm(cls, tool: type[JvmToolBase], *, backend: str | None = None) -> DefaultT
DefaultTool.jvm(JUnit),
DefaultTool.jvm(GoogleJavaFormatSubsystem),
DefaultTool.jvm(ScalafmtSubsystem),
DefaultTool.jvm(ScalaPBSubsystem, backend="pants.backend.experimental.codegen.protobuf.scala"),
DefaultTool.jvm(Scalatest),
DefaultTool.jvm(
ScroogeSubsystem, backend="pants.backend.experimental.codegen.thrift.scrooge.scala"
),
DefaultTool.jvm(AvroSubsystem, backend="pants.backend.experimental.codegen.avro.java"),
DefaultTool(
"scalac-plugins",
(f"--scalac-plugins-global-lockfile={Scalac.default_plugins_lockfile_path}",),
Expand Down

0 comments on commit 0ee3b04

Please sign in to comment.