Skip to content

Commit feb5ab9

Browse files
vkryachkovkryachko
committed
Update metalava api.txt, fix metalava task.
1 parent 00956bc commit feb5ab9

File tree

15 files changed

+290
-20
lines changed

15 files changed

+290
-20
lines changed

‎buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,17 @@ private static void setupApiInformationAnalysis(Project project, LibraryExtensio
101101
task -> {
102102
task.setOutputFile(metalavaOutputJarFile);
103103
});
104+
File apiTxt =
105+
project.file("api.txt").exists()
106+
? project.file("api.txt")
107+
: project.file(project.getRootDir() + "/empty-api.txt");
104108
project
105109
.getTasks()
106110
.register(
107111
"apiInformation",
108112
ApiInformationTask.class,
109113
task -> {
110-
task.setApiTxt(project.file("api.txt"));
114+
task.setApiTxt(apiTxt);
111115
task.setMetalavaJarPath(metalavaOutputJarFile.getAbsolutePath());
112116
task.setSourceSet(mainSourceSet);
113117
task.setOutputFile(outputFile);

‎buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/ApiInformationTask.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ void execute() {
7676
.filter(File::exists)
7777
.map(File::getAbsolutePath)
7878
.collect(Collectors.joining(":"));
79+
if (sourcePath.isEmpty()) {
80+
getLogger()
81+
.warn(
82+
"Project {} has no sources in main source set, skipping...", getProject().getPath());
83+
return;
84+
}
85+
7986
File outputFileDir = getOutputFile().getParentFile();
8087
if (!outputFileDir.exists()) {
8188
outputFileDir.mkdirs();
@@ -89,6 +96,7 @@ void execute() {
8996
spec.setArgs(
9097
Arrays.asList(
9198
getMetalavaJarPath(),
99+
"--no-banner",
92100
"--source-path",
93101
sourcePath,
94102
"--api",
@@ -104,13 +112,13 @@ void execute() {
104112
new ArrayList<>(
105113
Arrays.asList(
106114
getMetalavaJarPath(),
115+
"--no-banner",
107116
"--source-files",
108117
getOutputApiFile().getAbsolutePath(),
109118
"--check-compatibility:api:current",
110119
getApiTxt().getAbsolutePath(),
111120
"--format=v2",
112-
"--no-color",
113-
"--delete-empty-baselines"));
121+
"--no-color"));
114122
if (getUpdateBaseline()) {
115123
args.addAll(
116124
Arrays.asList("--update-baseline", getBaselineFile().getAbsolutePath()));

‎buildSrc/src/main/groovy/com/google/firebase/gradle/plugins/apiinfo/GenerateApiTxtFileTask.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,22 @@ void execute() {
5858
.filter(File::exists)
5959
.map(File::getAbsolutePath)
6060
.collect(Collectors.joining(":"));
61+
if (sourcePath.isEmpty()) {
62+
getLogger()
63+
.warn(
64+
"Project {} has no sources in main source set, skipping...", getProject().getPath());
65+
return;
66+
}
6167
List<String> args =
6268
new ArrayList<>(
6369
Arrays.asList(
6470
getMetalavaJarPath(),
71+
"--no-banner",
6572
"--source-path",
6673
sourcePath,
6774
"--api",
6875
getApiTxt().getAbsolutePath(),
69-
"--format=v2",
70-
"--delete-empty-baselines"));
76+
"--format=v2"));
7177

7278
if (getUpdateBaseline()) {
7379
args.addAll(Arrays.asList("--update-baseline", getBaselineFile().getAbsolutePath()));

‎protolite-well-known-types/api.txt renamed to ‎empty-api.txt

File renamed without changes.

‎firebase-common/ktx/api.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.ktx {
3+
4+
public final class Firebase {
5+
field public static final com.google.firebase.ktx.Firebase INSTANCE;
6+
}
7+
8+
public final class FirebaseKt {
9+
ctor public FirebaseKt();
10+
method @NonNull public static error.NonExistentClass app(@NonNull com.google.firebase.ktx.Firebase, @NonNull error.NonExistentClass name);
11+
method @NonNull public static error.NonExistentClass getApp(@NonNull com.google.firebase.ktx.Firebase);
12+
method @NonNull public static error.NonExistentClass getOptions(@NonNull com.google.firebase.ktx.Firebase);
13+
method @Nullable public static error.NonExistentClass initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull error.NonExistentClass context);
14+
method @NonNull public static error.NonExistentClass initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull error.NonExistentClass context, @NonNull error.NonExistentClass options);
15+
method @NonNull public static error.NonExistentClass initialize(@NonNull com.google.firebase.ktx.Firebase, @NonNull error.NonExistentClass context, @NonNull error.NonExistentClass options, @NonNull error.NonExistentClass name);
16+
}
17+
18+
}
19+

‎firebase-config/ktx/api.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.remoteconfig.ktx {
3+
4+
public final class RemoteConfigKt {
5+
ctor public RemoteConfigKt();
6+
method @NonNull public static operator error.NonExistentClass get(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass key);
7+
method @NonNull public static error.NonExistentClass getRemoteConfig(@NonNull error.NonExistentClass);
8+
method @NonNull public static error.NonExistentClass remoteConfig(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app);
9+
method @NonNull public static error.NonExistentClass remoteConfigSettings(@NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
10+
}
11+
12+
}
13+

‎firebase-database/ktx/api.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.database.ktx {
3+
4+
public final class DatabaseKt {
5+
ctor public DatabaseKt();
6+
method @NonNull public static error.NonExistentClass database(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass url);
7+
method @NonNull public static error.NonExistentClass database(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app);
8+
method @NonNull public static error.NonExistentClass database(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app, @NonNull error.NonExistentClass url);
9+
method @NonNull public static error.NonExistentClass getDatabase(@NonNull error.NonExistentClass);
10+
method @Nullable public static inline <reified T> T getValue(@NonNull error.NonExistentClass);
11+
}
12+
13+
}
14+

‎firebase-dynamic-links/ktx/api.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.dynamiclinks.ktx {
3+
4+
public final class FirebaseDynamicLinksKt {
5+
ctor public FirebaseDynamicLinksKt();
6+
method @NonNull public static void androidParameters(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
7+
method @NonNull public static void androidParameters(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass packageName, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
8+
method @NonNull public static error.NonExistentClass dynamicLink(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
9+
method @NonNull public static error.NonExistentClass dynamicLinks(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app);
10+
method @NonNull public static error.NonExistentClass getDynamicLinks(@NonNull error.NonExistentClass);
11+
method @NonNull public static void googleAnalyticsParameters(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
12+
method @NonNull public static void googleAnalyticsParameters(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass source, @NonNull error.NonExistentClass medium, @NonNull error.NonExistentClass campaign, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
13+
method @NonNull public static void iosParameters(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass bundleId, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
14+
method @NonNull public static void itunesConnectAnalyticsParameters(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
15+
method @NonNull public static void navigationInfoParameters(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
16+
method @NonNull public static error.NonExistentClass shortLinkAsync(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
17+
method @NonNull public static error.NonExistentClass shortLinkAsync(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass suffix, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
18+
method @NonNull public static void socialMetaTagParameters(@NonNull error.NonExistentClass, @NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
19+
}
20+
21+
}
22+

‎firebase-firestore/ktx/api.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.firestore.ktx {
3+
4+
public final class FirestoreKt {
5+
ctor public FirestoreKt();
6+
method @NonNull public static error.NonExistentClass firestore(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app);
7+
method @NonNull public static error.NonExistentClass firestoreSettings(@NonNull kotlin.jvm.functions.Function1<? super error.NonExistentClass,? extends error.NonExistentClass> init);
8+
method @Nullable public static inline <reified T> T getField(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass field);
9+
method @Nullable public static inline <reified T> T getField(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass field, @NonNull error.NonExistentClass serverTimestampBehavior);
10+
method @Nullable public static inline <reified T> T getField(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass fieldPath);
11+
method @Nullable public static inline <reified T> T getField(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass fieldPath, @NonNull error.NonExistentClass serverTimestampBehavior);
12+
method @NonNull public static error.NonExistentClass getFirestore(@NonNull error.NonExistentClass);
13+
method @Nullable public static inline <reified T> T toObject(@NonNull error.NonExistentClass);
14+
method @Nullable public static inline <reified T> T toObject(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass serverTimestampBehavior);
15+
method public static inline <reified T> T toObject(@NonNull error.NonExistentClass);
16+
method public static inline <reified T> T toObject(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass serverTimestampBehavior);
17+
method @NonNull public static inline <reified T> error.NonExistentClass toObjects(@NonNull error.NonExistentClass);
18+
method @NonNull public static inline <reified T> error.NonExistentClass toObjects(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass serverTimestampBehavior);
19+
}
20+
21+
}
22+

‎firebase-functions/ktx/api.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.functions.ktx {
3+
4+
public final class FunctionsKt {
5+
ctor public FunctionsKt();
6+
method @NonNull public static error.NonExistentClass functions(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass region);
7+
method @NonNull public static error.NonExistentClass functions(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app);
8+
method @NonNull public static error.NonExistentClass functions(@NonNull error.NonExistentClass, @NonNull error.NonExistentClass app, @NonNull error.NonExistentClass region);
9+
method @NonNull public static error.NonExistentClass getFunctions(@NonNull error.NonExistentClass);
10+
}
11+
12+
}
13+

‎firebase-inappmessaging-display/ktx/api.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// Signature format: 2.0
2+
package com.google.firebase.inappmessaging.display.ktx {
3+
4+
public final class InAppMessagingDisplayKt {
5+
ctor public InAppMessagingDisplayKt();
6+
method @NonNull public static error.NonExistentClass getInAppMessagingDisplay(@NonNull error.NonExistentClass);
7+
}
8+
9+
}
10+

‎firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/InAppMessagingDisplay.kt renamed to ‎firebase-inappmessaging-display/ktx/src/main/kotlin/com/google/firebase/inappmessaging/display/ktx/InAppMessagingDisplay.kt

File renamed without changes.

0 commit comments

Comments
 (0)