Add gradle incremental compilation support (#219)

grandstaish · Jun 2, 2019 · ded625e · ded625e
1 parent 40e7d1d
commit ded625e
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ subprojects { project ->
   version = VERSION_NAME
 }
 
-ext.kotlin_version = '1.1.60'
+ext.kotlin_version = '1.3.31'
 
 allprojects {
   repositories {
@@ -20,7 +20,7 @@ allprojects {
 
     dependencies {
       classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-      classpath 'com.android.tools.build:gradle:3.0.1'
+      classpath 'com.android.tools.build:gradle:3.4.1'
       classpath 'io.realm:realm-gradle-plugin:2.2.1'
       classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
       classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
@@ -38,7 +38,7 @@ ext {
   minSdkVersion = 9
   targetSdkVersion = 27
   compileSdkVersion = 27
-  buildToolsVersion = '26.0.2'
+  buildToolsVersion = '28.0.3'
   sourceCompatibilityVersion = JavaVersion.VERSION_1_7
   targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
@@ -57,22 +57,28 @@ project.plugins.whenPluginAdded { plugin ->
 }
 
 def androidSupportVersion = '27.0.1'
+def gradleIncapHelperVersion = '0.2'
+def autoserviceVersion = '1.0-rc5'
 
 ext.deps = [
-    android            : 'com.google.android:android:4.1.1.4',
-    supportAnnotations : "com.android.support:support-annotations:$androidSupportVersion",
-    appCompat          : "com.android.support:appcompat-v7:$androidSupportVersion",
-    design             : "com.android.support:design:$androidSupportVersion",
-    supportTestRunner  : 'com.android.support.test:runner:0.5',
-    javapoet           : 'com.squareup:javapoet:1.8.0',
-    autovalue          : 'com.google.auto.value:auto-value:1.3',
-    autocommon         : 'com.google.auto:auto-common:0.8',
-    autoservice        : 'com.google.auto.service:auto-service:1.0-rc2',
-    javaFormat         : 'com.google.googlejavaformat:google-java-format:1.1',
-    junit              : 'junit:junit:4.12',
-    truth              : 'com.google.truth:truth:0.30',
-    compiletesting     : 'com.google.testing.compile:compile-testing:0.10',
-    lombok             : "org.projectlombok:lombok:1.16.16"
+        android                   : 'com.google.android:android:4.1.1.4',
+        supportAnnotations        : "com.android.support:support-annotations:$androidSupportVersion",
+        appCompat                 : "com.android.support:appcompat-v7:$androidSupportVersion",
+        design                    : "com.android.support:design:$androidSupportVersion",
+        supportTestRunner         : 'com.android.support.test:runner:0.5',
+        javapoet                  : 'com.squareup:javapoet:1.8.0',
+        autovalueProcessor        : 'com.google.auto.value:auto-value:1.6.5',
+        autovalueApi              : 'com.google.auto.value:auto-value-annotations:1.6.3',
+        autocommon                : 'com.google.auto:auto-common:0.8',
+        autoserviceProcessor      : "com.google.auto.service:auto-service:$autoserviceVersion",
+        autoserviceApi            : "com.google.auto.service:auto-service-annotations:$autoserviceVersion",
+        javaFormat                : 'com.google.googlejavaformat:google-java-format:1.1',
+        junit                     : 'junit:junit:4.12',
+        truth                     : 'com.google.truth:truth:0.30',
+        compiletesting            : 'com.google.testing.compile:compile-testing:0.10',
+        lombok                    : "org.projectlombok:lombok:1.16.16",
+        gradleIncapHelperApi      : "net.ltgt.gradle.incap:incap:$gradleIncapHelperVersion",
+        gradleIncapHelperProcessor: "net.ltgt.gradle.incap:incap-processor:$gradleIncapHelperVersion"
 ]
 
 task clean(type: Delete) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/paperparcel-compiler/build.gradle b/paperparcel-compiler/build.gradle
@@ -6,11 +6,16 @@ targetCompatibility = rootProject.ext.targetCompatibilityVersion
 
 dependencies {
   compile project(':paperparcel-api')
-  compile deps.autovalue
-  compile deps.autoservice
+  compile deps.autovalueApi
+  compile deps.autovalueProcessor
+  annotationProcessor deps.autovalueProcessor
+  compile deps.autoserviceApi
+  annotationProcessor deps.autoserviceProcessor
   compile deps.autocommon
   compile deps.javapoet
   compile deps.javaFormat
+  compile deps.gradleIncapHelperApi
+  annotationProcessor deps.gradleIncapHelperProcessor
 }
 
 apply from: rootProject.file('gradle/bintray.gradle')

diff --git a/paperparcel-compiler/src/main/java/paperparcel/PaperParcelAutoValueExtension.java b/paperparcel-compiler/src/main/java/paperparcel/PaperParcelAutoValueExtension.java
@@ -58,6 +58,11 @@ public class PaperParcelAutoValueExtension extends AutoValueExtension {
   private static final TypeName PARCEL = ClassName.get("android.os", "Parcel");
   private static final String NULLABLE_ANNOTATION_NAME = "Nullable";
 
+  @Override
+  public IncrementalExtensionType incrementalType(final ProcessingEnvironment processingEnvironment) {
+    return IncrementalExtensionType.ISOLATING;
+  }
+
   @Override public boolean applicable(Context context) {
     ProcessingEnvironment env = context.processingEnvironment();
     Elements elements = env.getElementUtils();

diff --git a/paperparcel-compiler/src/main/java/paperparcel/PaperParcelProcessor.java b/paperparcel-compiler/src/main/java/paperparcel/PaperParcelProcessor.java
@@ -20,6 +20,10 @@
 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
 import com.google.googlejavaformat.java.filer.FormattingFiler;
+
+import net.ltgt.gradle.incap.IncrementalAnnotationProcessor;
+import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType;
+
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.Processor;
@@ -32,6 +36,7 @@
  * implementation.
  */
 @AutoService(Processor.class)
+@IncrementalAnnotationProcessor(IncrementalAnnotationProcessorType.AGGREGATING)
 public class PaperParcelProcessor extends BasicAnnotationProcessor {
   @Override public SourceVersion getSupportedSourceVersion() {
     return SourceVersion.latestSupported();

diff --git a/paperparcel-kotlin/build.gradle b/paperparcel-kotlin/build.gradle
@@ -30,9 +30,9 @@ dokka {
 }
 
 dependencies {
-  provided "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  provided project(":paperparcel")
+  compileOnly project(":paperparcel")
 }
 
 apply from: rootProject.file('gradle/bintray.gradle')

diff --git a/paperparcel/build.gradle b/paperparcel/build.gradle
@@ -1,3 +1,5 @@
+import org.gradle.internal.jvm.Jvm
+
 apply plugin: 'com.android.library'
 
 android {
@@ -25,20 +27,21 @@ tasks.withType(Test) {
 }
 
 dependencies {
-  compile project(':paperparcel-api')
-  compile deps.supportAnnotations
+  api project(':paperparcel-api')
+  api deps.supportAnnotations
 
-  androidTestCompile deps.junit
-  androidTestCompile deps.truth
-  androidTestCompile deps.supportTestRunner
+  androidTestImplementation deps.junit
+  androidTestImplementation deps.truth
+  androidTestImplementation deps.supportTestRunner
   androidTestAnnotationProcessor project(':paperparcel-compiler')
 
-  testCompile deps.junit
-  testCompile deps.truth
-  testCompile deps.compiletesting
-  testCompile files(getRuntimeJar())
-  testCompile files(org.gradle.internal.jvm.Jvm.current().getToolsJar())
-  testCompile project(':paperparcel-compiler')
+  testImplementation deps.junit
+  testImplementation deps.truth
+  testImplementation deps.compiletesting
+  testImplementation files(getRuntimeJar())
+  testImplementation files(Jvm.current().getToolsJar())
+  testImplementation project(':paperparcel-compiler')
+  testAnnotationProcessor project(':paperparcel-compiler')
 }
 
 def getRuntimeJar() {

diff --git a/paperparcel/src/main/AndroidManifest.xml b/paperparcel/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="paperparcel"/>
+<manifest package="paperparcel.core"/>