Merge pull request androidannotations#2264 from WonderCsabo/incremental-processing

WonderCsabo · web-flow · commit ea4bb702853d · 2020-03-30T15:20:18.000+02:00
Support incremental annotation processing
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/AndroidAnnotationProcessor.java
@@ -32,6 +32,7 @@
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 
+import org.androidannotations.Option;
 import org.androidannotations.helper.AndroidManifest;
 import org.androidannotations.helper.ModelConstants;
 import org.androidannotations.internal.core.CorePlugin;
@@ -61,6 +62,8 @@
 
 public class AndroidAnnotationProcessor extends AbstractProcessor {
 
+	public static final Option OPTION_INCREMENTAL = new Option("incremental", "false");
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(AndroidAnnotationProcessor.class);
 
 	private String coreVersion;
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/Options.java
@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeSet;
 
 import javax.annotation.processing.ProcessingEnvironment;
 
@@ -51,6 +52,7 @@ public Options(ProcessingEnvironment processingEnvironment) {
 		addSupportedOption(LoggerContext.OPTION_LOG_APPENDER_FILE);
 		addSupportedOption(BaseGeneratedClassHolder.OPTION_GENERATE_FINAL_CLASSES);
 		addSupportedOption(CodeModelGenerator.OPTION_ENCODING);
+		addSupportedOption(AndroidAnnotationProcessor.OPTION_INCREMENTAL);
 	}
 
 	public void addAllSupportedOptions(List<Option> options) {
@@ -86,6 +88,12 @@ public boolean getBoolean(String optionKey) {
 	}
 
 	public Set<String> getSupportedOptions() {
+		if (getBoolean(AndroidAnnotationProcessor.OPTION_INCREMENTAL)) {
+			Set<String> withIncremental = new TreeSet<>(supportedOptions.keySet());
+			withIncremental.add("org.gradle.annotation.processing.isolating");
+			return withIncremental;
+		}
+
 		return supportedOptions.keySet();
 	}
 }
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/FileHelper.java
@@ -44,6 +44,12 @@ public static File findRootProject(ProcessingEnvironment processingEnv) throws F
 	 * AndroidManifest.xml file. Any better solution will be appreciated.
 	 */
 	public static FileHolder findRootProjectHolder(ProcessingEnvironment processingEnv) throws FileNotFoundException {
+		FileHolder rootProjectHolder = findKaptRootProjectHolder(processingEnv);
+
+		if (rootProjectHolder != null) {
+			return rootProjectHolder;
+		}
+
 		Filer filer = processingEnv.getFiler();
 
 		FileObject dummySourceFile;
@@ -76,6 +82,28 @@ public static FileHolder findRootProjectHolder(ProcessingEnvironment processingE
 		return new FileHolder(dummySourceFilePath, sourcesGenerationFolder, projectRoot);
 	}
 
+	private static FileHolder findKaptRootProjectHolder(ProcessingEnvironment processingEnv) throws FileNotFoundException {
+		String kaptFolderOption = processingEnv.getOptions().get("kapt.kotlin.generated");
+
+		if (kaptFolderOption == null) {
+			return null;
+		}
+
+		File kaptFolder = new File(kaptFolderOption.replace("kaptKotlin", "kapt"));
+		File dummySourceFile = new File(kaptFolder, "dummy");
+
+		String dummySourceFilePath;
+		try {
+			dummySourceFilePath = new URI("file://" + dummySourceFile.getAbsolutePath()).toString();
+		} catch (URISyntaxException e) {
+			throw new FileNotFoundException();
+		}
+
+		File sourcesGenerationFolder = kaptFolder;
+		File projectRoot = kaptFolder.getParentFile();
+		return new FileHolder(dummySourceFilePath, sourcesGenerationFolder, projectRoot);
+	}
+
 	public static File resolveOutputDirectory(ProcessingEnvironment processingEnv) throws FileNotFoundException {
 		File rootProject = FileHelper.findRootProject(processingEnv);
 
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/META-INF/gradle/incremental.annotation.processors b/AndroidAnnotations/androidannotations-core/androidannotations/src/main/resources/META-INF/gradle/incremental.annotation.processors
@@ -0,0 +1 @@
+org.androidannotations.internal.AndroidAnnotationProcessor,dynamic

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`import java.util.List;`
`21`	`21`	`import java.util.Map;`
`22`	`22`	`import java.util.Set;`
	`23`	`+import java.util.TreeSet;`
`23`	`24`
`24`	`25`	`import javax.annotation.processing.ProcessingEnvironment;`
`25`	`26`
`@@ -51,6 +52,7 @@ public Options(ProcessingEnvironment processingEnvironment) {`
`51`	`52`	`addSupportedOption(LoggerContext.OPTION_LOG_APPENDER_FILE);`
`52`	`53`	`addSupportedOption(BaseGeneratedClassHolder.OPTION_GENERATE_FINAL_CLASSES);`
`53`	`54`	`addSupportedOption(CodeModelGenerator.OPTION_ENCODING);`
	`55`	`+ addSupportedOption(AndroidAnnotationProcessor.OPTION_INCREMENTAL);`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`public void addAllSupportedOptions(List<Option> options) {`
`@@ -86,6 +88,12 @@ public boolean getBoolean(String optionKey) {`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`public Set<String> getSupportedOptions() {`
	`91`	`+ if (getBoolean(AndroidAnnotationProcessor.OPTION_INCREMENTAL)) {`
	`92`	`+ Set<String> withIncremental = new TreeSet<>(supportedOptions.keySet());`
	`93`	`+ withIncremental.add("org.gradle.annotation.processing.isolating");`
	`94`	`+ return withIncremental;`
	`95`	`+ }`
	`96`	`+`
`89`	`97`	`return supportedOptions.keySet();`
`90`	`98`	`}`
`91`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+org.androidannotations.internal.AndroidAnnotationProcessor,dynamic`