From d89729f7d6226df0199284805eeafc31aef6abd7 Mon Sep 17 00:00:00 2001 From: Sanjay Vasandani Date: Tue, 9 Jan 2024 13:00:51 -0800 Subject: [PATCH] Migrate to Bzlmod. This drops the dependency on common-jvm, instead depending on rules_kotlin_jvm directly. --- .bazelrc | 12 +++- .bazelversion | 2 +- MODULE.bazel | 68 +++++++++++++++++++ WORKSPACE | 39 +---------- imports/com/google/common/truth/BUILD.bazel | 11 +++ .../common/truth/extensions/proto/BUILD.bazel | 11 +++ imports/org/junit/BUILD.bazel | 6 ++ .../common/fieldfilter/BUILD.bazel | 4 +- .../common/fieldfilter/utils/BUILD.bazel | 4 +- .../wfa/virtual_people/common/BUILD.bazel | 67 +++--------------- .../common/field_filter/test/BUILD.bazel | 11 +-- .../common/fieldfilter/BUILD.bazel | 55 ++++++++------- .../common/fieldfilter/utils/BUILD.bazel | 26 +++---- 13 files changed, 163 insertions(+), 153 deletions(-) create mode 100644 MODULE.bazel create mode 100644 imports/com/google/common/truth/BUILD.bazel create mode 100644 imports/com/google/common/truth/extensions/proto/BUILD.bazel create mode 100644 imports/org/junit/BUILD.bazel diff --git a/.bazelrc b/.bazelrc index a4ee9e4..0fe29a4 100644 --- a/.bazelrc +++ b/.bazelrc @@ -1,3 +1,8 @@ +# Enable Bzlmod with WFA registry. +common --enable_bzlmod +common --registry=https://raw.githubusercontent.com/world-federation-of-advertisers/bazel-registry/main +common --registry=https://bcr.bazel.build + # Use clang as C++ compiler. build --repo_env='CC=clang' @@ -7,5 +12,8 @@ build --cxxopt='-std=c++17' # Use JDK 11. See https://github.com/bazelbuild/bazel/issues/6245. build --java_runtime_version=remotejdk_11 -# Target Java 8. -build --java_language_version=8 +# Target Java 9. +build --java_language_version=9 + +# TODO(world-federation-of-advertisers/virtual-people-common#64): Remove when fixed. +test --compilation_mode=fastbuild diff --git a/.bazelversion b/.bazelversion index 8a30e8f..19b860c 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -5.4.0 +6.4.0 diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 index 0000000..622edee --- /dev/null +++ b/MODULE.bazel @@ -0,0 +1,68 @@ +module( + name = "virtual-people-common", + repo_name = "wfa_virtual_people_common", +) + +TRUTH_VERSION = "1.1.2" + +MAVEN_REPO_NAME = "vpc_maven" + +# Bazel Central Registry modules. +bazel_dep( + name = "rules_proto", + version = "5.3.0-21.7", +) +bazel_dep( + name = "protobuf", + version = "21.7", + repo_name = "com_google_protobuf", +) +bazel_dep( + name = "rules_cc", + version = "0.0.9", +) +bazel_dep( + name = "abseil-cpp", + version = "20230802.0.bcr.1", + repo_name = "com_google_absl", +) +bazel_dep( + name = "googletest", + version = "1.14.0.bcr.1", + repo_name = "com_google_googletest", +) +bazel_dep( + name = "rules_java", + version = "7.2.0", +) +bazel_dep( + name = "rules_jvm_external", + version = "5.3", +) + +# WFA registry modules. +bazel_dep( + name = "common-cpp", + version = "0.11.0", + repo_name = "wfa_common_cpp", +) +bazel_dep( + name = "rules_kotlin_jvm", + version = "0.1.1", + repo_name = "wfa_rules_kotlin_jvm", +) + +maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") +maven.install( + name = MAVEN_REPO_NAME, + artifacts = [ + "junit:junit:4.13.2", + "com.google.truth:truth:" + TRUTH_VERSION, + "com.google.truth.extensions:truth-java8-extension:" + TRUTH_VERSION, + "com.google.truth.extensions:truth-proto-extension:" + TRUTH_VERSION, + "com.google.truth.extensions:truth-liteproto-extension:" + TRUTH_VERSION, + ], + fetch_sources = True, # For IDE integration. + strict_visibility = True, +) +use_repo(maven, MAVEN_REPO_NAME) diff --git a/WORKSPACE b/WORKSPACE index cd02a75..a0ba318 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,38 +1 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") - -load("//build:repositories.bzl", "virtual_people_common_repositories") - -virtual_people_common_repositories() - -load("@wfa_common_jvm//build:common_jvm_repositories.bzl", "common_jvm_repositories") - -common_jvm_repositories() - -load("@wfa_common_jvm//build:common_jvm_deps.bzl", "common_jvm_deps") - -common_jvm_deps() - -load("@wfa_common_jvm//build:common_jvm_maven.bzl", "COMMON_JVM_MAVEN_OVERRIDE_TARGETS", "common_jvm_maven_artifacts") -load("@rules_jvm_external//:defs.bzl", "maven_install") - -maven_install( - artifacts = common_jvm_maven_artifacts(), - fetch_sources = True, - generate_compat_repositories = True, - override_targets = COMMON_JVM_MAVEN_OVERRIDE_TARGETS, - repositories = [ - "https://repo.maven.apache.org/maven2/", - ], -) - -load("@wfa_common_jvm//build:common_jvm_extra_deps.bzl", "common_jvm_extra_deps") - -common_jvm_extra_deps() - -load("@wfa_common_cpp//build:common_cpp_repositories.bzl", "common_cpp_repositories") - -common_cpp_repositories() - -load("@wfa_common_cpp//build:common_cpp_deps.bzl", "common_cpp_deps") - -common_cpp_deps() +workspace(name = "wfa_virtual_people_common") diff --git a/imports/com/google/common/truth/BUILD.bazel b/imports/com/google/common/truth/BUILD.bazel new file mode 100644 index 0000000..469e8b6 --- /dev/null +++ b/imports/com/google/common/truth/BUILD.bazel @@ -0,0 +1,11 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +java_library( + name = "truth", + exports = [ + "@vpc_maven//:com_google_truth_extensions_truth_java8_extension", + "@vpc_maven//:com_google_truth_truth", + ], +) diff --git a/imports/com/google/common/truth/extensions/proto/BUILD.bazel b/imports/com/google/common/truth/extensions/proto/BUILD.bazel new file mode 100644 index 0000000..7602631 --- /dev/null +++ b/imports/com/google/common/truth/extensions/proto/BUILD.bazel @@ -0,0 +1,11 @@ +load("@rules_java//java:defs.bzl", "java_library") + +package(default_visibility = ["//visibility:public"]) + +java_library( + name = "proto", + exports = [ + "@vpc_maven//:com_google_truth_extensions_truth_liteproto_extension", + "@vpc_maven//:com_google_truth_extensions_truth_proto_extension", + ], +) diff --git a/imports/org/junit/BUILD.bazel b/imports/org/junit/BUILD.bazel new file mode 100644 index 0000000..4432235 --- /dev/null +++ b/imports/org/junit/BUILD.bazel @@ -0,0 +1,6 @@ +package(default_visibility = ["//visibility:public"]) + +alias( + name = "junit", + actual = "@vpc_maven//:junit_junit", +) diff --git a/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel b/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel index 22e3e74..900ecd3 100644 --- a/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel +++ b/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel @@ -1,4 +1,4 @@ -load("@wfa_common_jvm//build/rules_kotlin:defs.bzl", "kt_jvm_library") +load("@wfa_rules_kotlin_jvm//kotlin:defs.bzl", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) @@ -8,6 +8,6 @@ kt_jvm_library( deps = [ "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils", "//src/main/proto/wfa/virtual_people/common:field_filter_kt_jvm_proto", - "@wfa_common_jvm//imports/java/com/google/protobuf", + "@wfa_rules_kotlin_jvm//imports/com/google/protobuf", ], ) diff --git a/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel b/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel index 5a3f241..033ba4b 100644 --- a/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel +++ b/src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel @@ -1,4 +1,4 @@ -load("@wfa_common_jvm//build/rules_kotlin:defs.bzl", "kt_jvm_library") +load("@wfa_rules_kotlin_jvm//kotlin:defs.bzl", "kt_jvm_library") package(default_visibility = ["//visibility:public"]) @@ -7,6 +7,6 @@ kt_jvm_library( srcs = glob(["*.kt"]), deps = [ "//src/main/proto/wfa/virtual_people/common:field_filter_kt_jvm_proto", - "@wfa_common_jvm//imports/java/com/google/protobuf", + "@wfa_rules_kotlin_jvm//imports/com/google/protobuf", ], ) diff --git a/src/main/proto/wfa/virtual_people/common/BUILD.bazel b/src/main/proto/wfa/virtual_people/common/BUILD.bazel index e768354..5a9a826 100644 --- a/src/main/proto/wfa/virtual_people/common/BUILD.bazel +++ b/src/main/proto/wfa/virtual_people/common/BUILD.bazel @@ -1,7 +1,6 @@ load("@rules_cc//cc:defs.bzl", "cc_proto_library") load("@rules_proto//proto:defs.bzl", "proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@wfa_common_jvm//build/kt_jvm_proto:defs.bzl", "kt_jvm_proto_library") +load("@wfa_rules_kotlin_jvm//kotlin:defs.bzl", "kt_jvm_proto_library") package(default_visibility = ["//visibility:public"]) @@ -25,15 +24,9 @@ cc_proto_library( deps = [":model_proto"], ) -java_proto_library( - name = "model_java_proto", - deps = [":model_proto"], -) - kt_jvm_proto_library( name = "model_kt_jvm_proto", - srcs = [":model_proto"], - deps = [":model_java_proto"], + deps = [":model_proto"], ) proto_library( @@ -53,15 +46,9 @@ cc_proto_library( deps = [":event_proto"], ) -java_proto_library( - name = "event_java_proto", - deps = [":event_proto"], -) - kt_jvm_proto_library( name = "event_kt_jvm_proto", - srcs = [":event_proto"], - deps = [":event_java_proto"], + deps = [":event_proto"], ) proto_library( @@ -78,15 +65,9 @@ cc_proto_library( deps = [":label_proto"], ) -java_proto_library( - name = "label_java_proto", - deps = [":label_proto"], -) - kt_jvm_proto_library( name = "label_kt_jvm_proto", - srcs = [":label_proto"], - deps = [":label_java_proto"], + deps = [":label_proto"], ) proto_library( @@ -100,15 +81,9 @@ cc_proto_library( deps = [":demographic_proto"], ) -java_proto_library( - name = "demographic_java_proto", - deps = [":demographic_proto"], -) - kt_jvm_proto_library( name = "demographic_kt_jvm_proto", - srcs = [":demographic_proto"], - deps = [":demographic_java_proto"], + deps = [":demographic_proto"], ) proto_library( @@ -122,15 +97,9 @@ cc_proto_library( deps = [":geo_location_proto"], ) -java_proto_library( - name = "geo_location_java_proto", - deps = [":geo_location_proto"], -) - kt_jvm_proto_library( name = "geo_location_kt_jvm_proto", - srcs = [":geo_location_proto"], - deps = [":geo_location_java_proto"], + deps = [":geo_location_proto"], ) proto_library( @@ -147,15 +116,9 @@ cc_proto_library( deps = [":panel_data_proto"], ) -java_proto_library( - name = "panel_data_java_proto", - deps = [":panel_data_proto"], -) - kt_jvm_proto_library( name = "panel_data_kt_jvm_proto", - srcs = [":panel_data_proto"], - deps = [":panel_data_java_proto"], + deps = [":panel_data_proto"], ) proto_library( @@ -169,15 +132,9 @@ cc_proto_library( deps = [":field_filter_proto"], ) -java_proto_library( - name = "field_filter_java_proto", - deps = [":field_filter_proto"], -) - kt_jvm_proto_library( name = "field_filter_kt_jvm_proto", - srcs = [":field_filter_proto"], - deps = [":field_filter_java_proto"], + deps = [":field_filter_proto"], ) proto_library( @@ -191,13 +148,7 @@ cc_proto_library( deps = [":config_proto"], ) -java_proto_library( - name = "config_java_proto", - deps = [":config_proto"], -) - kt_jvm_proto_library( name = "config_kt_jvm_proto", - srcs = [":config_proto"], - deps = [":config_java_proto"], + deps = [":config_proto"], ) diff --git a/src/main/proto/wfa/virtual_people/common/field_filter/test/BUILD.bazel b/src/main/proto/wfa/virtual_people/common/field_filter/test/BUILD.bazel index 94fb92e..ff7dab5 100644 --- a/src/main/proto/wfa/virtual_people/common/field_filter/test/BUILD.bazel +++ b/src/main/proto/wfa/virtual_people/common/field_filter/test/BUILD.bazel @@ -1,7 +1,6 @@ load("@rules_cc//cc:defs.bzl", "cc_proto_library") load("@rules_proto//proto:defs.bzl", "proto_library") -load("@rules_java//java:defs.bzl", "java_proto_library") -load("@wfa_common_jvm//build/kt_jvm_proto:defs.bzl", "kt_jvm_proto_library") +load("@wfa_rules_kotlin_jvm//kotlin:defs.bzl", "kt_jvm_proto_library") package(default_visibility = ["//src/test:__subpackages__"]) @@ -18,13 +17,7 @@ cc_proto_library( deps = [":test_proto"], ) -java_proto_library( - name = "test_java_proto", - deps = [":test_proto"], -) - kt_jvm_proto_library( name = "test_kt_jvm_proto", - srcs = [":test_proto"], - deps = [":test_java_proto"], + deps = [":test_proto"], ) diff --git a/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel b/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel index baa7c4f..0456f7d 100644 --- a/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel +++ b/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/BUILD.bazel @@ -1,14 +1,14 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") +load("@wfa_rules_kotlin_jvm//kotlin:defs.bzl", "kt_jvm_test") kt_jvm_test( name = "FieldFilterTest", srcs = ["FieldFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.FieldFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -17,10 +17,10 @@ kt_jvm_test( srcs = ["HasFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.HasFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -29,10 +29,10 @@ kt_jvm_test( srcs = ["EqualFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.EqualFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -41,10 +41,10 @@ kt_jvm_test( srcs = ["AnyInFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.AnyInFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -53,10 +53,10 @@ kt_jvm_test( srcs = ["AndFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.AndFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -65,10 +65,10 @@ kt_jvm_test( srcs = ["OrFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.OrFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -77,10 +77,10 @@ kt_jvm_test( srcs = ["PartialFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.PartialFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -89,10 +89,10 @@ kt_jvm_test( srcs = ["GtFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.GtFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -101,10 +101,10 @@ kt_jvm_test( srcs = ["LtFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.LtFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -113,13 +113,12 @@ kt_jvm_test( srcs = ["InFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.InFilterTest", deps = [ + "//imports/com/google/common/truth", + "//imports/com/google/common/truth/extensions/proto", + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/com/google/common/truth", - "@wfa_common_jvm//imports/java/com/google/common/truth/extensions/proto", - "@wfa_common_jvm//imports/java/com/google/protobuf/util", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -128,10 +127,10 @@ kt_jvm_test( srcs = ["NotFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.NotFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -140,9 +139,9 @@ kt_jvm_test( srcs = ["TrueFilterTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.TrueFilterTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) diff --git a/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel b/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel index ce7e686..19db2c6 100644 --- a/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel +++ b/src/test/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils/BUILD.bazel @@ -1,15 +1,15 @@ -load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test") +load("@wfa_rules_kotlin_jvm//kotlin:defs.bzl", "kt_jvm_test") kt_jvm_test( name = "FieldUtilTest", srcs = ["FieldUtilTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.utils.FieldUtilTest", deps = [ + "//imports/com/google/common/truth/extensions/proto", + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/com/google/common/truth/extensions/proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -18,10 +18,10 @@ kt_jvm_test( srcs = ["TypeConvertUtilTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.utils.TypeConvertUtilTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -30,10 +30,10 @@ kt_jvm_test( srcs = ["ValuesParserTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.utils.ValuesParserTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -42,11 +42,11 @@ kt_jvm_test( srcs = ["MessageFilterUtilTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.utils.MessageFilterUtilTest", deps = [ + "//imports/com/google/common/truth/extensions/proto", + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/com/google/common/truth/extensions/proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], ) @@ -55,9 +55,9 @@ kt_jvm_test( srcs = ["IntegerComparatorUtilTest.kt"], test_class = "org.wfanet.virtualpeople.common.fieldfilter.utils.IntegerComparatorUtilTest", deps = [ + "//imports/org/junit", "//src/main/kotlin/org/wfanet/virtualpeople/common/fieldfilter/utils", "//src/main/proto/wfa/virtual_people/common/field_filter/test:test_kt_jvm_proto", - "@wfa_common_jvm//imports/java/org/junit", - "@wfa_common_jvm//imports/kotlin/kotlin/test", + "@wfa_rules_kotlin_jvm//imports/kotlin/test", ], )