Fix error.NonExistentClass in Metalava Signature Files (#2755)

* Fix error.NonExistentClass in Metalava Signature Files * Exclude internal packages * Remove SNAPSHOT version * Fix bad imports * Revert unnecessary changes * Fix matchingFallbacks API call * Bump Version 0.1.1 * Revert AGP and bump Gradle Plugin to 0.1.2 * Revert more unnecessary changes * Plugin 0.1.3 * Add signature file updates from macOS build * Metalava Gradle 0.1.4
apollographql · Dec 21, 2020 · dd82490 · dd82490
1 parent 4ac966a
commit dd82490
Show file tree

Hide file tree

Showing 24 changed files with 812 additions and 884 deletions.
diff --git a/apollo-android-support/api.txt b/apollo-android-support/api.txt
@@ -1,23 +1,18 @@
+// Signature format: 3.0
 package com.apollographql.apollo {
 
-  public final class ApolloCallback<T> {
-    ctor public ApolloCallback(ApolloCall.Callback<T>, Handler);
-    method public void onFailure(ApolloException);
-    method public void onHttpError(ApolloHttpException);
-    method public void onNetworkError(ApolloNetworkException);
-    method public void onParseError(ApolloParseException);
-    method public void onResponse(Response<T>);
-    method public void onStatusEvent(ApolloCall.StatusEvent);
-    method public static <T> com.apollographql.apollo.ApolloCallback<T> wrap(ApolloCall.Callback<T>, Handler);
+  public final class ApolloCallback<T> extends com.apollographql.apollo.ApolloCall.Callback<T> {
+    ctor public ApolloCallback(com.apollographql.apollo.ApolloCall.Callback<T!>, android.os.Handler);
+    method public void onFailure(com.apollographql.apollo.exception.ApolloException);
+    method public void onResponse(com.apollographql.apollo.api.Response<T!>);
+    method public static <T> com.apollographql.apollo.ApolloCallback<T!>! wrap(com.apollographql.apollo.ApolloCall.Callback<T!>, android.os.Handler);
   }
 
-  public final class ApolloPrefetchCallback {
-    ctor public ApolloPrefetchCallback(ApolloPrefetch.Callback, Handler);
-    method public void onFailure(ApolloException);
-    method public void onHttpError(ApolloHttpException);
-    method public void onNetworkError(ApolloNetworkException);
+  public final class ApolloPrefetchCallback extends com.apollographql.apollo.ApolloPrefetch.Callback {
+    ctor public ApolloPrefetchCallback(com.apollographql.apollo.ApolloPrefetch.Callback, android.os.Handler);
+    method public void onFailure(com.apollographql.apollo.exception.ApolloException);
     method public void onSuccess();
-    method public static <T> com.apollographql.apollo.ApolloPrefetchCallback wrap(ApolloPrefetch.Callback, Handler);
+    method public static <T> com.apollographql.apollo.ApolloPrefetchCallback! wrap(com.apollographql.apollo.ApolloPrefetch.Callback, android.os.Handler);
   }
 
 }

diff --git a/apollo-api/api.txt b/apollo-api/api.txt
diff --git a/apollo-api/build.gradle.kts b/apollo-api/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  `java-library`
   kotlin("multiplatform")
 }
 
@@ -78,3 +79,7 @@ kotlin {
     }
   }
 }
+
+metalava {
+  hiddenPackages += setOf("com.apollographql.apollo.api.internal")
+}
diff --git a/apollo-coroutines-support/api.txt b/apollo-coroutines-support/api.txt
@@ -1,14 +1,14 @@
+// Signature format: 3.0
 package com.apollographql.apollo.coroutines {
 
   public final class CoroutinesExtensionsKt {
-    ctor public CoroutinesExtensionsKt();
-    method public static suspend <T> java.lang.Object await(error.NonExistentClass, java.lang.Object);
-    method public static suspend java.lang.Object await(error.NonExistentClass, java.lang.Object);
-    method public static <T> error.NonExistentClass toDeferred(error.NonExistentClass);
-    method public static <T> error.NonExistentClass toFlow(error.NonExistentClass);
-    method public static <T> error.NonExistentClass toFlow(error.NonExistentClass);
-    method public static <T> error.NonExistentClass toFlow(error.NonExistentClass);
-    method public static error.NonExistentClass toJob(error.NonExistentClass);
+    method public static suspend <T> Object? await(com.apollographql.apollo.ApolloCall<T>, kotlin.coroutines.Continuation<? super com.apollographql.apollo.api.Response<T>> p);
+    method public static suspend Object? await(com.apollographql.apollo.ApolloPrefetch, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
+    method @Deprecated public static <T> kotlinx.coroutines.Deferred<com.apollographql.apollo.api.Response<T>> toDeferred(com.apollographql.apollo.ApolloCall<T>);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> kotlinx.coroutines.flow.Flow<com.apollographql.apollo.api.Response<T>> toFlow(com.apollographql.apollo.ApolloCall<T>);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> kotlinx.coroutines.flow.Flow<com.apollographql.apollo.api.Response<T>> toFlow(com.apollographql.apollo.ApolloQueryWatcher<T>);
+    method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> kotlinx.coroutines.flow.Flow<com.apollographql.apollo.api.Response<T>> toFlow(com.apollographql.apollo.ApolloSubscriptionCall<T>);
+    method @Deprecated public static kotlinx.coroutines.Job toJob(com.apollographql.apollo.ApolloPrefetch);
   }
 
 }

diff --git a/apollo-gradle-plugin/build.gradle.kts b/apollo-gradle-plugin/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
 }
 
 
+metalava {
+  hiddenPackages += setOf("com.apollographql.apollo.gradle.internal")
+}
+
 dependencies {
   compileOnly(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))
   compileOnly(groovy.util.Eval.x(project, "x.dep.android.minPlugin"))

diff --git a/apollo-http-cache-api/api.txt b/apollo-http-cache-api/api.txt
@@ -1,87 +1,84 @@
+// Signature format: 3.0
 package com.apollographql.apollo.api.cache.http {
 
-  public abstract interface HttpCache {
-    method public abstract void clear();
-    method public abstract error.NonExistentClass interceptor();
-    method public abstract error.NonExistentClass read(error.NonExistentClass);
-    method public abstract error.NonExistentClass read(error.NonExistentClass, error.NonExistentClass);
-    method public abstract void remove(error.NonExistentClass);
-    method public abstract void removeQuietly(error.NonExistentClass);
-    field public static final java.lang.String CACHE_DO_NOT_STORE = "X-APOLLO-CACHE-DO-NOT-STORE";
-    field public static final java.lang.String CACHE_EXPIRE_AFTER_READ_HEADER = "X-APOLLO-EXPIRE-AFTER-READ";
-    field public static final java.lang.String CACHE_EXPIRE_TIMEOUT_HEADER = "X-APOLLO-EXPIRE-TIMEOUT";
-    field public static final java.lang.String CACHE_FETCH_STRATEGY_HEADER = "X-APOLLO-CACHE-FETCH-STRATEGY";
-    field public static final java.lang.String CACHE_KEY_HEADER = "X-APOLLO-CACHE-KEY";
-    field public static final java.lang.String CACHE_PREFETCH_HEADER = "X-APOLLO-PREFETCH";
-    field public static final java.lang.String CACHE_SERVED_DATE_HEADER = "X-APOLLO-SERVED-DATE";
+  public interface HttpCache {
+    method public void clear();
+    method public okhttp3.Interceptor interceptor();
+    method public okhttp3.Response? read(String cacheKey);
+    method public okhttp3.Response? read(String cacheKey, boolean expireAfterRead);
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public void remove(String cacheKey);
+    method public void removeQuietly(String cacheKey);
+    field public static final String CACHE_DO_NOT_STORE = "X-APOLLO-CACHE-DO-NOT-STORE";
+    field public static final String CACHE_EXPIRE_AFTER_READ_HEADER = "X-APOLLO-EXPIRE-AFTER-READ";
+    field public static final String CACHE_EXPIRE_TIMEOUT_HEADER = "X-APOLLO-EXPIRE-TIMEOUT";
+    field public static final String CACHE_FETCH_STRATEGY_HEADER = "X-APOLLO-CACHE-FETCH-STRATEGY";
+    field public static final String CACHE_KEY_HEADER = "X-APOLLO-CACHE-KEY";
+    field public static final String CACHE_PREFETCH_HEADER = "X-APOLLO-PREFETCH";
+    field public static final String CACHE_SERVED_DATE_HEADER = "X-APOLLO-SERVED-DATE";
     field public static final com.apollographql.apollo.api.cache.http.HttpCache.Companion Companion;
-    field public static final java.lang.String FROM_CACHE = "X-APOLLO-FROM-CACHE";
+    field public static final String FROM_CACHE = "X-APOLLO-FROM-CACHE";
   }
 
   public static final class HttpCache.Companion {
-    field public static final java.lang.String CACHE_DO_NOT_STORE = "X-APOLLO-CACHE-DO-NOT-STORE";
-    field public static final java.lang.String CACHE_EXPIRE_AFTER_READ_HEADER = "X-APOLLO-EXPIRE-AFTER-READ";
-    field public static final java.lang.String CACHE_EXPIRE_TIMEOUT_HEADER = "X-APOLLO-EXPIRE-TIMEOUT";
-    field public static final java.lang.String CACHE_FETCH_STRATEGY_HEADER = "X-APOLLO-CACHE-FETCH-STRATEGY";
-    field public static final java.lang.String CACHE_KEY_HEADER = "X-APOLLO-CACHE-KEY";
-    field public static final java.lang.String CACHE_PREFETCH_HEADER = "X-APOLLO-PREFETCH";
-    field public static final java.lang.String CACHE_SERVED_DATE_HEADER = "X-APOLLO-SERVED-DATE";
-    field public static final java.lang.String FROM_CACHE = "X-APOLLO-FROM-CACHE";
+    field public static final String CACHE_DO_NOT_STORE = "X-APOLLO-CACHE-DO-NOT-STORE";
+    field public static final String CACHE_EXPIRE_AFTER_READ_HEADER = "X-APOLLO-EXPIRE-AFTER-READ";
+    field public static final String CACHE_EXPIRE_TIMEOUT_HEADER = "X-APOLLO-EXPIRE-TIMEOUT";
+    field public static final String CACHE_FETCH_STRATEGY_HEADER = "X-APOLLO-CACHE-FETCH-STRATEGY";
+    field public static final String CACHE_KEY_HEADER = "X-APOLLO-CACHE-KEY";
+    field public static final String CACHE_PREFETCH_HEADER = "X-APOLLO-PREFETCH";
+    field public static final String CACHE_SERVED_DATE_HEADER = "X-APOLLO-SERVED-DATE";
+    field public static final String FROM_CACHE = "X-APOLLO-FROM-CACHE";
   }
 
   public final class HttpCachePolicy {
-    method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy getCACHE_FIRST();
-    method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy getCACHE_ONLY();
-    method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy getNETWORK_FIRST();
-    method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.Policy getNETWORK_ONLY();
-    property public final com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy CACHE_FIRST;
-    property public final com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy CACHE_ONLY;
-    property public final com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy NETWORK_FIRST;
-    property public final com.apollographql.apollo.api.cache.http.HttpCachePolicy.Policy NETWORK_ONLY;
+    field public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy CACHE_FIRST;
+    field public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy CACHE_ONLY;
     field public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy INSTANCE;
+    field public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy NETWORK_FIRST;
+    field public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.Policy NETWORK_ONLY;
   }
 
   public static final class HttpCachePolicy.ExpirePolicy extends com.apollographql.apollo.api.cache.http.HttpCachePolicy.Policy {
-    method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy expireAfter(error.NonExistentClass, error.NonExistentClass);
+    method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy expireAfter(long expireTimeout, error.NonExistentClass expireTimeUnit);
     method public com.apollographql.apollo.api.cache.http.HttpCachePolicy.ExpirePolicy expireAfterRead();
   }
 
-  public static class HttpCachePolicy.FetchStrategy {
-    method public static com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy valueOf(java.lang.String);
-    method public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy[] values();
+  public enum HttpCachePolicy.FetchStrategy {
+    method public static com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy valueOf(String name);
+    method public static com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy[] values();
     enum_constant public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy CACHE_FIRST;
     enum_constant public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy CACHE_ONLY;
     enum_constant public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy NETWORK_FIRST;
     enum_constant public static final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy NETWORK_ONLY;
   }
 
   public static class HttpCachePolicy.Policy {
-    ctor public HttpCachePolicy.Policy(com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy, error.NonExistentClass, error.NonExistentClass, error.NonExistentClass);
-    method public final error.NonExistentClass expireTimeoutMs();
-    method public final error.NonExistentClass getExpireAfterRead();
-    method public final error.NonExistentClass getExpireTimeUnit();
-    method public final error.NonExistentClass getExpireTimeout();
-    method public final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy getFetchStrategy();
+    ctor public HttpCachePolicy.Policy(com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy fetchStrategy, long expireTimeout, error.NonExistentClass? expireTimeUnit, boolean expireAfterRead);
+    method public final long expireTimeoutMs();
+    field public final boolean expireAfterRead;
+    field public final error.NonExistentClass? expireTimeUnit;
+    field public final long expireTimeout;
+    field public final com.apollographql.apollo.api.cache.http.HttpCachePolicy.FetchStrategy fetchStrategy;
   }
 
-  public abstract interface HttpCacheRecord {
-    method public abstract error.NonExistentClass bodySource();
-    method public abstract void close();
-    method public abstract error.NonExistentClass headerSource();
+  public interface HttpCacheRecord {
+    method public okio.Source bodySource();
+    method public void close();
+    method public okio.Source headerSource();
   }
 
-  public abstract interface HttpCacheRecordEditor {
-    method public abstract void abort();
-    method public abstract error.NonExistentClass bodySink();
-    method public abstract void commit();
-    method public abstract error.NonExistentClass headerSink();
+  public interface HttpCacheRecordEditor {
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public void abort();
+    method public okio.Sink bodySink();
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public void commit();
+    method public okio.Sink headerSink();
   }
 
-  public abstract interface HttpCacheStore {
-    method public abstract com.apollographql.apollo.api.cache.http.HttpCacheRecord cacheRecord(error.NonExistentClass);
-    method public abstract com.apollographql.apollo.api.cache.http.HttpCacheRecordEditor cacheRecordEditor(error.NonExistentClass);
-    method public abstract void delete();
-    method public abstract void remove(error.NonExistentClass);
+  public interface HttpCacheStore {
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public com.apollographql.apollo.api.cache.http.HttpCacheRecord? cacheRecord(String cacheKey);
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public com.apollographql.apollo.api.cache.http.HttpCacheRecordEditor? cacheRecordEditor(String cacheKey);
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public void delete();
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public void remove(String cacheKey);
   }
 
 }

diff --git a/apollo-http-cache/api.txt b/apollo-http-cache/api.txt
@@ -1,12 +1,13 @@
+// Signature format: 3.0
 package com.apollographql.apollo.cache.http {
 
   public final class ApolloHttpCache {
     ctor public ApolloHttpCache(HttpCacheStore);
-    ctor public ApolloHttpCache(HttpCacheStore, Logger);
+    ctor public ApolloHttpCache(HttpCacheStore, com.apollographql.apollo.Logger?);
     method public void clear();
-    method public Interceptor interceptor();
-    method public Response read(String);
-    method public Response read(String, boolean);
+    method public okhttp3.Interceptor! interceptor();
+    method public okhttp3.Response! read(String);
+    method public okhttp3.Response! read(String, boolean);
     method public void remove(String);
     method public void removeQuietly(String);
   }

diff --git a/apollo-http-cache/build.gradle.kts b/apollo-http-cache/build.gradle.kts
@@ -2,6 +2,10 @@ plugins {
   kotlin("jvm")
 }
 
+metalava {
+  hiddenPackages += setOf("com.apollographql.apollo.cache.http.internal")
+}
+
 dependencies {
   api(groovy.util.Eval.x(project, "x.dep.okHttp.okHttp"))
   api(project(":apollo-api"))

diff --git a/apollo-idling-resource/api.txt b/apollo-idling-resource/api.txt
@@ -1,10 +1,11 @@
+// Signature format: 3.0
 package com.apollographql.apollo.test.espresso {
 
-  public final class ApolloIdlingResource {
-    method public static com.apollographql.apollo.test.espresso.ApolloIdlingResource create(String, ApolloClient);
-    method public String getName();
+  public final class ApolloIdlingResource implements androidx.test.espresso.IdlingResource {
+    method public static com.apollographql.apollo.test.espresso.ApolloIdlingResource! create(String, com.apollographql.apollo.ApolloClient);
+    method public String! getName();
     method public boolean isIdleNow();
-    method public void registerIdleTransitionCallback(ResourceCallback);
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
   }
 
 }