Skip to content

Commit

Permalink
Bug 1724480 - Upgrade to apilint 0.5.1. r=calu
Browse files Browse the repository at this point in the history 
Differential Revision: https://phabricator.services.mozilla.com/D132530
  • Loading branch information
@agi
agi committed Dec 8, 2021
1 parent 2e115c4 commit fb15a33
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 25 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ buildscript {
ext.kotlin_version = '1.5.20'

dependencies {
classpath 'org.mozilla.apilint:apilint:0.4.4'
classpath 'org.mozilla.apilint:apilint:0.5.1'
classpath 'com.android.tools.build:gradle:4.2.0'
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.2'
classpath 'org.apache.commons:commons-exec:1.3'
Expand Down
47 changes: 26 additions & 21 deletions mobile/android/geckoview/api.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ import java.lang.String;
import java.lang.Throwable;
import java.lang.Void;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.net.InetAddress;
import java.nio.ByteBuffer;
Expand Down Expand Up @@ -156,11 +158,11 @@ package org.mozilla.geckoview {
method @AnyThread @NonNull public Autocomplete.Address.Builder tel(@Nullable String);
}

public static class Autocomplete.AddressSaveOption extends Autocomplete.SaveOption {
public static class Autocomplete.AddressSaveOption extends Autocomplete.SaveOption<Autocomplete.Address> {
ctor public AddressSaveOption(@NonNull Autocomplete.Address);
}

public static class Autocomplete.AddressSelectOption extends Autocomplete.SelectOption {
public static class Autocomplete.AddressSelectOption extends Autocomplete.SelectOption<Autocomplete.Address> {
ctor public AddressSelectOption(@NonNull Autocomplete.Address);
}

Expand Down Expand Up @@ -189,11 +191,11 @@ package org.mozilla.geckoview {
method @AnyThread @NonNull public Autocomplete.CreditCard.Builder number(@Nullable String);
}

public static class Autocomplete.CreditCardSaveOption extends Autocomplete.SaveOption {
public static class Autocomplete.CreditCardSaveOption extends Autocomplete.SaveOption<Autocomplete.CreditCard> {
ctor public CreditCardSaveOption(@NonNull Autocomplete.CreditCard);
}

public static class Autocomplete.CreditCardSelectOption extends Autocomplete.SelectOption {
public static class Autocomplete.CreditCardSelectOption extends Autocomplete.SelectOption<Autocomplete.CreditCard> {
ctor public CreditCardSelectOption(@NonNull Autocomplete.CreditCard);
}

Expand Down Expand Up @@ -224,11 +226,11 @@ package org.mozilla.geckoview {
method @AnyThread @NonNull public Autocomplete.LoginEntry.Builder username(@NonNull String);
}

public static class Autocomplete.LoginSaveOption extends Autocomplete.SaveOption {
public static class Autocomplete.LoginSaveOption extends Autocomplete.SaveOption<Autocomplete.LoginEntry> {
ctor public LoginSaveOption(@NonNull Autocomplete.LoginEntry);
}

public static class Autocomplete.LoginSelectOption extends Autocomplete.SelectOption {
public static class Autocomplete.LoginSelectOption extends Autocomplete.SelectOption<Autocomplete.LoginEntry> {
ctor public LoginSelectOption(@NonNull Autocomplete.LoginEntry);
}

Expand All @@ -238,7 +240,7 @@ package org.mozilla.geckoview {
field @NonNull public final T value;
}

public abstract static class Autocomplete.SaveOption<T> extends Autocomplete.Option {
public abstract static class Autocomplete.SaveOption<T> extends Autocomplete.Option<T> {
ctor public SaveOption(@NonNull T, int);
}

Expand All @@ -249,7 +251,7 @@ package org.mozilla.geckoview {
field public static final int NONE = 0;
}

public abstract static class Autocomplete.SelectOption<T> extends Autocomplete.Option {
public abstract static class Autocomplete.SelectOption<T> extends Autocomplete.Option<T> {
ctor public SelectOption(@NonNull T, int);
}

Expand Down Expand Up @@ -500,7 +502,7 @@ package org.mozilla.geckoview {
field public static final Parcelable.Creator<ContentBlocking.Settings> CREATOR;
}

@AnyThread public static class ContentBlocking.Settings.Builder extends RuntimeSettings.Builder {
@AnyThread public static class ContentBlocking.Settings.Builder extends RuntimeSettings.Builder<ContentBlocking.Settings> {
ctor public Builder();
method @NonNull public ContentBlocking.Settings.Builder antiTracking(int);
method @NonNull public ContentBlocking.Settings.Builder cookieBehavior(int);
Expand Down Expand Up @@ -567,7 +569,7 @@ package org.mozilla.geckoview {
method @AnyThread @NonNull public static GeckoResult<String> sendCrashReport(@NonNull String, @NonNull File, @NonNull JSONObject);
}

@Documented @Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME) @Target(value={java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PACKAGE, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.TYPE}) public interface DeprecationSchedule {
@Documented @Retention(value=RetentionPolicy.RUNTIME) @Target(value={ElementType.CONSTRUCTOR, ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE}) public interface DeprecationSchedule {
element public String id();
element public int version();
}
Expand Down Expand Up @@ -602,7 +604,7 @@ package org.mozilla.geckoview {
ctor public GeckoResult(GeckoResult<T>);
method @NonNull public GeckoResult<Void> accept(@Nullable GeckoResult.Consumer<T>);
method @NonNull public GeckoResult<Void> accept(@Nullable GeckoResult.Consumer<T>, @Nullable GeckoResult.Consumer<Throwable>);
method @NonNull @SafeVarargs public static <V> GeckoResult<List<V>> allOf(@NonNull GeckoResult<V>);
method @NonNull @SafeVarargs public static <V> GeckoResult<List<V>> allOf(@NonNull GeckoResult<V>...);
method @NonNull public static <V> GeckoResult<List<V>> allOf(@Nullable List<GeckoResult<V>>);
method @AnyThread @NonNull public static GeckoResult<AllowOrDeny> allow();
method @NonNull public synchronized GeckoResult<Boolean> cancel();
Expand Down Expand Up @@ -712,7 +714,7 @@ package org.mozilla.geckoview {
method @Nullable public String getConfigFilePath();
method public boolean getConsoleOutputEnabled();
method @NonNull public ContentBlocking.Settings getContentBlocking();
method @Nullable public Class<?> getCrashHandler();
method @Nullable public Class<? extends android.app.Service> getCrashHandler();
method @Nullable public Float getDisplayDensityOverride();
method @Nullable public Integer getDisplayDpiOverride();
method public boolean getDoubleTapZoomingEnabled();
Expand Down Expand Up @@ -764,7 +766,7 @@ package org.mozilla.geckoview {
field public static final int HTTPS_ONLY_PRIVATE = 1;
}

@AnyThread public static final class GeckoRuntimeSettings.Builder extends RuntimeSettings.Builder {
@AnyThread public static final class GeckoRuntimeSettings.Builder extends RuntimeSettings.Builder<GeckoRuntimeSettings> {
ctor public Builder();
method @NonNull public GeckoRuntimeSettings.Builder aboutConfigEnabled(boolean);
method @NonNull public GeckoRuntimeSettings.Builder allowInsecureConnections(int);
Expand All @@ -773,7 +775,7 @@ package org.mozilla.geckoview {
method @NonNull public GeckoRuntimeSettings.Builder configFilePath(@Nullable String);
method @NonNull public GeckoRuntimeSettings.Builder consoleOutput(boolean);
method @NonNull public GeckoRuntimeSettings.Builder contentBlocking(@NonNull ContentBlocking.Settings);
method @NonNull public GeckoRuntimeSettings.Builder crashHandler(@Nullable Class<?>);
method @NonNull public GeckoRuntimeSettings.Builder crashHandler(@Nullable Class<? extends android.app.Service>);
method @NonNull public GeckoRuntimeSettings.Builder debugLogging(boolean);
method @NonNull public GeckoRuntimeSettings.Builder displayDensityOverride(float);
method @NonNull public GeckoRuntimeSettings.Builder displayDpiOverride(int);
Expand Down Expand Up @@ -947,7 +949,7 @@ package org.mozilla.geckoview {
method @AnyThread @NonNull default public String getUri();
}

public static interface GeckoSession.HistoryDelegate.HistoryList implements List {
public static interface GeckoSession.HistoryDelegate.HistoryList implements List<GeckoSession.HistoryDelegate.HistoryItem> {
method @AnyThread default public int getCurrentIndex();
}

Expand Down Expand Up @@ -1169,6 +1171,10 @@ package org.mozilla.geckoview {
field @Nullable public final String title;
}

protected static interface GeckoSession.PromptDelegate.BasePrompt.Observer {
method @AnyThread default public void onPromptCompleted(@NonNull GeckoSession.PromptDelegate.BasePrompt);
}

public static class GeckoSession.PromptDelegate.BeforeUnloadPrompt extends GeckoSession.PromptDelegate.BasePrompt {
ctor protected BeforeUnloadPrompt(@NonNull String, @NonNull GeckoSession.PromptDelegate.BasePrompt.Observer);
method @NonNull @UiThread public GeckoSession.PromptDelegate.PromptResponse confirm(@Nullable AllowOrDeny);
Expand Down Expand Up @@ -1347,7 +1353,7 @@ package org.mozilla.geckoview {
field @NonNull public final String text;
}

@AnyThread public static class GeckoSession.SessionState extends AbstractSequentialList implements GeckoSession.HistoryDelegate.HistoryList Parcelable {
@AnyThread public static class GeckoSession.SessionState extends AbstractSequentialList<GeckoSession.HistoryDelegate.HistoryItem> implements Parcelable GeckoSession.HistoryDelegate.HistoryList {
ctor public SessionState(@NonNull GeckoSession.SessionState);
method @Nullable public static GeckoSession.SessionState fromString(@Nullable String);
method public void readFromParcel(@NonNull Parcel);
Expand Down Expand Up @@ -1440,9 +1446,12 @@ package org.mozilla.geckoview {
ctor public GeckoView(Context, AttributeSet);
method @NonNull @UiThread public GeckoResult<Bitmap> capturePixels();
method public void coverUntilFirstPaint(int);
method public void dispatchDraw(@Nullable Canvas);
method public boolean getAutofillEnabled();
method @NonNull public PanZoomController getPanZoomController();
method @AnyThread @Nullable public GeckoSession getSession();
method public void onAttachedToWindow();
method public void onDetachedFromWindow();
method @NonNull public GeckoResult<PanZoomController.InputResultDetail> onTouchEventForDetailResult(@NonNull MotionEvent);
method @Nullable @UiThread public GeckoSession releaseSession();
method public void setAutofillEnabled(boolean);
Expand Down Expand Up @@ -1636,7 +1645,7 @@ package org.mozilla.geckoview {
method @AnyThread default public void onStringScalar(@NonNull RuntimeTelemetry.Metric<String>);
}

public static class RuntimeTelemetry.Histogram extends RuntimeTelemetry.Metric {
public static class RuntimeTelemetry.Histogram extends RuntimeTelemetry.Metric<long[]> {
ctor protected Histogram();
field public final boolean isCategorical;
}
Expand Down Expand Up @@ -2188,9 +2197,5 @@ package org.mozilla.geckoview {
method @NonNull public WebResponse.Builder statusCode(int);
}

protected static interface GeckoSession.PromptDelegate.BasePrompt.Observer {
method @AnyThread default public void onPromptCompleted(@NonNull GeckoSession.PromptDelegate.BasePrompt);
}

}

5 changes: 4 additions & 1 deletion mobile/android/geckoview/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,10 @@ apiLint {
// TODO: Change this to `org` after hiding org.mozilla.gecko
packageFilter = 'org.mozilla.geckoview'
changelogFileName = 'src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md'
skipClassesRegex = ['^org.mozilla.geckoview.BuildConfig$']
skipClassesRegex = [
'^org.mozilla.geckoview.BuildConfig$',
'^org.mozilla.geckoview.R$',
]
lintFilters = ['GV']
deprecationAnnotation = 'org.mozilla.geckoview.DeprecationSchedule'
libraryVersion = mozconfig.substs.MOZILLA_VERSION.split('\\.')[0] as Integer
Expand Down
2 changes: 1 addition & 1 deletion mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ public boolean onKeyMultiple(final int keyCode, final int repeatCount, final Key
}

@Override
public void dispatchDraw(final Canvas canvas) {
public void dispatchDraw(final @Nullable Canvas canvas) {
super.dispatchDraw(canvas);

if (mSession != null) {
Expand Down
2 changes: 1 addition & 1 deletion ...le/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1107,4 +1107,4 @@ to allow adding gecko profiler markers.
[65.24]: {{javadoc_uri}}/CrashReporter.html#sendCrashReport-android.content.Context-android.os.Bundle-java.lang.String-
[65.25]: {{javadoc_uri}}/GeckoResult.html

[api-version]: f109d55f4da6ba24b94fa8cb8f42fe7e68d11426
[api-version]: fca366198e2c55035433eb9bc148b1bec846d069

0 comments on commit fb15a33

Please sign in to comment.