Skip to content

Commit 006372e

Browse files
tylerbwongtylerbwong
authored
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
1 parent 5283a7d commit 006372e

File tree

25 files changed

+894
-966
lines changed

25 files changed

+894
-966
lines changed

‎apollo-android-support/api.txt

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
1+
// Signature format: 3.0
12
package com.apollographql.apollo {
23

3-
public final class ApolloCallback<T> {
4-
ctor public ApolloCallback(ApolloCall.Callback<T>, Handler);
5-
method public void onFailure(ApolloException);
6-
method public void onHttpError(ApolloHttpException);
7-
method public void onNetworkError(ApolloNetworkException);
8-
method public void onParseError(ApolloParseException);
9-
method public void onResponse(Response<T>);
10-
method public void onStatusEvent(ApolloCall.StatusEvent);
11-
method public static <T> com.apollographql.apollo.ApolloCallback<T> wrap(ApolloCall.Callback<T>, Handler);
4+
public final class ApolloCallback<T> extends com.apollographql.apollo.ApolloCall.Callback<T> {
5+
ctor public ApolloCallback(com.apollographql.apollo.ApolloCall.Callback<T!>, android.os.Handler);
6+
method public void onFailure(com.apollographql.apollo.exception.ApolloException);
7+
method public void onResponse(com.apollographql.apollo.api.Response<T!>);
8+
method public static <T> com.apollographql.apollo.ApolloCallback<T!>! wrap(com.apollographql.apollo.ApolloCall.Callback<T!>, android.os.Handler);
129
}
1310

14-
public final class ApolloPrefetchCallback {
15-
ctor public ApolloPrefetchCallback(ApolloPrefetch.Callback, Handler);
16-
method public void onFailure(ApolloException);
17-
method public void onHttpError(ApolloHttpException);
18-
method public void onNetworkError(ApolloNetworkException);
11+
public final class ApolloPrefetchCallback extends com.apollographql.apollo.ApolloPrefetch.Callback {
12+
ctor public ApolloPrefetchCallback(com.apollographql.apollo.ApolloPrefetch.Callback, android.os.Handler);
13+
method public void onFailure(com.apollographql.apollo.exception.ApolloException);
1914
method public void onSuccess();
20-
method public static <T> com.apollographql.apollo.ApolloPrefetchCallback wrap(ApolloPrefetch.Callback, Handler);
15+
method public static <T> com.apollographql.apollo.ApolloPrefetchCallback! wrap(com.apollographql.apollo.ApolloPrefetch.Callback, android.os.Handler);
2116
}
2217

2318
}

‎apollo-api/api.txt

Lines changed: 256 additions & 246 deletions
Large diffs are not rendered by default.

‎apollo-api/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ kotlin {
8282
}
8383
}
8484

85+
metalava {
86+
hiddenPackages += setOf("com.apollographql.apollo.api.internal")
87+
}
88+
8589
tasks.withType<Checkstyle> {
8690
exclude("**/BufferedSourceJsonReader.java")
8791
exclude("**/JsonScope.java")

‎apollo-coroutines-support/api.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1+
// Signature format: 3.0
12
package com.apollographql.apollo.coroutines {
23

34
public final class CoroutinesExtensionsKt {
4-
ctor public CoroutinesExtensionsKt();
5-
method public static suspend <T> java.lang.Object await(error.NonExistentClass, java.lang.Object);
6-
method public static suspend java.lang.Object await(error.NonExistentClass, java.lang.Object);
7-
method public static <T> error.NonExistentClass toDeferred(error.NonExistentClass);
8-
method public static <T> error.NonExistentClass toFlow(error.NonExistentClass);
9-
method public static <T> error.NonExistentClass toFlow(error.NonExistentClass);
10-
method public static <T> error.NonExistentClass toFlow(error.NonExistentClass);
11-
method public static error.NonExistentClass toJob(error.NonExistentClass);
5+
method public static suspend <T> Object? await(com.apollographql.apollo.ApolloCall<T>, kotlin.coroutines.Continuation<? super com.apollographql.apollo.api.Response<T>> p);
6+
method public static suspend Object? await(com.apollographql.apollo.ApolloPrefetch, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
7+
method @Deprecated public static <T> kotlinx.coroutines.Deferred<com.apollographql.apollo.api.Response<T>> toDeferred(com.apollographql.apollo.ApolloCall<T>);
8+
method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> kotlinx.coroutines.flow.Flow<com.apollographql.apollo.api.Response<T>> toFlow(com.apollographql.apollo.ApolloCall<T>);
9+
method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> kotlinx.coroutines.flow.Flow<com.apollographql.apollo.api.Response<T>> toFlow(com.apollographql.apollo.ApolloQueryWatcher<T>);
10+
method @kotlinx.coroutines.ExperimentalCoroutinesApi public static <T> kotlinx.coroutines.flow.Flow<com.apollographql.apollo.api.Response<T>> toFlow(com.apollographql.apollo.ApolloSubscriptionCall<T>);
11+
method @Deprecated public static kotlinx.coroutines.Job toJob(com.apollographql.apollo.ApolloPrefetch);
1212
}
1313

1414
}

‎apollo-gradle-plugin/api.txt

Lines changed: 83 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,103 +1,104 @@
1+
// Signature format: 3.0
12
package com.apollographql.apollo.gradle.api {
23

34
public final class ApolloAttributes {
4-
method public error.NonExistentClass getAPOLLO_SERVICE_ATTRIBUTE();
5-
method public error.NonExistentClass getAPOLLO_VARIANT_ATTRIBUTE();
6-
property public final error.NonExistentClass APOLLO_SERVICE_ATTRIBUTE;
7-
property public final error.NonExistentClass APOLLO_VARIANT_ATTRIBUTE;
5+
method public error.NonExistentClass! getAPOLLO_SERVICE_ATTRIBUTE();
6+
method public error.NonExistentClass! getAPOLLO_VARIANT_ATTRIBUTE();
7+
property public final error.NonExistentClass! APOLLO_SERVICE_ATTRIBUTE;
8+
property public final error.NonExistentClass! APOLLO_VARIANT_ATTRIBUTE;
89
field public static final com.apollographql.apollo.gradle.api.ApolloAttributes INSTANCE;
910
}
1011

11-
public static abstract interface ApolloAttributes.Service {
12+
public static interface ApolloAttributes.Service extends org.gradle.api.Named {
1213
}
1314

14-
public static abstract interface ApolloAttributes.Variant {
15+
public static interface ApolloAttributes.Variant extends org.gradle.api.Named {
1516
}
1617

17-
public abstract interface ApolloExtension implements com.apollographql.apollo.gradle.api.CompilerParams {
18-
method public abstract void onCompilationUnit(error.NonExistentClass);
19-
method public abstract void service(error.NonExistentClass, error.NonExistentClass);
18+
public interface ApolloExtension extends com.apollographql.apollo.gradle.api.CompilerParams {
19+
method public void onCompilationUnit(org.gradle.api.Action<com.apollographql.apollo.gradle.api.CompilationUnit> action);
20+
method public void service(String name, org.gradle.api.Action<com.apollographql.apollo.gradle.internal.DefaultService> action);
2021
}
2122

22-
public abstract interface CompilationUnit implements com.apollographql.apollo.gradle.api.CompilerParams {
23-
method public abstract error.NonExistentClass getAndroidVariant();
24-
method public abstract error.NonExistentClass getName();
25-
method public abstract error.NonExistentClass getOperationOutputFile();
26-
method public abstract error.NonExistentClass getOutputDir();
27-
method public abstract error.NonExistentClass getServiceName();
28-
method public abstract error.NonExistentClass getVariantName();
29-
property public abstract error.NonExistentClass androidVariant;
30-
property public abstract error.NonExistentClass name;
31-
property public abstract error.NonExistentClass operationOutputFile;
32-
property public abstract error.NonExistentClass outputDir;
33-
property public abstract error.NonExistentClass serviceName;
34-
property public abstract error.NonExistentClass variantName;
23+
public interface CompilationUnit extends com.apollographql.apollo.gradle.api.CompilerParams {
24+
method public Object? getAndroidVariant();
25+
method public String getName();
26+
method public org.gradle.api.provider.Provider<org.gradle.api.file.RegularFile> getOperationOutputFile();
27+
method public org.gradle.api.provider.Provider<org.gradle.api.file.Directory> getOutputDir();
28+
method public String getServiceName();
29+
method public String getVariantName();
30+
property public abstract Object? androidVariant;
31+
property public abstract String name;
32+
property public abstract org.gradle.api.provider.Provider<org.gradle.api.file.RegularFile> operationOutputFile;
33+
property public abstract org.gradle.api.provider.Provider<org.gradle.api.file.Directory> outputDir;
34+
property public abstract String serviceName;
35+
property public abstract String variantName;
3536
}
3637

37-
public abstract interface CompilerParams {
38-
method public abstract error.NonExistentClass getAlwaysGenerateTypesMatching();
39-
method public abstract error.NonExistentClass getCustomTypeMapping();
40-
method public abstract error.NonExistentClass getFailOnWarnings();
41-
method public abstract error.NonExistentClass getGenerateApolloMetadata();
42-
method public abstract error.NonExistentClass getGenerateAsInternal();
43-
method public abstract error.NonExistentClass getGenerateKotlinModels();
44-
method public abstract error.NonExistentClass getGenerateModelBuilder();
45-
method public abstract error.NonExistentClass getGenerateOperationOutput();
46-
method public abstract error.NonExistentClass getGenerateVisitorForPolymorphicDatatypes();
47-
method public abstract error.NonExistentClass getGraphqlSourceDirectorySet();
48-
method public abstract error.NonExistentClass getNullableValueType();
49-
method public abstract error.NonExistentClass getOperationIdGenerator();
50-
method public abstract error.NonExistentClass getOperationOutputGenerator();
51-
method public abstract error.NonExistentClass getPackageName();
52-
method public abstract error.NonExistentClass getRootPackageName();
53-
method public abstract error.NonExistentClass getSchemaFile();
54-
method public abstract error.NonExistentClass getSealedClassesForEnumsMatching();
55-
method public abstract error.NonExistentClass getSuppressRawTypesWarning();
56-
method public abstract error.NonExistentClass getUseJavaBeansSemanticNaming();
57-
method public abstract error.NonExistentClass getUseSemanticNaming();
58-
method public abstract error.NonExistentClass getWarnOnDeprecatedUsages();
59-
property public abstract error.NonExistentClass alwaysGenerateTypesMatching;
60-
property public abstract error.NonExistentClass customTypeMapping;
61-
property public abstract error.NonExistentClass failOnWarnings;
62-
property public abstract error.NonExistentClass generateApolloMetadata;
63-
property public abstract error.NonExistentClass generateAsInternal;
64-
property public abstract error.NonExistentClass generateKotlinModels;
65-
property public abstract error.NonExistentClass generateModelBuilder;
66-
property public abstract error.NonExistentClass generateOperationOutput;
67-
property public abstract error.NonExistentClass generateVisitorForPolymorphicDatatypes;
68-
property public abstract error.NonExistentClass graphqlSourceDirectorySet;
69-
property public abstract error.NonExistentClass nullableValueType;
70-
property public abstract error.NonExistentClass operationIdGenerator;
71-
property public abstract error.NonExistentClass operationOutputGenerator;
72-
property public abstract error.NonExistentClass packageName;
73-
property public abstract error.NonExistentClass rootPackageName;
74-
property public abstract error.NonExistentClass schemaFile;
75-
property public abstract error.NonExistentClass sealedClassesForEnumsMatching;
76-
property public abstract error.NonExistentClass suppressRawTypesWarning;
77-
property public abstract error.NonExistentClass useJavaBeansSemanticNaming;
78-
property public abstract error.NonExistentClass useSemanticNaming;
79-
property public abstract error.NonExistentClass warnOnDeprecatedUsages;
38+
public interface CompilerParams {
39+
method public org.gradle.api.provider.SetProperty<java.lang.String> getAlwaysGenerateTypesMatching();
40+
method public org.gradle.api.provider.MapProperty<java.lang.String,java.lang.String> getCustomTypeMapping();
41+
method public org.gradle.api.provider.Property<java.lang.Boolean> getFailOnWarnings();
42+
method public org.gradle.api.provider.Property<java.lang.Boolean> getGenerateApolloMetadata();
43+
method public org.gradle.api.provider.Property<java.lang.Boolean> getGenerateAsInternal();
44+
method public org.gradle.api.provider.Property<java.lang.Boolean> getGenerateKotlinModels();
45+
method public org.gradle.api.provider.Property<java.lang.Boolean> getGenerateModelBuilder();
46+
method public org.gradle.api.provider.Property<java.lang.Boolean> getGenerateOperationOutput();
47+
method public org.gradle.api.provider.Property<java.lang.Boolean> getGenerateVisitorForPolymorphicDatatypes();
48+
method public org.gradle.api.file.SourceDirectorySet getGraphqlSourceDirectorySet();
49+
method public org.gradle.api.provider.Property<java.lang.String> getNullableValueType();
50+
method public org.gradle.api.provider.Property<error.NonExistentClass> getOperationIdGenerator();
51+
method public org.gradle.api.provider.Property<error.NonExistentClass> getOperationOutputGenerator();
52+
method public org.gradle.api.provider.Property<java.lang.String> getPackageName();
53+
method public org.gradle.api.provider.Property<java.lang.String> getRootPackageName();
54+
method public org.gradle.api.file.RegularFileProperty getSchemaFile();
55+
method public org.gradle.api.provider.ListProperty<java.lang.String> getSealedClassesForEnumsMatching();
56+
method public org.gradle.api.provider.Property<java.lang.Boolean> getSuppressRawTypesWarning();
57+
method public org.gradle.api.provider.Property<java.lang.Boolean> getUseJavaBeansSemanticNaming();
58+
method public org.gradle.api.provider.Property<java.lang.Boolean> getUseSemanticNaming();
59+
method public org.gradle.api.provider.Property<java.lang.Boolean> getWarnOnDeprecatedUsages();
60+
property public abstract org.gradle.api.provider.SetProperty<java.lang.String> alwaysGenerateTypesMatching;
61+
property public abstract org.gradle.api.provider.MapProperty<java.lang.String,java.lang.String> customTypeMapping;
62+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> failOnWarnings;
63+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> generateApolloMetadata;
64+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> generateAsInternal;
65+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> generateKotlinModels;
66+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> generateModelBuilder;
67+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> generateOperationOutput;
68+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> generateVisitorForPolymorphicDatatypes;
69+
property public abstract org.gradle.api.file.SourceDirectorySet graphqlSourceDirectorySet;
70+
property public abstract org.gradle.api.provider.Property<java.lang.String> nullableValueType;
71+
property public abstract org.gradle.api.provider.Property<error.NonExistentClass> operationIdGenerator;
72+
property public abstract org.gradle.api.provider.Property<error.NonExistentClass> operationOutputGenerator;
73+
property public abstract org.gradle.api.provider.Property<java.lang.String> packageName;
74+
property public abstract org.gradle.api.provider.Property<java.lang.String> rootPackageName;
75+
property public abstract org.gradle.api.file.RegularFileProperty schemaFile;
76+
property public abstract org.gradle.api.provider.ListProperty<java.lang.String> sealedClassesForEnumsMatching;
77+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> suppressRawTypesWarning;
78+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> useJavaBeansSemanticNaming;
79+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> useSemanticNaming;
80+
property public abstract org.gradle.api.provider.Property<java.lang.Boolean> warnOnDeprecatedUsages;
8081
}
8182

82-
public abstract interface Introspection {
83-
method public abstract error.NonExistentClass getEndpointUrl();
84-
method public abstract error.NonExistentClass getHeaders();
85-
method public abstract error.NonExistentClass getQueryParameters();
86-
method public abstract error.NonExistentClass getSourceSetName();
87-
property public abstract error.NonExistentClass endpointUrl;
88-
property public abstract error.NonExistentClass headers;
89-
property public abstract error.NonExistentClass queryParameters;
90-
property public abstract error.NonExistentClass sourceSetName;
83+
public interface Introspection {
84+
method public org.gradle.api.provider.Property<java.lang.String> getEndpointUrl();
85+
method public org.gradle.api.provider.MapProperty<java.lang.String,java.lang.String> getHeaders();
86+
method @Deprecated public org.gradle.api.provider.MapProperty<java.lang.String,java.lang.String> getQueryParameters();
87+
method public org.gradle.api.provider.Property<java.lang.String> getSourceSetName();
88+
property public abstract org.gradle.api.provider.Property<java.lang.String> endpointUrl;
89+
property public abstract org.gradle.api.provider.MapProperty<java.lang.String,java.lang.String> headers;
90+
property @Deprecated public abstract org.gradle.api.provider.MapProperty<java.lang.String,java.lang.String> queryParameters;
91+
property public abstract org.gradle.api.provider.Property<java.lang.String> sourceSetName;
9192
}
9293

93-
public abstract interface Service implements com.apollographql.apollo.gradle.api.CompilerParams {
94-
method public abstract error.NonExistentClass getExclude();
95-
method public abstract error.NonExistentClass getSchemaPath();
96-
method public abstract error.NonExistentClass getSourceFolder();
97-
method public abstract void introspection(error.NonExistentClass);
98-
property public abstract error.NonExistentClass exclude;
99-
property public abstract error.NonExistentClass schemaPath;
100-
property public abstract error.NonExistentClass sourceFolder;
94+
public interface Service extends com.apollographql.apollo.gradle.api.CompilerParams {
95+
method public org.gradle.api.provider.ListProperty<java.lang.String> getExclude();
96+
method public org.gradle.api.provider.Property<java.lang.String> getSchemaPath();
97+
method public org.gradle.api.provider.Property<java.lang.String> getSourceFolder();
98+
method public void introspection(org.gradle.api.Action<? super com.apollographql.apollo.gradle.api.Introspection> configure);
99+
property public abstract org.gradle.api.provider.ListProperty<java.lang.String> exclude;
100+
property public abstract org.gradle.api.provider.Property<java.lang.String> schemaPath;
101+
property public abstract org.gradle.api.provider.Property<java.lang.String> sourceFolder;
101102
}
102103

103104
}

‎apollo-gradle-plugin/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ fun Any.dot(key: String): Any {
1515
return (this as Map<String, *>)[key]!!
1616
}
1717

18+
metalava {
19+
hiddenPackages += setOf("com.apollographql.apollo.gradle.internal")
20+
}
21+
1822
dependencies {
1923
compileOnly(gradleApi())
2024
compileOnly(dep("kotlin").dot("plugin"))

0 commit comments

Comments
 (0)