diff --git a/bazel-java-deps.bzl b/bazel-java-deps.bzl index cc76710d914c..3f99d9cf3b11 100644 --- a/bazel-java-deps.bzl +++ b/bazel-java-deps.bzl @@ -53,7 +53,7 @@ def install_java_deps(): "com.google.code.gson:gson:2.8.2", "com.google.guava:guava:29.0-jre", "com.h2database:h2:2.1.210", - "com.lihaoyi:pprint_{}:0.6.0".format(scala_major_version), + "com.lihaoyi:pprint_{}:0.7.1".format(scala_major_version), "com.lihaoyi:sjsonnet_{}:0.3.0".format(scala_major_version), "commons-io:commons-io:2.5", "com.oracle.database.jdbc:ojdbc8:19.8.0.0", diff --git a/ledger/ledger-api-bench-tool/src/main/scala/com/daml/ledger/api/benchtool/LedgerApiBenchTool.scala b/ledger/ledger-api-bench-tool/src/main/scala/com/daml/ledger/api/benchtool/LedgerApiBenchTool.scala index 1916117302ac..631bdcd6aa9e 100644 --- a/ledger/ledger-api-bench-tool/src/main/scala/com/daml/ledger/api/benchtool/LedgerApiBenchTool.scala +++ b/ledger/ledger-api-bench-tool/src/main/scala/com/daml/ledger/api/benchtool/LedgerApiBenchTool.scala @@ -11,7 +11,6 @@ import com.daml.ledger.resources.{ResourceContext, ResourceOwner} import io.grpc.Channel import io.grpc.netty.{NegotiationType, NettyChannelBuilder} import org.slf4j.{Logger, LoggerFactory} -import pprint.PPrinter import java.util.concurrent.{ ArrayBlockingQueue, @@ -146,6 +145,6 @@ object LedgerApiBenchTool { ) private val logger: Logger = LoggerFactory.getLogger(getClass) - private val printer: PPrinter = pprint.PPrinter(200, 1000) + private val printer = pprint.PPrinter.BlackWhite private def prettyPrint(x: Any): String = printer(x).toString() } diff --git a/maven_install_2.13.json b/maven_install_2.13.json index ce0aca2aa9df..363cbaeaf88e 100644 --- a/maven_install_2.13.json +++ b/maven_install_2.13.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": 2098817920, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1843079305, "conflict_resolution": {}, "dependencies": [ { @@ -1175,44 +1175,44 @@ "url": "https://repo1.maven.org/maven2/com/h2database/h2/2.1.210/h2-2.1.210-sources.jar" }, { - "coord": "com.lihaoyi:fansi_2.13:0.2.9", + "coord": "com.lihaoyi:fansi_2.13:0.3.0", "dependencies": [ - "com.lihaoyi:sourcecode_2.13:0.2.1" + "com.lihaoyi:sourcecode_2.13:0.2.7" ], "directDependencies": [ - "com.lihaoyi:sourcecode_2.13:0.2.1" + "com.lihaoyi:sourcecode_2.13:0.2.7" ], - "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.2.9/fansi_2.13-0.2.9.jar", + "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.3.0/fansi_2.13-0.3.0.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.2.9/fansi_2.13-0.2.9.jar" + "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.3.0/fansi_2.13-0.3.0.jar" ], - "sha256": "c347b6452152cf55d401090d3d3c230d96a5f9b6792d1bdb9b760e0d5187ed30", - "url": "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.2.9/fansi_2.13-0.2.9.jar" + "sha256": "2f1d4cdd8971ef2cca8c37da8a04cb0ecf94bc89e59c6383185e88cde21f2e86", + "url": "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.3.0/fansi_2.13-0.3.0.jar" }, { - "coord": "com.lihaoyi:fansi_2.13:jar:sources:0.2.9", + "coord": "com.lihaoyi:fansi_2.13:jar:sources:0.3.0", "dependencies": [ - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], "directDependencies": [ - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], - "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.2.9/fansi_2.13-0.2.9-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.3.0/fansi_2.13-0.3.0-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.2.9/fansi_2.13-0.2.9-sources.jar" + "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.3.0/fansi_2.13-0.3.0-sources.jar" ], - "sha256": "56e5c87e37267d4c2fcc955ddc95596dcd79bcbe13d343f0cdcc01e538492054", - "url": "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.2.9/fansi_2.13-0.2.9-sources.jar" + "sha256": "9c3bc0d9cf55541edfffcfbce818fdda20bf60238d279327bb47d80767e0bea3", + "url": "https://repo1.maven.org/maven2/com/lihaoyi/fansi_2.13/0.3.0/fansi_2.13-0.3.0-sources.jar" }, { "coord": "com.lihaoyi:fastparse_2.13:2.3.0", "dependencies": [ - "com.lihaoyi:sourcecode_2.13:0.2.1", + "com.lihaoyi:sourcecode_2.13:0.2.7", "com.lihaoyi:geny_2.13:0.6.2" ], "directDependencies": [ "com.lihaoyi:geny_2.13:0.6.2", - "com.lihaoyi:sourcecode_2.13:0.2.1" + "com.lihaoyi:sourcecode_2.13:0.2.7" ], "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/fastparse_2.13/2.3.0/fastparse_2.13-2.3.0.jar", "mirror_urls": [ @@ -1225,11 +1225,11 @@ "coord": "com.lihaoyi:fastparse_2.13:jar:sources:2.3.0", "dependencies": [ "com.lihaoyi:geny_2.13:jar:sources:0.6.2", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], "directDependencies": [ "com.lihaoyi:geny_2.13:jar:sources:0.6.2", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/fastparse_2.13/2.3.0/fastparse_2.13-2.3.0-sources.jar", "mirror_urls": [ @@ -1291,48 +1291,48 @@ "url": "https://repo1.maven.org/maven2/com/lihaoyi/os-lib_2.13/0.7.1/os-lib_2.13-0.7.1-sources.jar" }, { - "coord": "com.lihaoyi:pprint_2.13:0.6.0", + "coord": "com.lihaoyi:pprint_2.13:0.7.1", "dependencies": [ - "com.lihaoyi:sourcecode_2.13:0.2.1", - "com.lihaoyi:fansi_2.13:0.2.9" + "com.lihaoyi:sourcecode_2.13:0.2.7", + "com.lihaoyi:fansi_2.13:0.3.0" ], "directDependencies": [ - "com.lihaoyi:fansi_2.13:0.2.9", - "com.lihaoyi:sourcecode_2.13:0.2.1" + "com.lihaoyi:fansi_2.13:0.3.0", + "com.lihaoyi:sourcecode_2.13:0.2.7" ], - "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.6.0/pprint_2.13-0.6.0.jar", + "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.7.1/pprint_2.13-0.7.1.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.6.0/pprint_2.13-0.6.0.jar" + "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.7.1/pprint_2.13-0.7.1.jar" ], - "sha256": "6bc908b7acb825bc0ce1148a1a417ab1b75335c98749e6e2d2ad3d09604e3701", - "url": "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.6.0/pprint_2.13-0.6.0.jar" + "sha256": "261fd6fc54b5962e26295d37093100deae9d1fd6b4824326fcc439e17f9222a2", + "url": "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.7.1/pprint_2.13-0.7.1.jar" }, { - "coord": "com.lihaoyi:pprint_2.13:jar:sources:0.6.0", + "coord": "com.lihaoyi:pprint_2.13:jar:sources:0.7.1", "dependencies": [ - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1", - "com.lihaoyi:fansi_2.13:jar:sources:0.2.9" + "com.lihaoyi:fansi_2.13:jar:sources:0.3.0", + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], "directDependencies": [ - "com.lihaoyi:fansi_2.13:jar:sources:0.2.9", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:fansi_2.13:jar:sources:0.3.0", + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], - "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.6.0/pprint_2.13-0.6.0-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.7.1/pprint_2.13-0.7.1-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.6.0/pprint_2.13-0.6.0-sources.jar" + "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.7.1/pprint_2.13-0.7.1-sources.jar" ], - "sha256": "275253de7b118f809d45f63f73187d3e0ee47b80963e5557b9f404f319e0c4c1", - "url": "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.6.0/pprint_2.13-0.6.0-sources.jar" + "sha256": "f5e9ff1ddb3708e39d93993b216309b61be6f59ce64f933dde01c2f66192e4ee", + "url": "https://repo1.maven.org/maven2/com/lihaoyi/pprint_2.13/0.7.1/pprint_2.13-0.7.1-sources.jar" }, { "coord": "com.lihaoyi:scalatags_2.13:0.9.1", "dependencies": [ - "com.lihaoyi:sourcecode_2.13:0.2.1", + "com.lihaoyi:sourcecode_2.13:0.2.7", "com.lihaoyi:geny_2.13:0.6.2" ], "directDependencies": [ "com.lihaoyi:geny_2.13:0.6.2", - "com.lihaoyi:sourcecode_2.13:0.2.1" + "com.lihaoyi:sourcecode_2.13:0.2.7" ], "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/scalatags_2.13/0.9.1/scalatags_2.13-0.9.1.jar", "mirror_urls": [ @@ -1345,11 +1345,11 @@ "coord": "com.lihaoyi:scalatags_2.13:jar:sources:0.9.1", "dependencies": [ "com.lihaoyi:geny_2.13:jar:sources:0.6.2", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], "directDependencies": [ "com.lihaoyi:geny_2.13:jar:sources:0.6.2", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1" + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7" ], "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/scalatags_2.13/0.9.1/scalatags_2.13-0.9.1-sources.jar", "mirror_urls": [ @@ -1361,14 +1361,14 @@ { "coord": "com.lihaoyi:sjsonnet_2.13:0.3.0", "dependencies": [ - "com.lihaoyi:pprint_2.13:0.6.0", - "com.lihaoyi:sourcecode_2.13:0.2.1", - "com.lihaoyi:fansi_2.13:0.2.9", + "com.lihaoyi:pprint_2.13:0.7.1", + "com.lihaoyi:fansi_2.13:0.3.0", "com.github.scopt:scopt_2.13:4.0.0", "org.scala-lang:scala-library:2.13.6", "com.lihaoyi:os-lib_2.13:0.7.1", "org.tukaani:xz:1.8", "com.lihaoyi:fastparse_2.13:2.3.0", + "com.lihaoyi:sourcecode_2.13:0.2.7", "com.lihaoyi:upickle-core_2.13:1.2.0", "com.lihaoyi:ujson_2.13:1.2.0", "com.lihaoyi:scalatags_2.13:0.9.1", @@ -1376,7 +1376,7 @@ "com.lihaoyi:geny_2.13:0.6.2" ], "directDependencies": [ - "com.lihaoyi:pprint_2.13:0.6.0", + "com.lihaoyi:pprint_2.13:0.7.1", "com.github.scopt:scopt_2.13:4.0.0", "com.lihaoyi:os-lib_2.13:0.7.1", "org.tukaani:xz:1.8", @@ -1395,7 +1395,6 @@ { "coord": "com.lihaoyi:sjsonnet_2.13:jar:sources:0.3.0", "dependencies": [ - "com.lihaoyi:fansi_2.13:jar:sources:0.2.9", "com.lihaoyi:fastparse_2.13:jar:sources:2.3.0", "com.lihaoyi:scalatags_2.13:jar:sources:0.9.1", "org.tukaani:xz:jar:sources:1.8", @@ -1403,10 +1402,11 @@ "com.lihaoyi:os-lib_2.13:jar:sources:0.7.1", "com.github.scopt:scopt_2.13:jar:sources:4.0.0", "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", - "com.lihaoyi:pprint_2.13:jar:sources:0.6.0", + "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7", + "com.lihaoyi:fansi_2.13:jar:sources:0.3.0", "com.lihaoyi:ujson_2.13:jar:sources:1.2.0", "com.lihaoyi:upickle-core_2.13:jar:sources:1.2.0", - "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1", + "com.lihaoyi:pprint_2.13:jar:sources:0.7.1", "com.lihaoyi:geny_2.13:jar:sources:0.6.2" ], "directDependencies": [ @@ -1416,8 +1416,8 @@ "com.lihaoyi:os-lib_2.13:jar:sources:0.7.1", "com.github.scopt:scopt_2.13:jar:sources:4.0.0", "org.scala-lang.modules:scala-collection-compat_2.13:jar:sources:2.3.2", - "com.lihaoyi:pprint_2.13:jar:sources:0.6.0", - "com.lihaoyi:ujson_2.13:jar:sources:1.2.0" + "com.lihaoyi:ujson_2.13:jar:sources:1.2.0", + "com.lihaoyi:pprint_2.13:jar:sources:0.7.1" ], "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/sjsonnet_2.13/0.3.0/sjsonnet_2.13-0.3.0-sources.jar", "mirror_urls": [ @@ -1427,26 +1427,26 @@ "url": "https://repo1.maven.org/maven2/com/lihaoyi/sjsonnet_2.13/0.3.0/sjsonnet_2.13-0.3.0-sources.jar" }, { - "coord": "com.lihaoyi:sourcecode_2.13:0.2.1", + "coord": "com.lihaoyi:sourcecode_2.13:0.2.7", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.1/sourcecode_2.13-0.2.1.jar", + "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.7/sourcecode_2.13-0.2.7.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.1/sourcecode_2.13-0.2.1.jar" + "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.7/sourcecode_2.13-0.2.7.jar" ], - "sha256": "f18739c68e4f71853540ffeb4f162b223258508215a36c3be1e12cd28b21af50", - "url": "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.1/sourcecode_2.13-0.2.1.jar" + "sha256": "a639a90e2d21bbafd8a5e213c65442aad200ee086951605cbda8835bc6ef11d3", + "url": "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.7/sourcecode_2.13-0.2.7.jar" }, { - "coord": "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.1", + "coord": "com.lihaoyi:sourcecode_2.13:jar:sources:0.2.7", "dependencies": [], "directDependencies": [], - "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.1/sourcecode_2.13-0.2.1-sources.jar", + "file": "v1/https/repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.7/sourcecode_2.13-0.2.7-sources.jar", "mirror_urls": [ - "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.1/sourcecode_2.13-0.2.1-sources.jar" + "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.7/sourcecode_2.13-0.2.7-sources.jar" ], - "sha256": "958af37ade319c9d1b8fa27d904d66578c4b5d86c917979d73a77f11fc76c1ad", - "url": "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.1/sourcecode_2.13-0.2.1-sources.jar" + "sha256": "e4cae365cd26b19ffb1491472cbc91ed853bb2a1cbbcc8176d0187affebd8bbe", + "url": "https://repo1.maven.org/maven2/com/lihaoyi/sourcecode_2.13/0.2.7/sourcecode_2.13-0.2.7-sources.jar" }, { "coord": "com.lihaoyi:ujson_2.13:1.2.0",