8000 [pull] master from google:master by pull[bot] · Pull Request #73 · Stars1233/dagger · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[pull] master from google:master #73

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

Jump to bottom
Merged
merged 2 commits into from
May 22, 2025
Merged

[pull] master from google:master #73

merged 2 commits into from
May 22, 2025

Conversation

pull[bot]
Copy link
@pull pull bot commented May 22, 2025 •
edited by sourcery-ai bot
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

Summary by Sourcery

Add support for java.util.Map and java.util.Set in Kotlin multibinding, simplify processor plugin configuration, and add end-to-end tests for Java–Kotlin collection interoperability.

Enhancements:

  • Extend MapType and SetType to recognize java.util.Map and java.util.Set in Kotlin sources
  • Introduce JAVA_UTIL_MAP and JAVA_UTIL_SET names and rename COLLECTIONS to JAVA_UTIL_COLLECTIONS in XTypeNames
  • Simplify compat_processor_plugin rule to derive the processor class name from a base name
  • Update Hilt compiler BUILD files to use processor_base_name and drop the "Processor" suffix in plugin definitions
  • Replace references to XTypeNames.COLLECTIONS with JAVA_UTIL_COLLECTIONS in codegen representations

Build:

  • Register the new multibindings tests in the Kotlin functional BUILD file

Tests:

  • Add JavaSetMultibindingTest and JavaMapMultibindingTest to verify mixed Java and Kotlin multibindings

Chang-Eric and others added 2 commits May 21, 2025 14:15
@Chang-Eric
Internal changes
2657b3c 
PiperOrigin-RevId: 761664625
@bcorso
Support using java.util.Set/java.util.Map for multibindings in ko…
97a8ec8 
…tlin sources.

In general, users should be using `kotlin.collections.Set` rather than `java.util.Set` in kotlin sources, but we've decided we should still support it. This also keeps things consistent with KAPT, since we support it implicitly in KAPT today.

This CL also reenables KSP in Dagger's functional tests, which was accidentally turned off when switching `dagger.useKsp=true` from plugin options to javacopts since we were looking for it in plugin options.

RELNOTES=N/A
PiperOrigin-RevId: 761741915
@pull pull bot added the ⤵️ pull label May 22, 2025
@pull pull bot merged commit 97a8ec8 into Stars1233:master May 22, 2025
@gitstream-cm gitStream.cm
Copy link
gitstream-cm bot commented May 22, 2025

🚨 gitStream Monthly Automation Limit Reached 🚨

Your organization has exceeded the number of pull requests allowed for automation with gitStream.
Monthly PRs automated: 3889/250

To continue automating your PR workflows and unlock additional features, please contact LinearB.

@sourcery-ai Sourcery AI
Copy link
sourcery-ai bot commented May 22, 2025 •
edited
Loading

Reviewer's Guide

This PR adds Java-based multibinding tests for Kotlin sources, expands internal XProcessing support for java.util collections, renames the COLLECTIONS constant for clarity and updates related request representations, and standardizes processor plugin naming in the compatibility layer.

Updated Class Diagram for XTypeNames

classDiagram
  class XTypeNames {
    +XClassName JAVA_UTIL_COLLECTIONS
    +XClassName JAVA_UTIL_SET
    +XClassName JAVA_UTIL_MAP
    +XClassName FACTORY
    +XClassName INJECTED_FIELD_SIGNATURE
    %% Old 'COLLECTIONS' field is replaced by 'JAVA_UTIL_COLLECTIONS'
  }
Loading

Updated Class Diagram for MapType and SetType

classDiagram
  class MapType {
    <<static>> +boolean isMap(XType type)
  }
  class SetType {
    <<static>> +boolean isSet(XType type)
  }
  note for MapType "Method isMap() updated to include check for XTypeNames.JAVA_UTIL_MAP"
  note for SetType "Method isSet() updated to include check for XTypeNames.JAVA_UTIL_SET"
Loading

File-Level Changes

Change Details Files
Add Java-to-Kotlin multibinding tests for Set and Map
  • Add GenKtTests entries for JavaSetMultibindingTest and JavaMapMultibindingTest
  • Introduce JavaSetMultibindingTest.kt covering set multibinding scenarios
  • Introduce JavaMapMultibindingTest.kt covering map multibinding scenarios
 javatests/dagger/functional/kotlinsrc/multibindings/BUILD
javatests/dagger/functional/kotlinsrc/multibindings/JavaSetMultibindingTest.kt
javatests/dagger/functional/kotlinsrc/multibindings/JavaMapMultibindingTest.kt
Support direct java.util.Set and java.util.Map types in type detection
  • Extend SetType.isSet to recognize java.util.Set
  • Extend MapType.isMap to recognize java.util.Map
  • Add JAVA_UTIL_SET and JAVA_UTIL_MAP constants in XTypeNames
 dagger-compiler/main/java/dagger/internal/codegen/base/SetType.java
dagger-compiler/main/java/dagger/internal/codegen/base/MapType.java
dagger-compiler/main/java/dagger/internal/codegen/xprocessing/XTypeNames.kt
Rename COLLECTIONS constant and update collection factory invocations
  • Rename XTypeNames.COLLECTIONS to JAVA_UTIL_COLLECTIONS
  • Update MapRequestRepresentation to use JAVA_UTIL_COLLECTIONS
  • Update SetRequestRepresentation to use JAVA_UTIL_COLLECTIONS
 dagger-compiler/main/java/dagger/internal/codegen/xprocessing/XTypeNames.kt
dagger-compiler/main/java/dagger/internal/codegen/writing/MapRequestRepresentation.java
dagger-compiler/main/java/dagger/internal/codegen/writing/SetRequestRepresentation.java
Standardize processor plugin naming in the compatibility layer
  • Rename compat_processor_plugin parameter javac_processor_name to processor_base_name
  • Update processor_class construction to append 'Processor' to processor_base_name
  • Replace javac_processor_name with processor_base_name in multiple Hilt compiler BUILD files
 tools/processor_compat.bzl
hilt-compiler/main/java/dagger/hilt/android/processor/internal/androidentrypoint/BUILD
hilt-compiler/main/java/dagger/hilt/android/processor/internal/bindvalue/BUILD
hilt-compiler/main/java/dagger/hilt/android/processor/internal/customtestapplication/BUILD
hilt-compiler/main/java/dagger/hilt/android/processor/internal/viewmodel/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/aggregateddeps/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/aliasof/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/definecomponent/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/disableinstallincheck/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/earlyentrypoint/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/generatesrootinput/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/originatingelement/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/root/BUILD
hilt-compiler/main/java/dagger/hilt/processor/internal/uninstallmodules/BUILD
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • 8000 Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai coderabbitai
Copy link
coderabbitai bot commented May 22, 2025

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Join our Discord community for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
⤵️ pull
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Chang-Eric @bcorso
0