From 90ad2d5c055f2c2d90d9879c911a7e774a0e2653 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jan 27 2020 15:18:36 +0000
Subject: Add broader guava support


---

diff --git a/auto.spec b/auto.spec
index d04db8b..5dea852 100644
--- a/auto.spec
+++ b/auto.spec
@@ -11,7 +11,6 @@ Source0:        auto-value-%{version}.tar.gz
 Source1:        gen_auto_tarball.sh
 
 BuildRequires:  maven-local
-BuildRequires:  mvn(com.google.guava:guava)
 BuildRequires:  mvn(com.squareup:javapoet)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
 
@@ -76,6 +75,14 @@ find -name '*.jar' -print -delete
 
 %mvn_package :build-only __noinstall
 
+# Broader guava compatibility
+sed -i -e 's/23.5-jre/20.0/' pom.xml
+sed -i -e 's/toImmutableMap/toMap/' -e 's/static com.google.common.collect.ImmutableMap/static java.util.stream.Collectors/' \
+  -e '/elementValues/s/ImmutableMap/Map/' \
+  common/src/main/java/com/google/auto/common/SimpleAnnotationMirror.java
+sed -i -e 's/toImmutableSet/toSet/' -e 's/static com.google.common.collect.ImmutableSet/static java.util.stream.Collectors/' \
+  -e '/ImmutableSet</s/ImmutableSet/Set/' \
+  service/src/main/java/com/google/auto/service/processor/AutoServiceProcessor.java
 
 %build
 # skip test suite because of unpackaged dependencies for tests