LF: replace "dev" LF version by "1.dev" in bazel files (#11894)

the more consistent, as asked by Moritz in review of #11820 CHANGELOG_BEGIN CHANGELOG_END
digital-asset · Nov 26, 2021 · 58e69ad · 58e69ad
1 parent 8ef348d
commit 58e69ad
Show file tree

Hide file tree

Showing 34 changed files with 76 additions and 81 deletions.
diff --git a/daml-assistant/integration-tests/BUILD.bazel b/daml-assistant/integration-tests/BUILD.bazel
@@ -8,8 +8,8 @@ genrule(
     name = "integration-tests-mvn",
     srcs = [
         "@mvn_dev_env//:mvn",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java_pom",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java_pom",
         "//language-support/java/bindings:libbindings-java.jar",
         "//language-support/java/bindings:bindings-java_pom.xml",
         "//language-support/java/bindings-rxjava:libbindings-rxjava.jar",
@@ -42,8 +42,8 @@ genrule(
       tar xf $(location //docs:quickstart-java.tar.gz) -C "$$TMP_DIR"
       install_mvn \\
         "com.daml" "daml-lf-archive" \\
-        $$(echo $(locations //daml-lf/archive:daml_lf_dev_archive_proto_java) | xargs -n1 echo | grep -v -- '-src\\.jar$$') \\
-        $(location //daml-lf/archive:daml_lf_dev_archive_proto_java_pom)
+        $$(echo $(locations //daml-lf/archive:daml_lf_1.dev_archive_proto_java) | xargs -n1 echo | grep -v -- '-src\\.jar$$') \\
+        $(location //daml-lf/archive:daml_lf_1.dev_archive_proto_java_pom)
       install_mvn \\
         "com.daml" "bindings-java" \\
         $(location //language-support/java/bindings:libbindings-java.jar) \\

diff --git a/daml-lf/archive/BUILD.bazel b/daml-lf/archive/BUILD.bazel
@@ -39,21 +39,22 @@ load("@rules_pkg//:pkg.bzl", "pkg_tar")
             name = "daml_lf_%s_archive_proto" % version,
             srcs = [":daml_lf_%s_archive_proto_srcs" % version],
             javadoc_root_packages = ["com.daml.daml_lf_%s" % mangled_version],
-            maven_artifact_prefix = "daml-lf-%s-archive" % version,
+            maven_artifact_prefix = "daml-lf-%s-archive" % short_version,
             maven_group = "com.daml",
             strip_import_prefix = "src/%s/protobuf" % directory,
             visibility = ["//visibility:public"],
         ),
     ]
     for version in PROTO_LF_VERSIONS
-    for mangled_version in [mangle_for_java(version)]
-    for directory in ["main" if version == "dev" else "stable"]
+    for short_version in ["dev" if version == "1.dev" else version]
+    for mangled_version in [mangle_for_java(short_version)]
+    for directory in ["main" if version == "1.dev" else "stable"]
 ]
 
 # FIXME(JM): Clean this up
 genrule(
     name = "daml_lf_dev_archive_haskell_proto_src",
-    srcs = ["daml_lf_dev_archive_proto_srcs"],
+    srcs = ["daml_lf_1.dev_archive_proto_srcs"],
     outs = ["Com/Daml/DamlLfDev/DamlLf.hs"] +
            ["Com/Daml/DamlLfDev/DamlLf%s.hs" % v.title() for v in LF_MAJOR_VERSIONS],
     cmd =
@@ -106,7 +107,7 @@ da_scala_library(
     tags = ["maven_coordinates=com.daml:daml-lf-archive-reader:__VERSION__"],
     visibility = ["//visibility:public"],
     deps = [
-        ":daml_lf_dev_archive_proto_java",
+        ":daml_lf_1.dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/language",
         "//libs-scala/nameof",
@@ -138,8 +139,8 @@ da_scala_test_suite(
     ],
     scalacopts = lf_scalacopts,
     deps = [
+        ":daml_lf_1.dev_archive_proto_java",
         ":daml_lf_archive_reader",
-        ":daml_lf_dev_archive_proto_java",
         "//bazel_tools/runfiles:scala_runfiles",
         "//daml-lf/data",
         "//daml-lf/language",
@@ -163,8 +164,8 @@ da_scala_test_suite(
     scalacopts = lf_scalacopts,
     deps = [
         ":daml_lf_1.14_archive_proto_java",
+        ":daml_lf_1.dev_archive_proto_java",
         ":daml_lf_archive_reader",
-        ":daml_lf_dev_archive_proto_java",
         "//bazel_tools/runfiles:scala_runfiles",
         "//daml-lf/data",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -188,7 +189,7 @@ da_scala_binary(
     ],
 )
 
-SNASPSHOT_VERSIONS = [ver for ver in PROTO_LF_VERSIONS if ver != "dev"]
+SNASPSHOT_VERSIONS = [ver for ver in PROTO_LF_VERSIONS if ver != "1.dev"]
 
 [
     sh_test(
@@ -203,7 +204,7 @@ SNASPSHOT_VERSIONS = [ver for ver in PROTO_LF_VERSIONS if ver != "dev"]
             "proto_breaking_changes.sh",
             "src/main/protobuf/com/daml/daml_lf_dev",
             ":daml_lf_%s_archive_proto_srcs" % version,
-            ":daml_lf_dev_archive_proto_srcs",
+            ":daml_lf_1.dev_archive_proto_srcs",
             "@buf//:bin/buf",
         ],
     )

diff --git a/daml-lf/archive/README.md b/daml-lf/archive/README.md
@@ -38,8 +38,8 @@ It produces several libraries containing code to encode / decode such
 definition, a Haskell one, and several Java ones:
 
 ```
-$ bazel build //daml-lf/archive:daml_lf_archive_haskell_proto
-$ bazel build //daml-lf/archive:daml_lf_dev_archive_proto_java
+$ bazel build //daml-lf/archive:daml_lf_dev_archive_haskell_proto
+$ bazel build //daml-lf/archive:daml_lf_1.dev_archive_proto_java
 $ bazel build //daml-lf/archive:daml_lf_1_14_archive_proto_java
 ```
 

diff --git a/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_1_13/NO_AUTO_COPYRIGHT b/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_1_13/NO_AUTO_COPYRIGHT
diff --git a/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_1_14/NO_AUTO_COPYRIGHT b/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_1_14/NO_AUTO_COPYRIGHT
diff --git a/daml-lf/encoder/BUILD.bazel b/daml-lf/encoder/BUILD.bazel
@@ -10,7 +10,7 @@ load(
 )
 load(
     "//daml-lf/language:daml-lf.bzl",
-    "ENCODER_LF_VERSIONS",
+    "LF_VERSIONS",
     "lf_version_configuration",
     "mangle_for_java",
 )
@@ -27,8 +27,8 @@ da_scala_library(
     scalacopts = lf_scalacopts,
     visibility = ["//visibility:public"],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/language",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -39,7 +39,7 @@ da_scala_test_suite(
     name = "tests",
     size = "small",
     srcs = glob(["src/test/scala/**/*.scala"]),
-    data = [":testing-dar-%s" % target for target in ENCODER_LF_VERSIONS],
+    data = [":testing-dar-%s" % target for target in LF_VERSIONS],
     scala_deps = [
         "@maven//:org_scalatest_scalatest_core",
         "@maven//:org_scalatest_scalatest_matchers_core",
@@ -51,8 +51,8 @@ da_scala_test_suite(
     deps = [
         ":encoder",
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/language",
         "//daml-lf/parser",
@@ -72,8 +72,8 @@ da_scala_binary(
     deps = [
         ":encoder",
         "//:sdk-version-scala-lib",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/archive/encoder",
         "//daml-lf/data",
         "//daml-lf/language",
@@ -91,7 +91,7 @@ da_scala_binary(
             "src/test/lf/*_%s_*.lf" % target,
         ]),
     )
-    for target in ENCODER_LF_VERSIONS
+    for target in LF_VERSIONS
 ]
 
 [
@@ -121,7 +121,7 @@ da_scala_binary(
             ],
         ),
     ]
-    for target in ENCODER_LF_VERSIONS
+    for target in LF_VERSIONS
 ]
 
 [
@@ -161,6 +161,6 @@ EOF
 
 filegroup(
     name = "testing-dars",
-    srcs = ["testing-dar-%s" % version for version in ENCODER_LF_VERSIONS],
+    srcs = ["testing-dar-%s" % version for version in LF_VERSIONS],
     visibility = ["//visibility:public"],
 )
diff --git a/daml-lf/engine/BUILD.bazel b/daml-lf/engine/BUILD.bazel
@@ -65,8 +65,8 @@ da_scala_test_suite(
     deps = [
         ":engine",
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/interpreter",
         "//daml-lf/language",

diff --git a/daml-lf/interface/BUILD.bazel b/daml-lf/interface/BUILD.bazel
@@ -32,8 +32,8 @@ da_scala_library(
         "//navigator:__subpackages__",
     ],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/language",
         "@maven//:com_google_protobuf_protobuf_java",
@@ -50,8 +50,8 @@ da_scala_test(
     scalacopts = lf_scalacopts,
     deps = [
         ":interface",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/language",
         "//daml-lf/parser",

diff --git a/daml-lf/interpreter/BUILD.bazel b/daml-lf/interpreter/BUILD.bazel
@@ -121,8 +121,8 @@ da_scala_benchmark_jmh(
     visibility = ["//visibility:public"],
     deps = [
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/engine",
         "//daml-lf/interpreter",

diff --git a/daml-lf/language/daml-lf.bzl b/daml-lf/language/daml-lf.bzl
@@ -17,11 +17,11 @@ def _cmp(a, b):
         return -1
 
 def _cmp_lf_version(a, b):
-    if (a == "1.dev" or a == "dev") and (b == "1.dev" or b == "dev"):
+    if a == "1.dev" and b == "1.dev":
         return 0
-    elif (a == "1.dev" or a == "dev"):
+    elif a == "1.dev":
         return 1
-    elif (b == "1.dev" or b == "dev"):
+    elif b == "1.dev":
         return -1
     else:
         aVer = _to_major_minor(a)
@@ -88,22 +88,17 @@ LF_VERSIONS = [
     "1.12",
     "1.13",
     "1.14",
-    "dev",
+    "1.dev",
 ]
 
 # All LF versions for which we have protobufs.
 PROTO_LF_VERSIONS = [ver for ver in LF_VERSIONS if versions.gte(ver, "1.14")]
 
-# The subset of LF versions accepted by //daml-lf/encoder
-ENCODER_LF_VERSIONS = ["1.dev" if ver == "dev" else ver for ver in LF_VERSIONS]
-
 # We support older LF versions using an older compiler binary
 LEGACY_COMPILER_LF_VERSIONS = [ver for ver in LF_VERSIONS if versions.lte(ver, "1.13")]
 
 # The subset of LF versions accepted by the compiler in the syntax
 # expected by the --target option.
-COMPILER_LF_VERSIONS = [ver for ver in ENCODER_LF_VERSIONS if ver not in LEGACY_COMPILER_LF_VERSIONS]
-
-ALL_COMPILER_LF_VERSIONS = LEGACY_COMPILER_LF_VERSIONS + COMPILER_LF_VERSIONS
+COMPILER_LF_VERSIONS = [ver for ver in LF_VERSIONS if ver not in LEGACY_COMPILER_LF_VERSIONS]
 
 LF_MAJOR_VERSIONS = ["1"]
diff --git a/daml-lf/scenario-interpreter/BUILD.bazel b/daml-lf/scenario-interpreter/BUILD.bazel
@@ -72,8 +72,8 @@ da_scala_benchmark_jmh(
     visibility = ["//visibility:public"],
     deps = [
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/engine",
         "//daml-lf/interpreter",

diff --git a/daml-lf/validation/BUILD.bazel b/daml-lf/validation/BUILD.bazel
@@ -62,8 +62,8 @@ da_scala_benchmark_jmh(
     visibility = ["//visibility:public"],
     deps = [
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/engine",
         "//daml-lf/interpreter",

diff --git a/daml-script/export/BUILD.bazel b/daml-script/export/BUILD.bazel
@@ -39,8 +39,8 @@ da_scala_binary(
     ],
     visibility = ["//visibility:public"],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/language",
         "//language-support/scala/bindings",

diff --git a/daml-script/runner/BUILD.bazel b/daml-script/runner/BUILD.bazel
@@ -36,8 +36,8 @@ da_scala_library(
     scalacopts = script_scalacopts,
     visibility = ["//visibility:public"],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/engine",
         "//daml-lf/interface",

diff --git a/daml-script/test/BUILD.bazel b/daml-script/test/BUILD.bazel
@@ -124,8 +124,8 @@ da_scala_library(
     visibility = ["//visibility:public"],
     deps = [
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/interface",
         "//daml-lf/interpreter",
@@ -178,8 +178,8 @@ da_scala_test_suite(
     deps = [
         ":test-utils",
         "//bazel_tools/runfiles:scala_runfiles",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/interface",
         "//daml-lf/interpreter",

diff --git a/docs/BUILD.bazel b/docs/BUILD.bazel
@@ -464,7 +464,7 @@ java_binary(
     srcs = glob(["source/app-dev/bindings-java/quickstart/template-root/src/main/java/**/*.java"]) + [":quickstart-model-srcjar"],
     main_class = "com.daml.quickstart.iou.IouMain",
     deps = [
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//language-support/java/bindings:bindings-java",
         "//language-support/java/bindings-rxjava",
         "@maven//:ch_qos_logback_logback_classic",

diff --git a/language-support/java/codegen/BUILD.bazel b/language-support/java/codegen/BUILD.bazel
@@ -23,7 +23,6 @@ load(
 )
 load(
     "//daml-lf/language:daml-lf.bzl",
-    "ALL_COMPILER_LF_VERSIONS",
     "LF_VERSIONS",
     "lf_version_configuration",
 )
@@ -59,8 +58,8 @@ da_scala_library(
     tags = ["maven_coordinates=com.daml:codegen-java-lib:__VERSION__"],
     visibility = ["//visibility:public"],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/interface",
         "//language-support/codegen-common",
@@ -162,7 +161,7 @@ scala_source_jar(
             ],
         ),
     ]
-    for target in ALL_COMPILER_LF_VERSIONS
+    for target in LF_VERSIONS
     # we skip 1.13 as their serializable types are the same as 1.12.
     # We include 1.14 since while it has no new serializable types
     # it is the earliest version supported by HEAD damlc.
@@ -185,7 +184,7 @@ scala_source_jar(
         ),
         target = ver,
     )
-    for ver in ALL_COMPILER_LF_VERSIONS
+    for ver in LF_VERSIONS
 ]
 
 daml_compile(
@@ -304,7 +303,7 @@ java_test(
             ],
         ),
     ]
-    for target in ALL_COMPILER_LF_VERSIONS
+    for target in LF_VERSIONS
     # we skip 1.13 as their serializable types are the same as 1.12.
     # We include 1.14 since while it has no new serializable types
     # it is the earliest version supported by HEAD damlc.

diff --git a/language-support/scala/codegen/BUILD.bazel b/language-support/scala/codegen/BUILD.bazel
@@ -46,8 +46,8 @@ da_scala_library(
         "@maven//:ch_qos_logback_logback_classic",
     ],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/interface",
         "@maven//:org_slf4j_slf4j_api",

diff --git a/ledger-service/utils/BUILD.bazel b/ledger-service/utils/BUILD.bazel
@@ -18,8 +18,8 @@ da_scala_library(
     tags = ["maven_coordinates=com.daml:http-json-utils:__VERSION__"],
     visibility = ["//visibility:public"],
     deps = [
+        "//daml-lf/archive:daml_lf_1.dev_archive_proto_java",
         "//daml-lf/archive:daml_lf_archive_reader",
-        "//daml-lf/archive:daml_lf_dev_archive_proto_java",
         "//daml-lf/data",
         "//daml-lf/interface",
         "//daml-lf/language",