Skip to content

Conversation

alabiaga
Copy link
Member

Fixes #366

Copy link
Contributor

Summary of Changes

Hello @alabiaga, 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 resolves a critical build failure within the platform samples by strategically managing Android manifest merge conflicts. It ensures that modules requiring a higher minimum SDK version can coexist with the main application without forcing a global minSdk update, while also providing clear guidance to users about the specific Android version requirements for certain samples.

Highlights

  • Resolve Manifest Merge Conflict: Addressed a build issue where platform samples failed to build due to manifest merge conflicts related to minSdk requirements of certain libraries.
  • Override Library minSdk: Implemented tools:overrideLibrary in AndroidManifest.xml for com.example.platform.storage and androidx.photopicker.compose to allow these modules to use a higher minSdk (34) without affecting the main app's minSdk.
  • Clarify Android Version Requirement: Updated the StorageApiSurface description in ApiSurface.kt to explicitly warn users that these samples require Android 14 or higher.
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
Contributor

@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 successfully resolves a manifest merger issue by using tools:overrideLibrary to handle conflicting minSdk versions from dependencies. Additionally, it updates the description for the Storage API surface to warn users about the new minimum SDK requirement. The changes are effective, but I have a couple of suggestions to improve code style and readability in the AndroidManifest.xml and ApiSurface.kt files.

Change-Id: I2fc9d12ee60121cbce3a5ff31d7440c250511e84
Change-Id: I653d3c799178b3edcf551679b540c7f1f403e16d
Change-Id: Ib78d89b29a4b36ac0bf86fdf9df5de18f76a70bc
Change-Id: I3b76c82542a3ceec0455f48a6bb5457b770b08fd
Change-Id: Ia0aa975a0eee0c9f8201cdb18694621dd831df48
update comment to reflect that the min sdk override is specific to the modules defined rather than mentioning it specifically in the comment
@alabiaga alabiaga merged commit 54e8d1c into android:main Sep 30, 2025
3 checks passed
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]: https://github.com/android/platform-samples/pull/191 is causing manifest merge issues
2 participants