From a2f647f9d44174f502fb2f8a89a6c3a887ef14fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 6 Apr 2021 08:28:57 -0700
Subject: [PATCH] When building AutoValue, pick up AutoService via
 `<annotationProcessorPaths>`.

The annotation dependencies for `@AutoService` and for Error Prone are now regular compile-scoped dependencies. This prevents errors from overeager consumers that can't deal with missing annotation class files.

The `<annotationProcessorPaths>` incantations are kind of clunky since we need a different path for building tests (which must include AutoValueProcessor) and for building AutoValue itself (which obviously can't).

Fixes https://github.com/google/auto/issues/1032.

RELNOTES=n/a
PiperOrigin-RevId: 367010584
---
 value/processor/pom.xml | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/value/processor/pom.xml b/value/processor/pom.xml
index 565f928d7a..acc889ac4a 100644
--- a/value/processor/pom.xml
+++ b/value/processor/pom.xml
@@ -41,6 +41,7 @@
   </scm>
 
   <properties>
+    <auto-service.version>1.0-rc7</auto-service.version>
     <errorprone.version>2.6.0</errorprone.version>
   </properties>
 
@@ -52,15 +53,13 @@
     </dependency>
     <dependency>
       <groupId>com.google.auto.service</groupId>
-      <artifactId>auto-service</artifactId>
-      <version>1.0-rc7</version>
-      <scope>provided</scope>
+      <artifactId>auto-service-annotations</artifactId>
+      <version>${auto-service.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
       <version>${errorprone.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.escapevelocity</groupId>
@@ -169,7 +168,33 @@
                  META-INF/services entry for a class that the compiler has not yet generated. -->
             <arg>-AallowedMissingSerializableExtensionClasses=.*TestStringSerializerFactory</arg>
           </compilerArgs>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>com.google.auto.service</groupId>
+              <artifactId>auto-service</artifactId>
+              <version>${auto-service.version}</version>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <configuration>
+              <annotationProcessorPaths>
+                <path>
+                  <groupId>com.google.auto.value</groupId>
+                  <artifactId>auto-value</artifactId>
+                  <version>HEAD-SNAPSHOT</version>
+                </path>
+                <path>
+                  <groupId>com.google.auto.service</groupId>
+                  <artifactId>auto-service</artifactId>
+                  <version>${auto-service.version}</version>
+                </path>
+              </annotationProcessorPaths>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>