Skip to content

Conversation

@tjmtic
Copy link
Contributor

@tjmtic tjmtic commented Jan 23, 2026

Fixes #2050
Removed manual source set registration for Protobuf.

This is the description of the solution:

The protobuf-gradle-plugin (version 0.9.5) automatically handles adding generated sources to the appropriate Android source sets. Using android.sourceSets.register(it.name) could have been causing the Kotlin compiler to see the same generated files twice.

Protobuf release update
Change default output folder to Gradle best practices (generated/sources/proto; plural, not singular)

@tjmtic tjmtic requested a review from dturner as a code owner January 23, 2026 21:20
@gemini-code-assist
Copy link

Summary of Changes

Hello @tjmtic, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request streamlines the Protobuf build configuration by eliminating redundant manual source set registrations. It leverages the automatic capabilities of the protobuf-gradle-plugin to correctly integrate generated Protobuf code into Android projects, thereby preventing potential compilation conflicts and simplifying the build script.

Highlights

  • Removed Manual Protobuf Source Set Registration: The androidComponents.beforeVariants block, which manually registered Java and Kotlin source directories for generated Protobuf files, has been removed from core/datastore-proto/build.gradle.kts.
  • Leveraging Automatic Plugin Behavior: This change relies on the protobuf-gradle-plugin (version 0.9.5) to automatically handle the addition of generated Protobuf sources to the appropriate Android source sets, making manual registration redundant.
  • Addressing Potential Compiler Issues: The manual registration was identified as a potential cause for the Kotlin compiler seeing the same generated files twice, and its removal aims to resolve this issue.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly removes the manual registration of Protobuf source sets in core/datastore-proto/build.gradle.kts. As stated in the pull request description, recent versions of the protobuf-gradle-plugin (the project uses version 0.9.5) automatically handle adding generated sources to the appropriate source sets. This change simplifies the build configuration and eliminates the risk of the compiler encountering duplicate source files. The removal of this now-redundant code is a good improvement for build script maintainability.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Build Fails with Conflicting Overload error

1 participant