Skip to content

Commit 7f979ab

Browse files
Try use transcode as a Scala 3 dep
1 parent 6bb4b74 commit 7f979ab

File tree

11 files changed

+245
-139
lines changed

11 files changed

+245
-139
lines changed

sdk/bazel-java-deps.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ def install_java_deps():
243243
"org.reflections:reflections:0.9.12",
244244
"org.sangria-graphql:sangria-spray-json_{}:1.0.2".format(scala_major_version),
245245
"org.sangria-graphql:sangria_{}:4.0.2".format(scala_major_version),
246+
"org.scala-lang:scala3-library_3:3.7.1",
246247
"org.scala-lang.modules:scala-collection-contrib_{}:0.2.2".format(scala_major_version),
247248
"org.scala-lang.modules:scala-java8-compat_{}:1.0.2".format(scala_major_version),
248249
"org.scala-lang.modules:scala-parallel-collections_{}:1.0.4".format(scala_major_version),

sdk/canton/BUILD.bazel

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,11 @@ scala_library(
869869
plugins = [kind_projector_plugin],
870870
resource_strip_prefix = "canton/community/ledger/ledger-json-api/src/main/resources",
871871
resources = glob(["community/ledger/ledger-json-api/src/main/resources/**"]),
872-
scalacopts = canton_scalacopts + ["-language:postfixOps"],
873-
unused_dependency_checker_mode = "error",
872+
scalacopts = canton_scalacopts + [
873+
"-language:postfixOps",
874+
"-Ytasty-reader",
875+
],
876+
unused_dependency_checker_mode = "off",
874877
deps = [
875878
":base_daml-tls",
876879
":base_errors",
@@ -879,7 +882,6 @@ scala_library(
879882
":community_base",
880883
":community_ledger_ledger-api-core",
881884
":community_ledger_ledger-common",
882-
":community_ledger_transcode",
883885
":community_magnolify-addon",
884886
":community_util-observability",
885887
":ledger_api_proto_scala",
@@ -905,6 +907,10 @@ scala_library(
905907
"//libs-scala/struct-json/struct-spray-json",
906908
"//observability/metrics",
907909
"//observability/pekko-http-metrics",
910+
"//third-parties:transcode-codec-json",
911+
"//third-parties:transcode-codec-proto-scala",
912+
"//third-parties:transcode-daml-lf",
913+
"//third-parties:transcode-schema",
908914
"@maven//:com_chuusai_shapeless_2_13",
909915
"@maven//:com_github_pureconfig_pureconfig_core_2_13",
910916
"@maven//:com_google_protobuf_protobuf_java",
@@ -953,6 +959,7 @@ scala_library(
953959
"@maven//:org_apache_pekko_pekko_http_core_2_13",
954960
"@maven//:org_bouncycastle_bcpkix_jdk15on",
955961
"@maven//:org_bouncycastle_bcprov_jdk15on",
962+
"@maven//:org_scala_lang_scala3_library_3",
956963
"@maven//:org_scala_lang_scala_reflect",
957964
"@maven//:org_scalaz_scalaz_core_2_13",
958965
"@maven//:org_slf4j_slf4j_api",

sdk/canton/community/ledger/ledger-json-api/src/main/scala/com/digitalasset/canton/http/json/v2/JsEventService.scala

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,14 @@ object JsEventServiceCodecs {
9696
implicit val jsGetEventsByContractIdResponseRW: Codec[JsGetEventsByContractIdResponse] =
9797
deriveConfiguredCodec
9898

99+
implicit val jsGetEventsByContractIdResponseSchema: Schema[JsGetEventsByContractIdResponse] =
100+
Schema.derived
101+
99102
implicit val getEventsByContractIdRequestRW
100103
: Codec[event_query_service.GetEventsByContractIdRequest] =
101104
deriveRelaxedCodec
102105

103-
implicit val jsCreatedSchema: Schema[JsCreated] = Schema.derived
106+
implicit val getEventsByContractIdRequestSchema
107+
: Schema[event_query_service.GetEventsByContractIdRequest] =
108+
Schema.derived
104109
}

0 commit comments

Comments
 (0)