Swap @DoNotMock for error-prone's version (#458)

* Swap `@DoNotMock` for error-prone's version They re-published one now so we can just use that. * Update API
uber · Sep 7, 2021 · 18d01da · 18d01da
1 parent 91a4fdb
commit 18d01da
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 48 deletions.
diff --git a/autodispose-lifecycle/build.gradle b/autodispose-lifecycle/build.gradle
@@ -21,6 +21,7 @@ plugins {
 
 dependencies {
   api project(":autodispose")
+  compileOnly deps.build.errorProneAnnotations
 
   signature deps.build.animalSniffer
 

diff --git a/autodispose-lifecycle/src/main/java/autodispose2/lifecycle/LifecycleScopeProvider.java b/autodispose-lifecycle/src/main/java/autodispose2/lifecycle/LifecycleScopeProvider.java
@@ -16,7 +16,7 @@
 package autodispose2.lifecycle;
 
 import autodispose2.ScopeProvider;
-import autodispose2.internal.DoNotMock;
+import com.google.errorprone.annotations.DoNotMock;
 import io.reactivex.rxjava3.annotations.CheckReturnValue;
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.annotations.Nullable;

diff --git a/autodispose/api/autodispose.api b/autodispose/api/autodispose.api
@@ -134,10 +134,6 @@ public final class autodispose2/TestScopeProvider : autodispose2/ScopeProvider {
 	public fun requestScope ()Lio/reactivex/rxjava3/core/CompletableSource;
 }
 
-public abstract interface annotation class autodispose2/internal/DoNotMock : java/lang/annotation/Annotation {
-	public abstract fun value ()Ljava/lang/String;
-}
-
 public abstract interface class autodispose2/observers/AutoDisposingCompletableObserver : io/reactivex/rxjava3/core/CompletableObserver, io/reactivex/rxjava3/disposables/Disposable {
 	public abstract fun delegateObserver ()Lio/reactivex/rxjava3/core/CompletableObserver;
 }

diff --git a/autodispose/build.gradle b/autodispose/build.gradle
@@ -27,6 +27,7 @@ lintOptions {
 
 dependencies {
   api deps.rx.java
+  compileOnly deps.build.errorProneAnnotations
 
   signature deps.build.animalSniffer
   lintChecks project(':static-analysis:autodispose-lint')

diff --git a/autodispose/src/main/java/autodispose2/ScopeProvider.java b/autodispose/src/main/java/autodispose2/ScopeProvider.java
@@ -15,7 +15,7 @@
  */
 package autodispose2;
 
-import autodispose2.internal.DoNotMock;
+import com.google.errorprone.annotations.DoNotMock;
 import io.reactivex.rxjava3.annotations.CheckReturnValue;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.CompletableSource;

diff --git a/autodispose/src/main/java/autodispose2/internal/DoNotMock.java b/autodispose/src/main/java/autodispose2/internal/DoNotMock.java
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -41,6 +41,7 @@ def build = [
     javaVersion: JavaVersion.VERSION_1_8,
 
     errorProne: "com.google.errorprone:error_prone_core:${versions.errorProne}",
+    errorProneAnnotations: "com.google.errorprone:error_prone_annotations:${versions.errorProne}",
     errorProneJavac: "com.google.errorprone:javac:9+181-r4173-1",
     errorProneCheckApi: "com.google.errorprone:error_prone_check_api:${versions.errorProne}",
     errorProneTestHelpers: "com.google.errorprone:error_prone_test_helpers:${versions.errorProne}",