Merge branch 'main' into mu-20230329-androidx.media.players

build/scripts/update-config.csx

@@ -181,8 +181,9 @@ public static SemanticVersion GetLatestVersion (Artifact artifact, bool includeP
 {
 	var versions = artifact.Versions.Select(v => GetVersion (v));
 
+	// Handle 'com.google.guava.guava' which ships its release packages as ex: '33.1.0-android'
 	if (!includePrerelease)
-		versions = versions.Where (v => !v.IsPrerelease);
+		versions = versions.Where (v => !v.IsPrerelease || v.Release == "android");
 
 	if (!versions.Any ())
 		return null;

config.json

@@ -2337,8 +2337,8 @@
       {
         "groupId": "com.google.guava",
         "artifactId": "guava",
-        "version": "32.0.1-android",
-        "nugetVersion": "32.0.1.2",
+        "version": "33.1.0-android",
+        "nugetVersion": "33.1.0",
         "nugetId": "Xamarin.Google.Guava",
         "dependencyOnly": false,
         "excludedRuntimeDependencies": "com.google.guava.listenablefuture",
@@ -2748,8 +2748,8 @@
       {
         "groupId": "com.google.errorprone",
         "artifactId": "error_prone_annotations",
-        "version": "2.23.0",
-        "nugetVersion": "2.23.0.1",
+        "version": "2.26.1",
+        "nugetVersion": "2.26.1",
         "nugetId": "Xamarin.Google.ErrorProne.Annotations",
         "dependencyOnly": true
       },