create separate bazel targets for participant-state-v2 (#1562)

2024-09-20 01:07:18 +03:00 · 2019-06-11 10:00:02 +02:00 · 2019-06-11 10:00:02 +02:00 · 319e042860
commit 319e042860
parent 186692813a
9 changed files with 52 additions and 24 deletions
--- a/ledger/api-server-damlonx/BUILD.bazel
+++ b/ledger/api-server-damlonx/BUILD.bazel
@ -39,7 +39,7 @@ da_scala_library(
        "//ledger/ledger-api-common",
        "//ledger/ledger-api-domain",
        "//ledger/ledger-api-scala-logging",
-        "//ledger/participant-state",
-        "//ledger/participant-state-index",
+        "//ledger/participant-state:participant-state-v1",
+        "//ledger/participant-state-index:participant-state-index-v1",
    ],
 )
--- a/ledger/api-server-damlonx/reference/BUILD.bazel
+++ b/ledger/api-server-damlonx/reference/BUILD.bazel
@ -35,8 +35,8 @@ da_scala_binary(
        "//ledger/api-server-damlonx",
        "//ledger/ledger-api-client",
        "//ledger/ledger-api-common",
-        "//ledger/participant-state",
-        "//ledger/participant-state-index",
+        "//ledger/participant-state:participant-state-v1",
+        "//ledger/participant-state-index:participant-state-index-v1",
        "//ledger/participant-state-index/reference",
        "//ledger/participant-state/kvutils",
    ],
--- a/ledger/ledger-api-common/BUILD.bazel
+++ b/ledger/ledger-api-common/BUILD.bazel
@ -43,7 +43,7 @@ da_scala_library(
        "//ledger/ledger-api-domain",
        "//ledger/ledger-api-scala-logging",
        "//ledger/participant-state",
-        "//ledger/participant-state-index:participant-state-index-v2",
+        "//ledger/participant-state-index",
    ],
 )

--- a/ledger/participant-state-index/BUILD.bazel
+++ b/ledger/participant-state-index/BUILD.bazel
@ -16,25 +16,25 @@ compileDependencies = [
 ]

 da_scala_library(
-    name = "participant-state-index",
+    name = "participant-state-index-v1",
    srcs = glob(["src/main/scala/com/daml/ledger/participant/state/index/v1/*.scala"]),
    resources = glob(["src/main/resources/**/*"]),
+    tags = ["maven_coordinates=com.daml.ledger:participant-state-index-v1:__VERSION__"],
+    visibility = [
+        "//visibility:public",
+    ],
+    runtime_deps = [],
+    deps = compileDependencies + ["//ledger/participant-state:participant-state-v1"],
+)
+
+da_scala_library(
+    name = "participant-state-index",
+    srcs = glob(["src/main/scala/com/daml/ledger/participant/state/index/v2/*.scala"]),
+    resources = glob(["src/main/resources/**/*"]),
    tags = ["maven_coordinates=com.daml.ledger:participant-state-index:__VERSION__"],
    visibility = [
        "//visibility:public",
    ],
    runtime_deps = [],
-    deps = compileDependencies + ["//ledger/participant-state"],
-)
-
-da_scala_library(
-    name = "participant-state-index-v2",
-    srcs = glob(["src/main/scala/com/daml/ledger/participant/state/index/v2/*.scala"]),
-    resources = glob(["src/main/resources/**/*"]),
-    #    tags = ["maven_coordinates=com.daml.ledger:participant-state-index:__VERSION__"],
-    visibility = [
-        "//visibility:public",
-    ],
-    runtime_deps = [],
    deps = compileDependencies + ["//3rdparty/jvm/org/scalaz:scalaz_core"],
 )
--- a/ledger/participant-state-index/reference/BUILD.bazel
+++ b/ledger/participant-state-index/reference/BUILD.bazel
@ -21,8 +21,8 @@ compileDependencies = [
    "//daml-lf/transaction",
    "//ledger/ledger-api-common",
    "//ledger/ledger-api-domain",
-    "//ledger/participant-state",
-    "//ledger/participant-state-index",
+    "//ledger/participant-state:participant-state-v1",
+    "//ledger/participant-state-index:participant-state-index-v1",
    "//ledger/sandbox",  # For ActiveContracts. TODO(JM): Move to common library?
 ]

--- a/ledger/participant-state/BUILD.bazel
+++ b/ledger/participant-state/BUILD.bazel
@ -7,9 +7,33 @@ load(
    "da_scala_test_suite",
 )

+da_scala_library(
+    name = "participant-state-v1",
+    srcs = glob(["src/main/scala/com/daml/ledger/participant/state/v1/**/*.scala"]),
+    resources = glob(["src/main/resources/**/*"]),
+    tags = ["maven_coordinates=com.daml.ledger:participant-state-v1:__VERSION__"],
+    visibility = [
+        "//visibility:public",
+    ],
+    runtime_deps = [],
+    deps = [
+        "//3rdparty/jvm/com/google/guava",
+        "//3rdparty/jvm/com/typesafe/akka:akka_stream",
+        "//daml-lf/archive:daml_lf_java_proto",
+        "//daml-lf/data",
+        "//daml-lf/transaction",
+        "//daml-lf/transaction/src/main/protobuf:transaction_java_proto",
+        "//daml-lf/transaction/src/main/protobuf:value_java_proto",
+        "//ledger/ledger-api-domain",
+    ],
+)
+
+# Temporary target to support the split between v1 and v2 versions of the
+# participant-state library. Untimately, only v2 will prevail.
+
 da_scala_library(
    name = "participant-state",
-    srcs = glob(["src/main/scala/**/*.scala"]),
+    srcs = glob(["src/main/scala/com/daml/ledger/participant/state/v2/**/*.scala"]),
    resources = glob(["src/main/resources/**/*"]),
    tags = ["maven_coordinates=com.daml.ledger:participant-state:__VERSION__"],
    visibility = [
--- a/ledger/participant-state/kvutils/BUILD.bazel
+++ b/ledger/participant-state/kvutils/BUILD.bazel
@ -32,7 +32,7 @@ da_scala_library(
        "//daml-lf/transaction/src/main/protobuf:transaction_java_proto",
        "//daml-lf/transaction/src/main/protobuf:value_java_proto",
        "//ledger/ledger-api-common",
-        "//ledger/participant-state",
+        "//ledger/participant-state:participant-state-v1",
    ],
 )

@ -52,7 +52,7 @@ da_scala_test_suite(
        "//daml-lf/transaction",
        "//ledger-api/testing-utils",
        "//ledger/ledger-api-common",
-        "//ledger/participant-state",
+        "//ledger/participant-state:participant-state-v1",
    ],
 )

--- a/ledger/sandbox/BUILD.bazel
+++ b/ledger/sandbox/BUILD.bazel
@ -40,7 +40,7 @@ compileDependencies = [
    "//ledger/ledger-api-common:ledger-api-common",
    "//ledger/ledger-api-client:ledger-api-client",
    "//ledger/participant-state",
-    "//ledger/participant-state-index:participant-state-index-v2",
+    "//ledger/participant-state-index:participant-state-index",
    "//3rdparty/jvm/com/typesafe/scala_logging:scala_logging",
    "//3rdparty/jvm/org/slf4j:slf4j_api",
    "//3rdparty/jvm/org/scalaz:scalaz_core",
--- a/release/artifacts.yaml
+++ b/release/artifacts.yaml
@ -127,8 +127,12 @@
  type: jar
 - target: //language-support/codegen-main:shaded_binary
  type: jar
+- target: //ledger/participant-state:participant-state-v1
+  type: jar-scala
 - target: //ledger/participant-state:participant-state
  type: jar-scala
+- target: //ledger/participant-state-index:participant-state-index-v1
+  type: jar-scala
 - target: //ledger/participant-state-index:participant-state-index
  type: jar-scala
 - target: //ledger/participant-state-index/reference:reference