diff --git a/MODULE.bazel b/MODULE.bazel index cc84837..e28b2c3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -15,7 +15,6 @@ bazel_dep(name = "aspect_bazel_lib", version = "1.32.1", dev_dependency = True) bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True) bazel_dep(name = "contrib_rules_jvm", version = "0.24.0") - bazel_dep(name = "rules_java", version = "7.4.0") bazel_dep(name = "rules_jvm_external", version = "6.0") diff --git a/pitest/private/rules.bzl b/pitest/private/rules.bzl index a49d7c5..cdf8db3 100644 --- a/pitest/private/rules.bzl +++ b/pitest/private/rules.bzl @@ -1,4 +1,4 @@ -load("@rules_java//java:defs.bzl", "java_test", "java_common") +load("@rules_java//java:defs.bzl", "java_common", "java_test") # Common package prefixes, in the order we want to check for them _PREFIXES = (".com.", ".org.", ".net.", ".io.", ".ai.", ".co.", ".me.") @@ -39,7 +39,7 @@ def _extract_jar_impl(ctx): ) for x in ctx.files.target: - cmd = "{cmd}$CWD/{jar_path} -xf $CWD/{file};\n".format(cmd = cmd, jar_path = jar_path, file=x.path) + cmd = "{cmd}$CWD/{jar_path} -xf $CWD/{file};\n".format(cmd = cmd, jar_path = jar_path, file = x.path) cmd = "%srm -rf META-INF;\n" % cmd @@ -51,12 +51,12 @@ def _extract_jar_impl(ctx): use_default_shell_env = True, ) - return DefaultInfo(files=depset([out])) + return DefaultInfo(files = depset([out])) _extract_jar = rule( implementation = _extract_jar_impl, attrs = { - "target": attr.label_list(allow_files=True), + "target": attr.label_list(allow_files = True), "_jdk": attr.label( default = "@rules_java//toolchains:current_host_java_runtime", providers = [java_common.JavaRuntimeInfo], @@ -98,13 +98,11 @@ def java_pitest_test( else: clazz = _get_package_name(package_prefixes) + name - - src_dirs = [native.package_name()] + src_dirs _extract_jar( name = "%s-classes" % name, - target = [ library_target ] + target = [library_target], ) _extract_jar( @@ -113,7 +111,6 @@ def java_pitest_test( testonly = True, ) - args = list(args) args += [ "--reportDir", @@ -141,7 +138,8 @@ def java_pitest_test( ], args = args, jvm_flags = [ - "-cp", "$$CLASSPATH:$(location :%s-classes):$(location :%s-test-classes)" % (name, name) + "-cp", + "$$CLASSPATH:$(location :%s-classes):$(location :%s-test-classes)" % (name, name), ], **kwargs )