From eb517905bac62fd1d98b371e4828f4fb9450d4c5 Mon Sep 17 00:00:00 2001 From: Tiago Quelhas Date: Thu, 11 Jan 2024 18:09:19 +0000 Subject: [PATCH] [7.1.0] Add fastutil 7.2.1 dependency (#20854) Closes #20394. PiperOrigin-RevId: 586723311 Change-Id: I4a12af0d3a728686b6db3852f2e4740c888fd2d2 Co-authored-by: Justin Horvitz --- MODULE.bazel | 1 + MODULE.bazel.lock | 65 ++++++++++++++++++++++++++++------------------ maven_install.json | 24 +++++++++++++++-- third_party/BUILD | 5 ++++ 4 files changed, 68 insertions(+), 27 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 03f1dce5d811cf..7c958cfcd323d5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -138,6 +138,7 @@ maven.install( "io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final", "io.netty:netty-transport:4.1.93.Final", "io.reactivex.rxjava3:rxjava:3.1.2", + "it.unimi.dsi:fastutil:7.2.1", "javax.activation:javax.activation-api:1.2.0", "javax.annotation:javax.annotation-api:1.3.2", "javax.inject:javax.inject:1", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 3646c7e15bfa9c..ea3bea3221fa12 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "63625ac7809ba5bc83e0814e16f223ac28a98df884897ddd5bfbd69fd4e3ddbf", + "moduleFileHash": "1ce286c2e04a814940dcb741cddee8772a3d8b97d22e12ee12e116dac57f1cd3", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -127,6 +127,7 @@ "io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final", "io.netty:netty-transport:4.1.93.Final", "io.reactivex.rxjava3:rxjava:3.1.2", + "it.unimi.dsi:fastutil:7.2.1", "javax.activation:javax.activation-api:1.2.0", "javax.annotation:javax.annotation-api:1.3.2", "javax.inject:javax.inject:1", @@ -182,7 +183,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -197,7 +198,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -212,7 +213,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -227,7 +228,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -242,7 +243,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -257,7 +258,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -272,7 +273,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -287,7 +288,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -302,7 +303,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 188, + "line": 189, "column": 19 } }, @@ -330,7 +331,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 321, + "line": 322, "column": 22 } } @@ -344,7 +345,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 209, + "line": 210, "column": 32 }, "imports": { @@ -384,7 +385,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 243, + "line": 244, "column": 23 }, "imports": {}, @@ -398,7 +399,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 244, + "line": 245, "column": 17 } } @@ -412,7 +413,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 246, + "line": 247, "column": 20 }, "imports": { @@ -430,7 +431,7 @@ "devDependency": false, "location": { "file": "@@//:MODULE.bazel", - "line": 247, + "line": 248, "column": 10 } } @@ -444,7 +445,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 258, + "line": 259, "column": 33 }, "imports": { @@ -475,7 +476,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 279, + "line": 280, "column": 29 }, "imports": { @@ -492,7 +493,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 286, + "line": 287, "column": 32 }, "imports": { @@ -511,7 +512,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 294, + "line": 295, "column": 31 }, "imports": { @@ -528,7 +529,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 297, + "line": 298, "column": 48 }, "imports": { @@ -545,7 +546,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 343, + "line": 344, "column": 35 }, "imports": { @@ -562,7 +563,7 @@ "usingModule": "", "location": { "file": "@@//:MODULE.bazel", - "line": 346, + "line": 347, "column": 42 }, "imports": { @@ -2180,7 +2181,7 @@ "bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=", "accumulatedFileDigests": { "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "10b96bd3c1eb194b0efe3a13fd06f2051abf36efb33414ad92048883ba471c7f", - "@@//:MODULE.bazel": "63625ac7809ba5bc83e0814e16f223ac28a98df884897ddd5bfbd69fd4e3ddbf" + "@@//:MODULE.bazel": "1ce286c2e04a814940dcb741cddee8772a3d8b97d22e12ee12e116dac57f1cd3" }, "envVariables": {}, "generatedRepoSpecs": { @@ -4241,7 +4242,7 @@ "general": { "bzlTransitiveDigest": "WAWsskOl4eHIskcL0TuHZGIMjV8sMJaAbAo2luMqofo=", "accumulatedFileDigests": { - "@@//:maven_install.json": "cc2396f3421ceaeca5bf2852dc5aa14b83e5a918f4c3dee5a1214b127214584c", + "@@//:maven_install.json": "cd50b13026ebe6ade5f55d893de893f4568b475291cf9295412b380810a6ac6f", "@@rules_jvm_external~5.2//:rules_jvm_external_deps_install.json": "3ab1f67b0de4815df110bc72ccd6c77882b3b21d3d1e0a84445847b6ce3235a3", "@@//src/tools/android:maven_android_install.json": "09bff3e33d291336046f7c9201630fb5e014f0e60b78b6f09b84e4f5f73ed04f" }, @@ -4831,6 +4832,7 @@ "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }", "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport\", \"version\": \"4.1.93.Final\" }", "{ \"group\": \"io.reactivex.rxjava3\", \"artifact\": \"rxjava\", \"version\": \"3.1.2\" }", + "{ \"group\": \"it.unimi.dsi\", \"artifact\": \"fastutil\", \"version\": \"7.2.1\" }", "{ \"group\": \"javax.activation\", \"artifact\": \"javax.activation-api\", \"version\": \"1.2.0\" }", "{ \"group\": \"javax.annotation\", \"artifact\": \"javax.annotation-api\", \"version\": \"1.3.2\" }", "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }", @@ -6368,6 +6370,18 @@ "downloaded_file_path": "com/beust/jcommander/1.82/jcommander-1.82.jar" } }, + "it_unimi_dsi_fastutil_7_2_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~5.2~maven~it_unimi_dsi_fastutil_7_2_1", + "sha256": "d73dec5ec18f973f380869b6125d60f5cda77cf6e40e321bd06e0308ed0a40b7", + "urls": [ + "https://repo1.maven.org/maven2/it/unimi/dsi/fastutil/7.2.1/fastutil-7.2.1.jar" + ], + "downloaded_file_path": "it/unimi/dsi/fastutil/7.2.1/fastutil-7.2.1.jar" + } + }, "androidx_databinding_databinding_common_3_4_0_alpha10": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", @@ -7342,6 +7356,7 @@ "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport-native-unix-common\", \"version\": \"4.1.93.Final\", \"packaging\": \"jar\", \"classifier\": \"osx-x86_64\" }", "{ \"group\": \"io.netty\", \"artifact\": \"netty-transport\", \"version\": \"4.1.93.Final\" }", "{ \"group\": \"io.reactivex.rxjava3\", \"artifact\": \"rxjava\", \"version\": \"3.1.2\" }", + "{ \"group\": \"it.unimi.dsi\", \"artifact\": \"fastutil\", \"version\": \"7.2.1\" }", "{ \"group\": \"javax.activation\", \"artifact\": \"javax.activation-api\", \"version\": \"1.2.0\" }", "{ \"group\": \"javax.annotation\", \"artifact\": \"javax.annotation-api\", \"version\": \"1.3.2\" }", "{ \"group\": \"javax.inject\", \"artifact\": \"javax.inject\", \"version\": \"1\" }", diff --git a/maven_install.json b/maven_install.json index 46f3bf2d0ae1fc..f0f138f92fb87f 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,7 +1,7 @@ { "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", - "__INPUT_ARTIFACTS_HASH": 1631956901, - "__RESOLVED_ARTIFACTS_HASH": -1555815775, + "__INPUT_ARTIFACTS_HASH": -2080944044, + "__RESOLVED_ARTIFACTS_HASH": -166480638, "conflict_resolution": { "com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.9.0", "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.22.0", @@ -532,6 +532,12 @@ }, "version": "1.0.0" }, + "it.unimi.dsi:fastutil": { + "shasums": { + "jar": "d73dec5ec18f973f380869b6125d60f5cda77cf6e40e321bd06e0308ed0a40b7" + }, + "version": "7.2.1" + }, "javax.activation:javax.activation-api": { "shasums": { "jar": "43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393" @@ -1817,6 +1823,19 @@ "io.sweers.autotransient:autotransient": [ "io.sweers.autotransient" ], + "it.unimi.dsi:fastutil": [ + "it.unimi.dsi.fastutil", + "it.unimi.dsi.fastutil.booleans", + "it.unimi.dsi.fastutil.bytes", + "it.unimi.dsi.fastutil.chars", + "it.unimi.dsi.fastutil.doubles", + "it.unimi.dsi.fastutil.floats", + "it.unimi.dsi.fastutil.ints", + "it.unimi.dsi.fastutil.io", + "it.unimi.dsi.fastutil.longs", + "it.unimi.dsi.fastutil.objects", + "it.unimi.dsi.fastutil.shorts" + ], "javax.activation:javax.activation-api": [ "javax.activation" ], @@ -2260,6 +2279,7 @@ "io.perfmark:perfmark-api", "io.reactivex.rxjava3:rxjava", "io.sweers.autotransient:autotransient", + "it.unimi.dsi:fastutil", "javax.activation:javax.activation-api", "javax.annotation:javax.annotation-api", "javax.inject:javax.inject", diff --git a/third_party/BUILD b/third_party/BUILD index b7a75a1bcf34b6..74a9dc65bbd5a6 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -278,6 +278,11 @@ alias( actual = "@maven//:com_github_ben_manes_caffeine_caffeine", ) +alias( + name = "fastutil", + actual = "@maven//:it_unimi_dsi_fastutil_7_2_1", +) + alias( name = "hungarian_algorithm", actual = "@maven//:com_github_kevinstern_software_and_algorithms",