Bump com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0 in /src/manifestmerger #9678
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0. --- updated-dependencies: - dependency-name: com.android.tools.build:manifest-merger dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
dependabot
bot
added
dependencies
jonathanpeppers
requested changes
Jan 13, 2025
|
@pjcollins to workaround the problem here: Could we substring the branch name during our build? Something like: Where it just trims for now? |
Yeah that is probably best, as we previously couldn't find a way to trim the generated branch name at creation time. I can try to push an update here shortly. |
Comment on lines
+51
to
+55
| // Trim generated dependabot branch names that are too long to produce useful package names | ||
| var lastSlashIndex = Branch.LastIndexOf ('/'); | ||
| if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) { | ||
| Branch = Branch.Substring (lastSlashIndex + 1); | ||
| } |
There was a problem hiding this comment.
This looks good. 👍
We can probably just merge this together, but need to check the CI results if the new manifestmerger is OK.
pjcollins
approved these changes
Jan 13, 2025
jonathanpeppers
approved these changes
Jan 13, 2025
jonathanpeppers
deleted the
dependabot/gradle/src/manifestmerger/com.android.tools.build-manifest-merger-31.8.0
branch
grendello
added a commit
that referenced
this pull request
Jan 14, 2025
* main: [ci] Add template for setting JAVA_HOME vars (#9671) Bump com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0 (#9678) Bump to dotnet/sdk@2dd591056f 10.0.100-alpha.1.25062.16 (#9679) Bump com.android.tools:r8 from 8.5.35 to 8.7.18 (#9677) Bump to dotnet/java-interop@4f06201 (#9676) Bump to dotnet/android-api-docs@492e524d (#9668) [build] Support JDK-21 (#9672)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0.
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)