1 files changed, 7 insertions, 59 deletions

diff --git a/java/com/google/turbine/options/TurbineOptions.java b/java/com/google/turbine/options/TurbineOptions.java
index 4dcc408..c104c54 100644
--- a/java/com/google/turbine/options/TurbineOptions.java
+++ b/java/com/google/turbine/options/TurbineOptions.java
@@ -70,17 +70,6 @@ public abstract class TurbineOptions {
   /** The output jar. */
   public abstract Optional<String> output();
 
-  /**
-   * The output jar.
-   *
-   * @deprecated use {@link #output} instead.
-   */
-  @Deprecated
-  @Nullable
-  public String outputFile() {
-    return output().orElse(null);
-  }
-
   /** Paths to annotation processor artifacts. */
   public abstract ImmutableList<String> processorPath();
 
@@ -160,56 +149,20 @@ public abstract class TurbineOptions {
   public abstract static class Builder {
     public abstract Builder setOutput(String output);
 
-    /** @deprecated use {@link #setClassPath(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addClassPathEntries(Iterable<String> sources) {
-      return setClassPath(ImmutableList.copyOf(sources));
-    }
-
     public abstract Builder setClassPath(ImmutableList<String> classPath);
 
     public abstract Builder setBootClassPath(ImmutableList<String> bootClassPath);
 
-    /** @deprecated use {@link #setBootClassPath(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addBootClassPathEntries(Iterable<String> sources) {
-      return setBootClassPath(ImmutableList.copyOf(sources));
-    }
-
     public abstract Builder setRelease(String release);
 
     public abstract Builder setSystem(String system);
 
     public abstract Builder setSources(ImmutableList<String> sources);
 
-    /** @deprecated use {@link #setSources(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addSources(Iterable<String> sources) {
-      return setSources(ImmutableList.copyOf(sources));
-    }
-
-    /** @deprecated use {@link #setProcessorPath(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addProcessorPathEntries(Iterable<String> processorPath) {
-      return setProcessorPath(ImmutableList.copyOf(processorPath));
-    }
-
     public abstract Builder setProcessorPath(ImmutableList<String> processorPath);
 
-    /** @deprecated use {@link #setProcessors(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addProcessors(Iterable<String> processors) {
-      return setProcessors(ImmutableList.copyOf(processors));
-    }
-
     public abstract Builder setProcessors(ImmutableList<String> processors);
 
-    /** @deprecated use {@link #setBuiltinProcessors(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addBuiltinProcessors(Iterable<String> builtinProcessors) {
-      return setBuiltinProcessors(ImmutableList.copyOf(builtinProcessors));
-    }
-
     public abstract Builder setBuiltinProcessors(ImmutableList<String> builtinProcessors);
 
     public abstract Builder setSourceJars(ImmutableList<String> sourceJars);
@@ -222,12 +175,6 @@ public abstract class TurbineOptions {
 
     public abstract Builder setInjectingRuleKind(String injectingRuleKind);
 
-    /** @deprecated use {@link #setDepsArtifacts(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addAllDepsArtifacts(Iterable<String> depsArtifacts) {
-      return setDepsArtifacts(ImmutableList.copyOf(depsArtifacts));
-    }
-
     public abstract Builder setDepsArtifacts(ImmutableList<String> depsArtifacts);
 
     public abstract Builder setHelp(boolean help);
@@ -241,12 +188,6 @@ public abstract class TurbineOptions {
 
     public abstract Builder setReducedClasspathMode(ReducedClasspathMode reducedClasspathMode);
 
-    /** @deprecated use {@link #setDirectJars(ImmutableList)} instead. */
-    @Deprecated
-    public Builder addDirectJars(Iterable<String> directJars) {
-      return setDirectJars(ImmutableList.copyOf(directJars));
-    }
-
     public abstract Builder setDirectJars(ImmutableList<String> jars);
 
     public abstract Builder setProfile(String profile);
@@ -261,4 +202,11 @@ public abstract class TurbineOptions {
 
     public abstract TurbineOptions build();
   }
+
+  // TODO(b/188833569): remove when AutoValue adds @Nullable to Object if its on the classpath
+  @Override
+  public abstract boolean equals(@Nullable Object other);
+
+  @Override
+  public abstract int hashCode();
 }