Skip to content

Bump upstream from 2bc4ca2 to ec7be9f #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2025
Merged

Bump upstream from 2bc4ca2 to ec7be9f #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion upstream
Open in desktop
Submodule upstream updated 99 files
+5 −5 MODULE.bazel
+17 −10 MODULE.bazel.lock
+4 −4 src/MODULE.tools
+41 −0 src/java_tools/junitrunner/java/com/google/testing/junit/runner/BazelTestRunner.java
+16 −0 src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD
+70 −0 src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/non_daemon_exit_test.sh
+39 −0 src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/NonDaemonThreadTest.java
+21 −0 src/main/java/com/google/devtools/build/lib/BUILD
+1 −0 src/main/java/com/google/devtools/build/lib/bazel/BUILD
+5 −1 src/main/java/com/google/devtools/build/lib/bazel/Bazel.java
+1 −0 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/BUILD
+12 −4 src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java
+3 −4 src/main/java/com/google/devtools/build/lib/bazel/commands/ModCommand.java
+4 −1 src/main/java/com/google/devtools/build/lib/bazel/repository/BUILD
+21 −0 src/main/java/com/google/devtools/build/lib/bazel/repository/RepoDefinitionFunction.java
+5 −0 src/main/java/com/google/devtools/build/lib/bazel/repository/RepoDefinitionValue.java
+4 −12 src/main/java/com/google/devtools/build/lib/bazel/repository/RepositoryFetchFunction.java
+36 −15 src/main/java/com/google/devtools/build/lib/buildtool/BuildTool.java
+1 −0 src/main/java/com/google/devtools/build/lib/remote/merkletree/BUILD
+191 −176 src/main/java/com/google/devtools/build/lib/remote/merkletree/MerkleTreeComputer.java
+2 −2 src/main/java/com/google/devtools/build/lib/rules/apple/ApplePlatform.java
+26 −0 src/main/java/com/google/devtools/build/lib/rules/cpp/DebugPackageProvider.java
+1 −1 src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+13 −13 src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+13 −39 src/main/java/com/google/devtools/build/lib/runtime/BlazeModule.java
+1 −1 src/main/java/com/google/devtools/build/lib/runtime/BlazeOptionHandler.java
+76 −38 src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+28 −9 src/main/java/com/google/devtools/build/lib/runtime/BlazeService.java
+0 −95 src/main/java/com/google/devtools/build/lib/runtime/BlazeServiceRegistry.java
+58 −0 src/main/java/com/google/devtools/build/lib/runtime/OptionsSupplier.java
+0 −17 src/main/java/com/google/devtools/build/lib/runtime/ServerBuilder.java
+1 −0 src/main/java/com/google/devtools/build/lib/runtime/commands/BUILD
+3 −1 src/main/java/com/google/devtools/build/lib/runtime/commands/CanonicalizeCommand.java
+11 −10 src/main/java/com/google/devtools/build/lib/runtime/commands/HelpCommand.java
+0 −1 src/main/java/com/google/devtools/build/lib/server/BUILD
+52 −41 src/main/java/com/google/devtools/build/lib/server/PidFileWatcher.java
+0 −2 src/main/java/com/google/devtools/build/lib/server/ShutdownHooks.java
+1 −1 src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+0 −3 src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+2 −2 src/main/java/com/google/devtools/build/lib/skyframe/packages/BUILD
+3 −0 src/main/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoader.java
+7 −0 src/main/java/com/google/devtools/build/lib/skyframe/serialization/analysis/BUILD
+0 −10 src/main/java/com/google/devtools/build/lib/skyframe/serialization/analysis/RemoteAnalysisCacheClient.java
+7 −0 ...om/google/devtools/build/lib/skyframe/serialization/analysis/RemoteAnalysisCachingDependenciesProvider.java
+1 −5 src/main/java/com/google/devtools/build/lib/skyframe/serialization/analysis/RemoteAnalysisCachingOptions.java
+6 −1 ...va/com/google/devtools/build/lib/skyframe/serialization/analysis/RemoteAnalysisCachingServicesSupplier.java
+30 −0 src/main/java/com/google/devtools/build/lib/skyframe/serialization/analysis/RemoteAnalysisMetadataWriter.java
+2 −1 src/main/java/com/google/devtools/build/lib/worker/WorkRequestHandler.java
+2 −1 src/main/java/com/google/devtools/build/skyframe/CyclesReporter.java
+40 −20 src/main/java/net/starlark/java/syntax/Resolver.java
+2 −0 src/main/starlark/builtins_bzl/common/objc/apple_platform.bzl
+1 −0 src/main/starlark/docgen/BUILD
+4 −0 src/test/java/com/google/devtools/build/lib/analysis/AutoExecGroupsTest.java
+1 −0 src/test/java/com/google/devtools/build/lib/analysis/mock/cc_toolchain_config.bzl
+3 −0 src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisMock.java
+2 −0 src/test/java/com/google/devtools/build/lib/analysis/util/BUILD
+1 −1 src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java
+1 −1 src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunctionTest.java
+1 −1 src/test/java/com/google/devtools/build/lib/bazel/repository/RepositoryDelegatorTest.java
+1 −0 src/test/java/com/google/devtools/build/lib/buildtool/util/BUILD
+5 −4 src/test/java/com/google/devtools/build/lib/buildtool/util/BlazeRuntimeWrapper.java
+5 −0 src/test/java/com/google/devtools/build/lib/packages/BUILD
+1 −0 src/test/java/com/google/devtools/build/lib/packages/BazelDocumentationTest.java
+13 −6 src/test/java/com/google/devtools/build/lib/packages/DocumentationTestUtil.java
+24 −1 src/test/java/com/google/devtools/build/lib/packages/util/BazelMockCcSupport.java
+3 −1 src/test/java/com/google/devtools/build/lib/packages/util/BazelMockPythonSupport.java
+4 −0 src/test/java/com/google/devtools/build/lib/packages/util/MockCcSupport.java
+76 −0 src/test/java/com/google/devtools/build/lib/packages/util/MockProtoSupport.java
+1 −0 src/test/java/com/google/devtools/build/lib/packages/util/mock/osx_cc_toolchain_config.bzl
+2 −0 src/test/java/com/google/devtools/build/lib/query2/testutil/PostAnalysisQueryTest.java
+26 −2 src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java
+1 −1 src/test/java/com/google/devtools/build/lib/rules/AliasTest.java
+1 −0 src/test/java/com/google/devtools/build/lib/rules/cpp/BUILD
+21 −29 src/test/java/com/google/devtools/build/lib/rules/cpp/CcCommonTest.java
+29 −60 src/test/java/com/google/devtools/build/lib/rules/cpp/CcImportBaseConfiguredTargetTest.java
+25 −0 src/test/java/com/google/devtools/build/lib/rules/cpp/CcInfo.java
+23 −35 src/test/java/com/google/devtools/build/lib/rules/cpp/CcLibraryConfiguredTargetTest.java
+2 −0 src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainProviderTest.java
+2 −0 src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainTest.java
+2 −0 src/test/java/com/google/devtools/build/lib/rules/cpp/CppLinkActionTest.java
+1 −2 src/test/java/com/google/devtools/build/lib/rules/cpp/LibraryLinkingTest.java
+46 −20 src/test/java/com/google/devtools/build/lib/rules/cpp/StarlarkCcCommonTest.java
+4 −4 src/test/java/com/google/devtools/build/lib/rules/cpp/proto/CcProtoLibraryTest.java
+3 −0 src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
+1 −2 src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryAnalysisTest.java
+8 −9 src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
+11 −8 src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+12 −2 src/test/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkTest.java
+3 −8 src/test/java/com/google/devtools/build/lib/runtime/AbstractCommandTest.java
+1 −0 src/test/java/com/google/devtools/build/lib/runtime/BUILD
+23 −2 src/test/java/com/google/devtools/build/lib/runtime/BlazeRuntimeTest.java
+0 −9 src/test/java/com/google/devtools/build/lib/server/PidFileWatcherTest.java
+1 −0 src/test/java/com/google/devtools/build/lib/starlark/StarlarkIntegrationTest.java
+10 −0 src/test/py/bazel/bzlmod/bazel_fetch_test.py
+12 −0 src/test/py/bazel/bzlmod/mod_command_test.py
+2 −0 src/test/shell/bazel/cc_flags_supplier_test.sh
+2 −0 src/test/shell/bazel/cc_integration_test.sh
+17 −9 src/test/tools/bzlmod/MODULE.bazel.lock
+18 −0 third_party/apple_support.patch