diff --git a/dialogue-annotations-processor/build.gradle b/dialogue-annotations-processor/build.gradle index 1ad80ca0e..dd9626cd6 100644 --- a/dialogue-annotations-processor/build.gradle +++ b/dialogue-annotations-processor/build.gradle @@ -28,10 +28,6 @@ dependencies { implementation 'com.google.errorprone:error_prone_annotations' implementation 'com.palantir.safe-logging:safe-logging' - annotationProcessor 'com.google.auto.service:auto-service' - compileOnly 'com.google.auto.service:auto-service-annotations' - annotationProcessor 'net.ltgt.gradle.incap:incap-processor' - compileOnly 'net.ltgt.gradle.incap:incap' annotationProcessor 'org.immutables:value' compileOnly 'org.immutables:value::annotations' annotationProcessor 'org.derive4j:derive4j' @@ -39,7 +35,6 @@ dependencies { testAnnotationProcessor 'org.immutables:value' testCompileOnly 'org.immutables:value::annotations' - testCompileOnly 'net.ltgt.gradle.incap:incap' testImplementation project(':dialogue-annotations') testImplementation project(':dialogue-target') testImplementation 'com.fasterxml.jackson.core:jackson-annotations' diff --git a/dialogue-annotations-processor/src/main/java/com/palantir/dialogue/annotations/processor/DialogueRequestAnnotationsProcessor.java b/dialogue-annotations-processor/src/main/java/com/palantir/dialogue/annotations/processor/DialogueRequestAnnotationsProcessor.java index 317a367e8..976d14d1a 100644 --- a/dialogue-annotations-processor/src/main/java/com/palantir/dialogue/annotations/processor/DialogueRequestAnnotationsProcessor.java +++ b/dialogue-annotations-processor/src/main/java/com/palantir/dialogue/annotations/processor/DialogueRequestAnnotationsProcessor.java @@ -17,7 +17,6 @@ package com.palantir.dialogue.annotations.processor; import com.google.auto.common.MoreElements; -import com.google.auto.service.AutoService; import com.google.common.base.Predicates; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableSet; @@ -50,7 +49,6 @@ import javax.annotation.processing.FilerException; import javax.annotation.processing.Messager; import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedSourceVersion; import javax.lang.model.SourceVersion; @@ -60,12 +58,8 @@ import javax.lang.model.util.Elements; import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import net.ltgt.gradle.incap.IncrementalAnnotationProcessor; -import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType; @SupportedSourceVersion(SourceVersion.RELEASE_8) -@AutoService(Processor.class) -@IncrementalAnnotationProcessor(IncrementalAnnotationProcessorType.ISOLATING) public final class DialogueRequestAnnotationsProcessor extends AbstractProcessor { private Messager messager; diff --git a/dialogue-annotations-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors b/dialogue-annotations-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors new file mode 100644 index 000000000..a90c8e3fb --- /dev/null +++ b/dialogue-annotations-processor/src/main/resources/META-INF/gradle/incremental.annotation.processors @@ -0,0 +1 @@ +com.palantir.dialogue.annotations.processor.DialogueRequestAnnotationsProcessor,ISOLATING diff --git a/dialogue-annotations-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/dialogue-annotations-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 000000000..12fba3c0c --- /dev/null +++ b/dialogue-annotations-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +com.palantir.dialogue.annotations.processor.DialogueRequestAnnotationsProcessor diff --git a/versions.lock b/versions.lock index a5c2aff95..f7f55e767 100644 --- a/versions.lock +++ b/versions.lock @@ -13,7 +13,6 @@ com.fasterxml.jackson.module:jackson-module-afterburner:2.12.3 (3 constraints: 0 com.fasterxml.jackson.module:jackson-module-parameter-names:2.12.3 (2 constraints: bf217eba) com.github.ben-manes.caffeine:caffeine:2.9.0 (2 constraints: c0174c4f) com.google.auto:auto-common:0.11 (1 constraints: e711f5e8) -com.google.auto.service:auto-service-annotations:1.0 (1 constraints: a5041a2c) com.google.code.findbugs:jsr305:3.0.2 (11 constraints: 6c9fbcdf) com.google.errorprone:error_prone_annotations:2.6.0 (9 constraints: 8f8631bf) com.google.errorprone:javac-shaded:9+181-r4173-1 (1 constraints: b1140fc6) @@ -51,7 +50,6 @@ io.dropwizard.metrics:metrics-core:3.2.6 (3 constraints: b125441c) jakarta.annotation:jakarta.annotation-api:1.3.5 (3 constraints: ee256969) jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 (3 constraints: ee256969) joda-time:joda-time:2.10.8 (1 constraints: 2e16acf1) -net.ltgt.gradle.incap:incap:0.3 (1 constraints: a7041a2c) org.apache.httpcomponents.client5:httpclient5:5.1 (1 constraints: aa04272c) org.apache.httpcomponents.core5:httpcore5:5.1.1 (3 constraints: 982aeba7) org.apache.httpcomponents.core5:httpcore5-h2:5.1.1 (1 constraints: 3b13073c) diff --git a/versions.props b/versions.props index ab56f3a4d..856c847d3 100644 --- a/versions.props +++ b/versions.props @@ -1,4 +1,3 @@ -com.google.auto.service:* = 1.0 com.google.code.findbugs:jsr305 = 3.0.2 com.google.guava:guava = 30.1.1-jre com.google.testing.compile:compile-testing = 0.19 @@ -17,7 +16,6 @@ com.palantir.tritium:* = 0.18.10 com.squareup:javapoet = 1.13.0 com.uber.nullaway:nullaway = 0.9.1 io.dropwizard.metrics:metrics-core = 3.2.6 -net.ltgt.gradle.incap:* = 0.3 org.apache.httpcomponents.client5:* = 5.1 org.apache.httpcomponents.core5:* = 5.1.1 org.derive4j:* = 1.1.1