Fix IJ project sync (#19240)

digital-asset · May 21, 2024 · b54cbd2 · b54cbd2
1 parent 7b838a8
commit b54cbd2
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 46 deletions.
diff --git a/sdk/daml-assistant/integration-tests/BUILD.bazel b/sdk/daml-assistant/integration-tests/BUILD.bazel
@@ -14,8 +14,8 @@ genrule(
         "//canton:bindings-java_pom.xml",
         "//language-support/java/bindings-rxjava:libbindings-rxjava.jar",
         "//language-support/java/bindings-rxjava:bindings-rxjava_pom.xml",
-        "//language-support/java/codegen:shaded_binary.jar",
-        "//language-support/java/codegen:shaded_binary_pom.xml",
+        "//language-support/java/codegen:binary.jar",
+        "//language-support/java/codegen:binary_pom.xml",
         "//libs-scala/rs-grpc-bridge:librs-grpc-bridge.jar",
         "//libs-scala/rs-grpc-bridge:rs-grpc-bridge_pom.xml",
         "//docs:quickstart-java.tar.gz",
@@ -52,8 +52,8 @@ genrule(
         $(location //language-support/java/bindings-rxjava:bindings-rxjava_pom.xml)
       install_mvn \\
         "com.daml" "codegen-java" \\
-        $(location //language-support/java/codegen:shaded_binary.jar) \\
-        $(location //language-support/java/codegen:shaded_binary_pom.xml)
+        $(location //language-support/java/codegen:binary.jar) \\
+        $(location //language-support/java/codegen:binary_pom.xml)
       install_mvn \\
         "com.daml" "rs-grpc-bridge" \\
         $(location //libs-scala/rs-grpc-bridge:librs-grpc-bridge.jar) \\

diff --git a/sdk/language-support/codegen-main/BUILD.bazel b/sdk/language-support/codegen-main/BUILD.bazel
@@ -8,12 +8,9 @@ load(
     "scala_source_jar",
     "scaladoc_jar",
 )
-load(
-    "@com_github_johnynek_bazel_jar_jar//:jar_jar.bzl",
-    "jar_jar",
-)
 load("//bazel_tools:pom_file.bzl", "pom_file")
 load("@os_info//:os_info.bzl", "is_windows")
+load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 
 da_scala_library(
     name = "codegen-main-lib",
@@ -52,30 +49,31 @@ da_scala_binary(
     ],
 )
 
-jar_jar(
-    name = "shaded_binary",
-    input_jar = "//language-support/codegen-main:codegen-main_distribute.jar",
-    rules = "shade_rule",
+copy_file(
+    name = "binary",
+    src = "//language-support/codegen-main:codegen-main_distribute.jar",
+    out = "binary.jar",
+    allow_symlink = True,
     tags = ["maven_coordinates=com.daml:codegen-jvm-main:__VERSION__"],
     visibility = ["//visibility:public"],
 )
 
 pom_file(
-    name = "shaded_binary_pom",
-    target = ":shaded_binary",
+    name = "binary_pom",
+    target = ":binary",
     visibility = ["//visibility:public"],
 )
 
 # Create empty Scaladoc JAR for uploading to Maven Central
 scaladoc_jar(
-    name = "shaded_binary_scaladoc",
+    name = "binary_scaladoc",
     srcs = [],
     tags = ["scaladoc"],
     deps = [],
 ) if is_windows == False else None
 
 # Create empty Sources JAR for uploading to Maven Central
 scala_source_jar(
-    name = "shaded_binary_src",
+    name = "binary_src",
     srcs = [],
 )
diff --git a/sdk/language-support/codegen-main/shade_rule b/sdk/language-support/codegen-main/shade_rule
diff --git a/sdk/language-support/java/codegen/BUILD.bazel b/sdk/language-support/java/codegen/BUILD.bazel
@@ -28,12 +28,9 @@ load(
     "lf_version_default_or_latest",
     "lf_version_is_dev",
 )
-load(
-    "@com_github_johnynek_bazel_jar_jar//:jar_jar.bzl",
-    "jar_jar",
-)
 load("//bazel_tools:pom_file.bzl", "pom_file")
 load("@os_info//:os_info.bzl", "is_windows")
+load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 
 da_scala_binary(
     name = "codegen",
@@ -168,31 +165,32 @@ dar_to_java(
     package_prefix = "ut",
 )
 
-jar_jar(
-    name = "shaded_binary",
-    input_jar = "//language-support/java/codegen:codegen_distribute.jar",
-    rules = "shade_rule",
+copy_file(
+    name = "binary",
+    src = "//language-support/java/codegen:codegen_distribute.jar",
+    out = "binary.jar",
+    allow_symlink = True,
     tags = ["maven_coordinates=com.daml:codegen-java:__VERSION__"],
     visibility = ["//visibility:public"],
 )
 
 pom_file(
-    name = "shaded_binary_pom",
-    target = ":shaded_binary",
+    name = "binary_pom",
+    target = ":binary",
     visibility = ["//visibility:public"],
 )
 
 # Create empty Scaladoc JAR for uploading to Maven Central
 scaladoc_jar(
-    name = "shaded_binary_scaladoc",
+    name = "binary_scaladoc",
     srcs = [],
     tags = ["scaladoc"],
     deps = [],
 ) if is_windows == False else None
 
 # Create empty Sources JAR for uploading to Maven Central
 scala_source_jar(
-    name = "shaded_binary_src",
+    name = "binary_src",
     srcs = [],
 )
 

diff --git a/sdk/language-support/java/codegen/shade_rule b/sdk/language-support/java/codegen/shade_rule
diff --git a/sdk/release/artifacts.yaml b/sdk/release/artifacts.yaml
@@ -53,15 +53,15 @@
   type: jar-scala
 - target: //language-support/codegen-common:codegen-common
   type: jar-scala
-- target: //language-support/codegen-main:shaded_binary
+- target: //language-support/codegen-main:binary
   type: jar-jarjar
 - target: //canton:bindings-java
   type: jar-lib
 - target: //language-support/java/bindings-rxjava:bindings-rxjava
   type: jar-lib
 - target: //language-support/java/codegen:lib
   type: jar-scala
-- target: //language-support/java/codegen:shaded_binary
+- target: //language-support/java/codegen:binary
   type: jar-jarjar
 - target: //language-support/java/json:json
   type: jar-scala