Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix a bunch of missing JVM rules() dependencies #17861

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from pants.engine.unions import UnionRule
from pants.jvm.compile import ClasspathEntry
from pants.jvm.jdk_rules import InternalJdk, JvmProcess
from pants.jvm.jdk_rules import rules as jdk_rules
from pants.jvm.resolve.common import ArtifactRequirements, Coordinate
from pants.jvm.resolve.coursier_fetch import ToolClasspath, ToolClasspathRequest
from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool, GenerateJvmToolLockfileSentinel
Expand Down Expand Up @@ -428,5 +429,6 @@ def generate_scala_parser_lockfile_request(
def rules():
return (
*collect_rules(),
*jdk_rules(),
UnionRule(GenerateToolLockfileSentinel, ScalaParserToolLockfileSentinel),
)
2 changes: 2 additions & 0 deletions src/python/pants/core/target_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
PackageFieldSet,
)
from pants.core.util_rules.archive import ArchiveFormat, CreateArchive
from pants.core.util_rules.archive import rules as archive_rules
from pants.engine.addresses import Address, UnparsedAddressInputs
from pants.engine.fs import (
AddPrefix,
Expand Down Expand Up @@ -896,6 +897,7 @@ class LockfilesGeneratorTarget(TargetFilesGenerator):
def rules():
return (
*collect_rules(),
*archive_rules(),
UnionRule(GenerateSourcesRequest, GenerateResourceSourceRequest),
UnionRule(GenerateSourcesRequest, GenerateFileSourceRequest),
UnionRule(GenerateSourcesRequest, RelocateFilesViaCodegenRequest),
Expand Down
2 changes: 2 additions & 0 deletions src/python/pants/jvm/classpath.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
from pants.engine.rules import Get, MultiGet, collect_rules, rule
from pants.engine.target import CoarsenedTargets
from pants.jvm.compile import ClasspathEntry, ClasspathEntryRequest, ClasspathEntryRequestFactory
from pants.jvm.compile import rules as jvm_compile_rules
from pants.jvm.resolve.key import CoursierResolveKey
from pants.util.logging import LogLevel

Expand Down Expand Up @@ -135,4 +136,5 @@ def rules():
return [
*collect_rules(),
*system_binaries.rules(),
*jvm_compile_rules(),
]
6 changes: 6 additions & 0 deletions src/python/pants/jvm/jar_tool/jar_tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@
from pants.engine.rules import Get, MultiGet, collect_rules, rule
from pants.engine.unions import UnionRule
from pants.jvm.jdk_rules import InternalJdk, JvmProcess
from pants.jvm.jdk_rules import rules as jdk_rules
from pants.jvm.resolve.coursier_fetch import ToolClasspath, ToolClasspathRequest
from pants.jvm.resolve.coursier_fetch import rules as coursier_fetch_rules
from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool
from pants.jvm.resolve.jvm_tool import rules as jvm_tool_rules
from pants.util.frozendict import FrozenDict
from pants.util.logging import LogLevel
from pants.util.meta import frozen_after_init
Expand Down Expand Up @@ -300,5 +303,8 @@ async def generate_jartool_lockfile_request(
def rules():
return [
*collect_rules(),
*coursier_fetch_rules(),
*jdk_rules(),
*jvm_tool_rules(),
UnionRule(GenerateToolLockfileSentinel, JarToolGenerateLockfileSentinel),
]
4 changes: 4 additions & 0 deletions src/python/pants/jvm/package/deploy_jar.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
FallibleClasspathEntry,
)
from pants.jvm.jar_tool.jar_tool import JarToolRequest
from pants.jvm.jar_tool.jar_tool import rules as jar_tool_rules
from pants.jvm.shading.rules import ShadedJar, ShadeJarRequest
from pants.jvm.shading.rules import rules as shaded_jar_rules
from pants.jvm.strip_jar.strip_jar import StripJarRequest
from pants.jvm.subsystems import JvmSubsystem
from pants.jvm.target_types import (
Expand Down Expand Up @@ -173,6 +175,8 @@ def rules():
return [
*collect_rules(),
*classpath.rules(),
*jar_tool_rules(),
*shaded_jar_rules(),
UnionRule(PackageFieldSet, DeployJarFieldSet),
UnionRule(ClasspathEntryRequest, DeployJarClasspathEntryRequest),
]
8 changes: 8 additions & 0 deletions src/python/pants/jvm/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,18 @@
from pants.core.goals.package import BuiltPackage
from pants.core.goals.run import RunRequest
from pants.core.util_rules.system_binaries import UnzipBinary
from pants.core.util_rules.system_binaries import rules as system_binaries_rules
from pants.engine.addresses import Addresses
from pants.engine.internals.native_engine import Digest, MergeDigests
from pants.engine.process import Process, ProcessResult
from pants.engine.rules import Get, collect_rules, rule
from pants.engine.target import CoarsenedTargets
from pants.jvm.classpath import Classpath
from pants.jvm.classpath import rules as classpath_rules
from pants.jvm.jdk_rules import JdkEnvironment, JdkRequest, JvmProcess
from pants.jvm.jdk_rules import rules as jdk_rules
from pants.jvm.package.deploy_jar import DeployJarFieldSet
from pants.jvm.package.deploy_jar import rules as deploy_jar_rules
from pants.jvm.target_types import JvmArtifactFieldSet
from pants.util.logging import LogLevel

Expand Down Expand Up @@ -141,4 +145,8 @@ def rules():
*collect_rules(),
*DeployJarFieldSet.rules(),
*JvmArtifactFieldSet.rules(),
*deploy_jar_rules(),
*system_binaries_rules(),
*jdk_rules(),
*classpath_rules(),
]