From 8f17e4c4b1065dde6ff699b1f172c8feca8acf62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 16 Apr 2021 08:30:23 -0700
Subject: [PATCH] Fix Gradle incremental compilation for AutoValue and
 AutoFactory.

The previous attempt to do so left out AutoFactory. It was also wrong because the new `annotationProcessorPath` entry was added to the path for compiling tests, not the processor itself.

Fixes https://github.com/google/auto/issues/1071 (again).

RELNOTES=Fixed Gradle incremental compilation.
PiperOrigin-RevId: 368851801
---
 factory/pom.xml         | 11 +++++------
 value/processor/pom.xml | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/factory/pom.xml b/factory/pom.xml
index 2f1fca0204..4d61db8944 100644
--- a/factory/pom.xml
+++ b/factory/pom.xml
@@ -83,12 +83,6 @@
       <artifactId>auto-service-annotations</artifactId>
       <version>${auto-service.version}</version>
     </dependency>
-    <dependency>
-      <groupId>net.ltgt.gradle.incap</groupId>
-      <artifactId>incap</artifactId>
-      <version>0.3</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>net.ltgt.gradle.incap</groupId>
       <artifactId>incap-processor</artifactId>
@@ -165,6 +159,11 @@
               <artifactId>auto-value</artifactId>
               <version>${auto-value.version}</version>
             </path>
+            <path>
+              <groupId>net.ltgt.gradle.incap</groupId>
+              <artifactId>incap</artifactId>
+              <version>0.3</version>
+            </path>
           </annotationProcessorPaths>
         </configuration>
         <dependencies>
diff --git a/value/processor/pom.xml b/value/processor/pom.xml
index 812bb3c530..9533facf8c 100644
--- a/value/processor/pom.xml
+++ b/value/processor/pom.xml
@@ -168,6 +168,11 @@
               <artifactId>auto-service</artifactId>
               <version>${auto-service.version}</version>
             </path>
+            <path>
+              <groupId>net.ltgt.gradle.incap</groupId>
+              <artifactId>incap-processor</artifactId>
+              <version>0.3</version>
+            </path>
           </annotationProcessorPaths>
         </configuration>
         <executions>
@@ -185,11 +190,6 @@
                   <artifactId>auto-service</artifactId>
                   <version>${auto-service.version}</version>
                 </path>
-                <path>
-                  <groupId>net.ltgt.gradle.incap</groupId>
-                  <artifactId>incap-processor</artifactId>
-                  <version>0.3</version>
-                </path>
               </annotationProcessorPaths>
             </configuration>
           </execution>