From d1f8c77e810a97de126a13ec11f280bd06d81317 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 02:59:09 +0000 Subject: [PATCH 1/2] Bump com.android.tools.build:manifest-merger in /src/manifestmerger 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] --- src/manifestmerger/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifestmerger/build.gradle b/src/manifestmerger/build.gradle index d0c426d2601..44d750fe175 100644 --- a/src/manifestmerger/build.gradle +++ b/src/manifestmerger/build.gradle @@ -19,7 +19,7 @@ repositories { dependencies { // https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger - implementation 'com.android.tools.build:manifest-merger:31.7.3' + implementation 'com.android.tools.build:manifest-merger:31.8.0' } sourceSets { From 405e4a9e20db9a1f148815403295703f65fb44ce Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 13 Jan 2025 12:20:41 -0500 Subject: [PATCH 2/2] Trim dependabot branch names used by XAVersionInfo.targets --- .../Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs index 74f96f475b7..73f386038df 100644 --- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs +++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs @@ -15,7 +15,7 @@ namespace Xamarin.Android.BuildTools.PrepTasks public sealed class GitBranch : Git { [Output] - public string Branch { get; set; } + public string Branch { get; set; } = string.Empty; protected override bool LogTaskMessages { get { return false; } @@ -48,6 +48,12 @@ public override bool Execute () base.Execute (); } + // 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); + } + Log.LogMessage (MessageImportance.Low, $" [Output] {nameof (Branch)}: {Branch}"); return !Log.HasLoggedErrors;