mirror of
https://github.com/digital-asset/daml.git
synced 2024-09-20 01:07:18 +03:00
Fix IJ project sync (#19240)
This commit is contained in:
parent
7b838a8277
commit
b54cbd22c0
@ -14,8 +14,8 @@ genrule(
|
|||||||
"//canton:bindings-java_pom.xml",
|
"//canton:bindings-java_pom.xml",
|
||||||
"//language-support/java/bindings-rxjava:libbindings-rxjava.jar",
|
"//language-support/java/bindings-rxjava:libbindings-rxjava.jar",
|
||||||
"//language-support/java/bindings-rxjava:bindings-rxjava_pom.xml",
|
"//language-support/java/bindings-rxjava:bindings-rxjava_pom.xml",
|
||||||
"//language-support/java/codegen:shaded_binary.jar",
|
"//language-support/java/codegen:binary.jar",
|
||||||
"//language-support/java/codegen:shaded_binary_pom.xml",
|
"//language-support/java/codegen:binary_pom.xml",
|
||||||
"//libs-scala/rs-grpc-bridge:librs-grpc-bridge.jar",
|
"//libs-scala/rs-grpc-bridge:librs-grpc-bridge.jar",
|
||||||
"//libs-scala/rs-grpc-bridge:rs-grpc-bridge_pom.xml",
|
"//libs-scala/rs-grpc-bridge:rs-grpc-bridge_pom.xml",
|
||||||
"//docs:quickstart-java.tar.gz",
|
"//docs:quickstart-java.tar.gz",
|
||||||
@ -52,8 +52,8 @@ genrule(
|
|||||||
$(location //language-support/java/bindings-rxjava:bindings-rxjava_pom.xml)
|
$(location //language-support/java/bindings-rxjava:bindings-rxjava_pom.xml)
|
||||||
install_mvn \\
|
install_mvn \\
|
||||||
"com.daml" "codegen-java" \\
|
"com.daml" "codegen-java" \\
|
||||||
$(location //language-support/java/codegen:shaded_binary.jar) \\
|
$(location //language-support/java/codegen:binary.jar) \\
|
||||||
$(location //language-support/java/codegen:shaded_binary_pom.xml)
|
$(location //language-support/java/codegen:binary_pom.xml)
|
||||||
install_mvn \\
|
install_mvn \\
|
||||||
"com.daml" "rs-grpc-bridge" \\
|
"com.daml" "rs-grpc-bridge" \\
|
||||||
$(location //libs-scala/rs-grpc-bridge:librs-grpc-bridge.jar) \\
|
$(location //libs-scala/rs-grpc-bridge:librs-grpc-bridge.jar) \\
|
||||||
|
@ -8,12 +8,9 @@ load(
|
|||||||
"scala_source_jar",
|
"scala_source_jar",
|
||||||
"scaladoc_jar",
|
"scaladoc_jar",
|
||||||
)
|
)
|
||||||
load(
|
|
||||||
"@com_github_johnynek_bazel_jar_jar//:jar_jar.bzl",
|
|
||||||
"jar_jar",
|
|
||||||
)
|
|
||||||
load("//bazel_tools:pom_file.bzl", "pom_file")
|
load("//bazel_tools:pom_file.bzl", "pom_file")
|
||||||
load("@os_info//:os_info.bzl", "is_windows")
|
load("@os_info//:os_info.bzl", "is_windows")
|
||||||
|
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
|
||||||
|
|
||||||
da_scala_library(
|
da_scala_library(
|
||||||
name = "codegen-main-lib",
|
name = "codegen-main-lib",
|
||||||
@ -52,23 +49,24 @@ da_scala_binary(
|
|||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
jar_jar(
|
copy_file(
|
||||||
name = "shaded_binary",
|
name = "binary",
|
||||||
input_jar = "//language-support/codegen-main:codegen-main_distribute.jar",
|
src = "//language-support/codegen-main:codegen-main_distribute.jar",
|
||||||
rules = "shade_rule",
|
out = "binary.jar",
|
||||||
|
allow_symlink = True,
|
||||||
tags = ["maven_coordinates=com.daml:codegen-jvm-main:__VERSION__"],
|
tags = ["maven_coordinates=com.daml:codegen-jvm-main:__VERSION__"],
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
pom_file(
|
pom_file(
|
||||||
name = "shaded_binary_pom",
|
name = "binary_pom",
|
||||||
target = ":shaded_binary",
|
target = ":binary",
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create empty Scaladoc JAR for uploading to Maven Central
|
# Create empty Scaladoc JAR for uploading to Maven Central
|
||||||
scaladoc_jar(
|
scaladoc_jar(
|
||||||
name = "shaded_binary_scaladoc",
|
name = "binary_scaladoc",
|
||||||
srcs = [],
|
srcs = [],
|
||||||
tags = ["scaladoc"],
|
tags = ["scaladoc"],
|
||||||
deps = [],
|
deps = [],
|
||||||
@ -76,6 +74,6 @@ scaladoc_jar(
|
|||||||
|
|
||||||
# Create empty Sources JAR for uploading to Maven Central
|
# Create empty Sources JAR for uploading to Maven Central
|
||||||
scala_source_jar(
|
scala_source_jar(
|
||||||
name = "shaded_binary_src",
|
name = "binary_src",
|
||||||
srcs = [],
|
srcs = [],
|
||||||
)
|
)
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
zap grpc.health.v1.**
|
|
||||||
zap io.grpc.**
|
|
||||||
zap io.netty.**
|
|
||||||
zap io.reactivex.**
|
|
||||||
zap org.reactivestreams.**
|
|
||||||
zap com.sun.**
|
|
||||||
zap javax.**
|
|
||||||
zap sun.**
|
|
@ -28,12 +28,9 @@ load(
|
|||||||
"lf_version_default_or_latest",
|
"lf_version_default_or_latest",
|
||||||
"lf_version_is_dev",
|
"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("//bazel_tools:pom_file.bzl", "pom_file")
|
||||||
load("@os_info//:os_info.bzl", "is_windows")
|
load("@os_info//:os_info.bzl", "is_windows")
|
||||||
|
load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
|
||||||
|
|
||||||
da_scala_binary(
|
da_scala_binary(
|
||||||
name = "codegen",
|
name = "codegen",
|
||||||
@ -168,23 +165,24 @@ dar_to_java(
|
|||||||
package_prefix = "ut",
|
package_prefix = "ut",
|
||||||
)
|
)
|
||||||
|
|
||||||
jar_jar(
|
copy_file(
|
||||||
name = "shaded_binary",
|
name = "binary",
|
||||||
input_jar = "//language-support/java/codegen:codegen_distribute.jar",
|
src = "//language-support/java/codegen:codegen_distribute.jar",
|
||||||
rules = "shade_rule",
|
out = "binary.jar",
|
||||||
|
allow_symlink = True,
|
||||||
tags = ["maven_coordinates=com.daml:codegen-java:__VERSION__"],
|
tags = ["maven_coordinates=com.daml:codegen-java:__VERSION__"],
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
pom_file(
|
pom_file(
|
||||||
name = "shaded_binary_pom",
|
name = "binary_pom",
|
||||||
target = ":shaded_binary",
|
target = ":binary",
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
)
|
)
|
||||||
|
|
||||||
# Create empty Scaladoc JAR for uploading to Maven Central
|
# Create empty Scaladoc JAR for uploading to Maven Central
|
||||||
scaladoc_jar(
|
scaladoc_jar(
|
||||||
name = "shaded_binary_scaladoc",
|
name = "binary_scaladoc",
|
||||||
srcs = [],
|
srcs = [],
|
||||||
tags = ["scaladoc"],
|
tags = ["scaladoc"],
|
||||||
deps = [],
|
deps = [],
|
||||||
@ -192,7 +190,7 @@ scaladoc_jar(
|
|||||||
|
|
||||||
# Create empty Sources JAR for uploading to Maven Central
|
# Create empty Sources JAR for uploading to Maven Central
|
||||||
scala_source_jar(
|
scala_source_jar(
|
||||||
name = "shaded_binary_src",
|
name = "binary_src",
|
||||||
srcs = [],
|
srcs = [],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
zap grpc.health.v1.**
|
|
||||||
zap io.grpc.**
|
|
||||||
zap io.netty.**
|
|
||||||
zap io.reactivex.**
|
|
||||||
zap org.reactivestreams.**
|
|
||||||
zap com.sun.**
|
|
||||||
zap javax.**
|
|
||||||
zap sun.**
|
|
@ -53,7 +53,7 @@
|
|||||||
type: jar-scala
|
type: jar-scala
|
||||||
- target: //language-support/codegen-common:codegen-common
|
- target: //language-support/codegen-common:codegen-common
|
||||||
type: jar-scala
|
type: jar-scala
|
||||||
- target: //language-support/codegen-main:shaded_binary
|
- target: //language-support/codegen-main:binary
|
||||||
type: jar-jarjar
|
type: jar-jarjar
|
||||||
- target: //canton:bindings-java
|
- target: //canton:bindings-java
|
||||||
type: jar-lib
|
type: jar-lib
|
||||||
@ -61,7 +61,7 @@
|
|||||||
type: jar-lib
|
type: jar-lib
|
||||||
- target: //language-support/java/codegen:lib
|
- target: //language-support/java/codegen:lib
|
||||||
type: jar-scala
|
type: jar-scala
|
||||||
- target: //language-support/java/codegen:shaded_binary
|
- target: //language-support/java/codegen:binary
|
||||||
type: jar-jarjar
|
type: jar-jarjar
|
||||||
- target: //language-support/java/json:json
|
- target: //language-support/java/json:json
|
||||||
type: jar-scala
|
type: jar-scala
|
||||||
|
Loading…
Reference in New Issue
Block a user