From 112f536716fb99030c3375d8bdd278b52ef31e64 Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Wed, 14 Aug 2024 13:44:50 -0400 Subject: [PATCH] [epilogue] Remove dependency on Google AutoService (#6955) This makes potential future compilation with CMake easier and reduces the amount of external code we depend on. --- epilogue-processor/build.gradle | 2 -- .../edu/wpi/first/epilogue/processor/AnnotationProcessor.java | 3 --- .../META-INF/services/javax.annotation.processing.Processor | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) create mode 100644 epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/epilogue-processor/build.gradle b/epilogue-processor/build.gradle index a3dcc8d07c..6a67ca3e8a 100644 --- a/epilogue-processor/build.gradle +++ b/epilogue-processor/build.gradle @@ -13,7 +13,5 @@ dependencies { implementation(project(':epilogue-runtime')) api project(':wpilibNewCommands') - implementation 'com.google.auto.service:auto-service:1.1.1' - annotationProcessor 'com.google.auto.service:auto-service:1.1.1' testImplementation 'com.google.testing.compile:compile-testing:+' } diff --git a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/AnnotationProcessor.java b/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/AnnotationProcessor.java index 5626c341dc..1c4137d71a 100644 --- a/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/AnnotationProcessor.java +++ b/epilogue-processor/src/main/java/edu/wpi/first/epilogue/processor/AnnotationProcessor.java @@ -4,7 +4,6 @@ package edu.wpi.first.epilogue.processor; -import com.google.auto.service.AutoService; import edu.wpi.first.epilogue.CustomLoggerFor; import edu.wpi.first.epilogue.Logged; import edu.wpi.first.epilogue.NotLogged; @@ -16,7 +15,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.Processor; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; @@ -40,7 +38,6 @@ import javax.tools.Diagnostic; "edu.wpi.first.epilogue.Logged" }) @SupportedSourceVersion(SourceVersion.RELEASE_17) -@AutoService(Processor.class) public class AnnotationProcessor extends AbstractProcessor { private static final String kCustomLoggerFqn = "edu.wpi.first.epilogue.CustomLoggerFor"; private static final String kClassSpecificLoggerFqn = diff --git a/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor new file mode 100644 index 0000000000..517389600e --- /dev/null +++ b/epilogue-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -0,0 +1 @@ +edu.wpi.first.epilogue.processor.AnnotationProcessor