clean LF versions in java codegen test (#18689)

digital-asset · Mar 8, 2024 · 62731d7 · 62731d7
1 parent b978f97
commit 62731d7
Show file tree

Hide file tree

Showing 45 changed files with 12 additions and 3,307 deletions.
diff --git a/language-support/java/codegen/BUILD.bazel b/language-support/java/codegen/BUILD.bazel
@@ -315,8 +315,6 @@ java_library(
 
 module_prefix_test = "src/it/java/com/daml/ModulePrefixes.java"
 
-contract_keys_test = "src/it/java/com/daml/ContractKeysTest.java"
-
 java_test(
     name = "integration-tests-module-prefixes",
     srcs = [module_prefix_test],
@@ -330,21 +328,6 @@ java_test(
     ],
 )
 
-java_test(
-    name = "integration-tests-contract-keys",
-    srcs = [contract_keys_test],
-    test_class = "com.daml.ContractKeysTest",
-    deps = [
-        ":integration-tests-model-2.dev",
-        "//canton:bindings-java",
-        "@maven//:com_google_protobuf_protobuf_java",
-        "@maven//:org_junit_jupiter_junit_jupiter_api",
-        "@maven//:org_junit_jupiter_junit_jupiter_engine",
-        "@maven//:org_junit_platform_junit_platform_commons",
-        "@maven//:org_junit_platform_junit_platform_runner",
-    ],
-)
-
 [
     [
         #
@@ -368,7 +351,6 @@ java_test(
                 ],
                 exclude = [
                     module_prefix_test,
-                    contract_keys_test,
                 ],
             ),
             test_class = "com.daml.AllTests",

diff --git a/language-support/java/codegen/src/it/daml/Lib_1_6.daml b/language-support/java/codegen/src/it/daml/Lib_1_6.daml
diff --git a/language-support/java/codegen/src/it/daml/Lib_1_7.daml b/language-support/java/codegen/src/it/daml/Lib_1_7.daml
diff --git a/language-support/java/codegen/src/it/daml/Lib_1_8.daml b/language-support/java/codegen/src/it/daml/Lib_1_8.daml
diff --git a/language-support/java/codegen/src/it/daml/Lib_1_dev.daml b/language-support/java/codegen/src/it/daml/Lib_1_dev.daml
diff --git a/...rt/java/codegen/src/it/daml/Lib_1_12.daml → ...ort/java/codegen/src/it/daml/Lib_2_1.daml b/...rt/java/codegen/src/it/daml/Lib_1_12.daml → ...ort/java/codegen/src/it/daml/Lib_2_1.daml
@@ -2,7 +2,7 @@
 -- SPDX-License-Identifier: Apache-2.0
 
 
-module Lib_1_12 where
+module Lib_2_1 where
 
 import Tests.Template1()
 import Tests.Template2()
@@ -16,6 +16,5 @@ import Tests.Import()
 import Tests.Escape()
 import Tests.TextMapTest()
 import Tests.GenMapTest()
-import Tests.ContractKeys()
 import Tests.ParametersOrder()
 import Tests.UpgradeTest()
diff --git a/...rt/java/codegen/src/it/daml/Lib_1_11.daml → ...t/java/codegen/src/it/daml/Lib_2_dev.daml b/...rt/java/codegen/src/it/daml/Lib_1_11.daml → ...t/java/codegen/src/it/daml/Lib_2_dev.daml
@@ -2,7 +2,7 @@
 -- SPDX-License-Identifier: Apache-2.0
 
 
-module Lib_1_11 where
+module Lib_2_dev where
 
 import Tests.Template1()
 import Tests.Template2()

diff --git a/language-support/java/codegen/src/it/java-1.11/com/daml/AllTests.java b/language-support/java/codegen/src/it/java-1.11/com/daml/AllTests.java