Skip to content

Commit

Permalink
Import of https://android.googlesource.com/platform/tools/metalava/.
Browse files Browse the repository at this point in the history 
#MIGRATION_3P_JAVA_SRC_METALAVA__DEFAULT

  - f1f064f818d84f150635363dd4bb47d4e3eb8e8f sdk-extensions-info: convert to XML by Mårten Kongstad <amhk@google.com>
  - 9b85dcdaedf6a0e4cd06b1e93ab3fd26400baac9 api-versions.xml: add <sdk reference="..."> attribute by Mårten Kongstad <amhk@google.com>
  - 7fd1aea052c81f08dc8d019a532b32b394d752d2 sdk-extensions-info: parse <sdk shortname="..."> attribute by Mårten Kongstad <amhk@google.com>
  - 860007a658a8f90d34fb3a19bfe4e3b1d08ec6b7 Change @sdkExtSince payload to "<name> <version>" by Mårten Kongstad <amhk@google.com>
  - 6bbda820af5a861581e3537040bf71fe2f0bb6d9 Do not discard --hide-annotation annotations by Mårten Kongstad <amhk@google.com>
  - 51fae39af2958909a21e2be8eca283061c2c45a2 De-dupe qualified name check in AnnotationItem.mapName by Mårten Kongstad <amhk@google.com>
  - 632736db15fc65de3dfa861a2c08445faa6a8344 Merge remote-tracking branch 'aosp/metalava-main' into 'm... by Jihoon Kang <jihoonkang@google.com>
  - e2e62881260ffa7369d80e170af3553d3448cc7c Merge remote-tracking branch 'aosp/metalava-main' into 'u... by Jihoon Kang <jihoonkang@google.com>
  - 16ceda283844822372e32243a617ff2e11db942c Update build to pick up sources from `metalava` dir to ma... by Paul Duffin <paulduffin@google.com>
  - 882b42f446083ebd9ef8eefb9a1099323b408c5f Add `metalava-tools-common-m2-deps` to metalava-model-tur... by Pratyush <pratyushpks@google.com>
  - d5749004d08df6fc8445b636d54ee513b42f410d Merge remote-tracking branch 'aosp/metalava-main' into 'a... by Jihoon Kang <jihoonkang@google.com>
  - 0cf10370d3bdd2cbd9bdff2dc485b338feae43b0 Include list of changes in merge commit message by Paul Duffin <paulduffin@google.com>
  - dfa5371d1d76b602355334e0e8d112485f424dc1 Include list of changes in merge commit message by Paul Duffin <paulduffin@google.com>
  - 15f3a589eaa85acf3a0b4a251b9bd00dc0e67ca2 Fix some minor issues with the merge script by Paul Duffin <paulduffin@google.com>
  - e94389dadc2d59c7fd2215c83731b08321a2c898 Merge remote-tracking branch 'aosp/metalava-main' into 'a... by Paul Duffin <paulduffin@google.com>
  - 19cd23c3590c11719f79b97fd71a4b1ddb4eb594 Always inline values for FlaggedApi annotations by Paul Duffin <paulduffin@google.com>
  - f8c42013e96b899920265d43e32d5345a6cb5ba1 Always inline values for FlaggedApi annotations by Paul Duffin <paulduffin@google.com>
  - 073a59741d45cfc3ecc5e3caafd81ac0f01e2e28 Correct java_resources_dirs path for metalava-model-turbine by Paul Duffin <paulduffin@google.com>
  - 41f5b5e7b5c7a56d3365ba51a8d11302387f8c92 Add model agnostic implementation of superMethods() by Paul Duffin <paulduffin@google.com>
  - e6115a593cd63aaa3f2cb6f49863ea57e3abb6d0 Introduce SourceSet, an abstraction of source files and r... by Jinseong Jeon <jsjeon@google.com>
  - 4169a3129f4cd8a808b2cb28d23e7924d34ebb04 Introduce --common-source-path CLI argument by Jinseong Jeon <jsjeon@google.com>
  - fdb725d8b120352f16f8cb7c06cd33ec26e728c3 Add superAnnotationType to TextTypeParser by Paul Duffin <paulduffin@google.com>
  - 4840ae2769eb49e5c6c3d021899ba20f3d68e057 Add tests to show broken behavior for super type nullabil... by Paul Duffin <paulduffin@google.com>
  - 2d4efe4fcb3fc28d78961d24657b51e545a4ba11 Fix super type nullability for text model by Paul Duffin <paulduffin@google.com>
  - d2023feb7e278c1524379e6e713f4f9d832b3163 Fix super type nullability for psi model by Paul Duffin <paulduffin@google.com>
  - a4835bce8fbb516ce0bbec9ad1858f71eb3b6fe1 Avoid ConcurrencyModificationException in ApiAnalyzer.add... by Paul Duffin <paulduffin@google.com>
  - c0ea6a31d072744f2a0320a0351d2a45a4d53d10 Add test util to create SourceSet from test files and dir... by Jinseong Jeon <jsjeon@google.com>
  - 4c9248b9597e7281657b51c04169be1736d445a4 Mechanical migration of SourceSet-related utils by Jinseong Jeon <jsjeon@google.com>
  - 6614b25b5f8517f74d3697c36bea7eede2a1d6ab Enclose SourceSet creation from source path by Jinseong Jeon <jsjeon@google.com>
  - e64c776b23386a804063b776fc3153eaaadff6c8 Enclose root extractions/additions in SourceSet by Jinseong Jeon <jsjeon@google.com>
  - ba3d27c92af2d13b4ff7daf6e93e1413e8de8efc Inline SourceSet utils into SourceSet companion object by Jinseong Jeon <jsjeon@google.com>
  - 6fb024acee4025e8ab1da6def15dba9673c772a7 Allow models to determine what source types to include by Jinseong Jeon <jsjeon@google.com>
  - 1ad1f867dac1efdea0f165fa08feeffb51de22a0 Add BaseTextCodebaseTest.runSignatureTest(...) by Paul Duffin <paulduffin@google.com>
  - 3bfe203a56c51bd71f4e039561c8b92641567aa7 Fix a bug in "Test caching of type variables" by Paul Duffin <paulduffin@google.com>
  - 7a1eafddf71f72366a00f29771eb79653579d2b8 Add tests to show super type nullability issue for generi... by Paul Duffin <paulduffin@google.com>
  - 3ebad236a792b6bc150d9459df3a4a6d4051e2fc Fix generic class super type nullability for text model by Paul Duffin <paulduffin@google.com>
  - dc6109a8c27ecf21767cedb3aa30bf5435ea4cc6 Print the actual failure for baselined tests by Paul Duffin <paulduffin@google.com>
  - 6cc5a9585a9eb5ad1f979cd7e7a6e338e96fb7f9 Fix super type nullability for turbine model by Paul Duffin <paulduffin@google.com>
  - 5d4ec90d96e38ad8f84ba067d887356da760d8a0 Add tests for TextTypeParser caching by Paul Duffin <paulduffin@google.com>
  - 827ac7e2ea39a92ebbb66edce12b522dd6d1949a Add cachedParseType() for use within TextTypeParser by Paul Duffin <paulduffin@google.com>
  - df4c7df11346df2c206986708074d49494207407 Remove special caching of JAVA_LANG_OBJECT in TextTypePar... by Paul Duffin <paulduffin@google.com>
  - 19c095d0af93bfe57d573ad9dc4754827cd20201 Inline the TextTypeParser.Cache class by Paul Duffin <paulduffin@google.com>
  - af56edbaa803f8c6108073a7870f65844f4a950b Add test to measure effect of future type caching changes by Paul Duffin <paulduffin@google.com>
  - 5ead161ffec06899d93587efb9600bdef0dcc6e8 Dedup assertions for checking VariableTypeItem.asTypePara... by Paul Duffin <paulduffin@google.com>
  - cb597d8068a89bef164143eb768da61d1a63ee01 Stop annotation classes extending j.l.annotation.Annotation by Paul Duffin <paulduffin@google.com>
  - e0af20a20ad9da94c85502c584bcce0ebb083290 Move ApiFile multiple file test into separate test class by Paul Duffin <paulduffin@google.com>
  - 0f68af428f51be3098d756ee378d63a1c288acab Reuse TypeParameterScopes for ClassItems by Paul Duffin <paulduffin@google.com>
  - 6b9c835faec5cfe48db3070f5f6624e78594ed54 Add BoundsTypeItem to represent type parameter bounds by Paul Duffin <paulduffin@google.com>
  - e6ce1d48b24ab49e4c1cb8ad39372be9d2b8a198 Add ReferenceTypeItem to represent reference types by Paul Duffin <paulduffin@google.com>
  - 497059e76cba861f0792f6c9f4ca47c6b502ecb8 Add TypeArgumentTypeItem to represent type arguments by Paul Duffin <paulduffin@google.com>
  - 4802c665202d320ecfead379a16481dbbe5ebbad Push TypeItem.hasTypeArguments() down to ClassTypeItem by Paul Duffin <paulduffin@google.com>
  - 8dc23919ed551ae4a0211b15c08a32ea31e814f5 Add Codebase.resolveClass(String) by Paul Duffin <paulduffin@google.com>
  - 475cacedcc39b8792670664b456c0cf46667bd89 Use resolveClass() to implement ClassTypeItem.asClass() by Paul Duffin <paulduffin@google.com>
  - ff4d1f8ea2c8b8f126d27112ff1e1a2b0453e457 Provide common implementation of VariableTypeItem.asClass() by Paul Duffin <paulduffin@google.com>
  - 6cb5be675ab92a767c6101887be316e16e9ab48a Resurrect TypeParameterListOwner for MethodItem/ClassItem by Paul Duffin <paulduffin@google.com>
  - 2de6aa06cd9066d8aa180aed6b870f94a1da4e80 Modify test for PsiImmediateClassType workaround to revea... by Paul Duffin <paulduffin@google.com>
  - 89ea67b29fc63dceab83cd0660e4930491a57301 Reuse existing PsiTypeParameterItem by Paul Duffin <paulduffin@google.com>
  - 634e94e27deec810c76bb8e74bb7d9fbc5c76f4f Add pathological tests where a type parameter shadows int by Paul Duffin <paulduffin@google.com>
  - 8338d07e403bc2470bd70e0a38083e70c0d6714e Allow type parameter to shadow a primitive type by Paul Duffin <paulduffin@google.com>
  - 895890dafedbb18a74bdd4f9120c2989e1aa1c07 Add cache test for kotlinStyleNulls=yes by Paul Duffin <paulduffin@google.com>
  - cf8b19c232547aed6b99f3e67802123ac4080271 Integrate TypeUse.SUPER_TYPE handling with kotlinStyleNulls by Paul Duffin <paulduffin@google.com>
  - be7f8a8669039befbf354cfaacfe94ef4d154062 Use map instead of list in TypeParameterScope by Paul Duffin <paulduffin@google.com>
  - 02963494197af1b1bf9925ed4a5c47b846de8b45 Create CacheEntry wrapper around the cached TextTypeItem by Paul Duffin <paulduffin@google.com>
  - f29ffb5d027a039f3ef71214a1a4040384dc5d86 Support basic type caching with a non-empty TypeParamater... by Paul Duffin <paulduffin@google.com>
  - f5eddcf7ea6959b3dae7e687bd3622e94e6e5c94 Add test to show desired behavior when caching within sco... by Paul Duffin <paulduffin@google.com>
  - f8beb23e00f4d697e021293783b1f559fc6da45d Cache types in the best TypeParameterScope by Paul Duffin <paulduffin@google.com>
  - b3fbde016d03ecfe3f0011d2e1b4f44dcb0085bd Make TextCodebaseBuilder copy superClassType() by Paul Duffin <paulduffin@google.com>
  - 8e7ed966118b9083f490e7adffc5bbf1790897c3 Add test to verify that java.lang.Object has no super cla... by Paul Duffin <paulduffin@google.com>
  - 8d6465d993f8c6d3563048dafdb56ca7ee3f2294 Create super class TypeItems early and remove resolveSupe... by Paul Duffin <paulduffin@google.com>
  - 3fcc7ee2512826d4feecc4d812014554ca9f1291 Resolve TurbineTypeParameterItems when creating TurbineVa... by Paul Duffin <paulduffin@google.com>
  - 63d80b4c112af5290688a36eff9f525b29fc3f56 Extract common code for creating a List<TypeParameterItem> by Paul Duffin <paulduffin@google.com>
  - 55dda29d68f51d1220da4e4c5d979bb31e08b5b3 Add tests for `SourceFile.getImports` by Pratyush <pratyushpks@google.com>
  - b8aff7f479d483561997e3e1dc40d9c7ca7b3112 Remove DefaultTypeItem.codebase by Paul Duffin <paulduffin@google.com>
  - 16cc5b569f22db06e440afe43a6ca13e84f671be Use TypeItem instead of TurbineTypeItem where possible by Paul Duffin <paulduffin@google.com>
  - 068fad52620cd6f401bff94e9e186ff695324c1c Pull duplicate() up into TypeModifiers by Paul Duffin <paulduffin@google.com>
  - 913b595481a16d6c7c735db863f750203463e4d4 Add DefaultTypeModifers and replace TurbineTypeModifiers by Paul Duffin <paulduffin@google.com>
  - 7529d92f680c457066f8b90b982c955e374fc336 Stop creating PsiTypeParameterItems lazily by Paul Duffin <paulduffin@google.com>
  - 4893073020849514c2617e5c3f6fe8cc1b23c4cd Move TypeParameterScope into model package by Paul Duffin <paulduffin@google.com>
  - 3313a4608860228aa2dec3d6ba74f261342b3a8d Add description to TypeParameterScope to make it easier t... by Paul Duffin <paulduffin@google.com>
  - fe1e012a5d73ace0e8050e550f0219773ce1e384 Extract code to create List<TypeParameterItem> and scope by Paul Duffin <paulduffin@google.com>
  - d1419923e0919625c30542f79ca4a73bd438fc2f Defer resolving super types until requested by Paul Duffin <paulduffin@google.com>
  - 914cd37c84614099fc0762883c28ba62a2982717 Add ExceptionTypeItem and ThrowableType wrapper around it by Paul Duffin <paulduffin@google.com>
  - a47882968b0c817a6c12161b22caf0b4f379f53f Simplify the creation of inner classes by Paul Duffin <paulduffin@google.com>
  - 8ca6bebb94bdb5fc1f90ea4ef89d2afe3d9630dc Switch Turbine to use TypeParameterScope by Paul Duffin <paulduffin@google.com>
  - 70ced740ad75dc028ad4b93c40e62714802359b6 Remove Turbine support for reentrant TurbineClassItem cre... by Paul Duffin <paulduffin@google.com>
  - d0cc6fe5941811f9c531f931b0425205f7e6d979 Extract ImportsFilter logic from PsiSourceFile for shared... by Pratyush <pratyushpks@google.com>
  - 8b1b56cc2a4d07e65c40e403b58ee7f29a7487ae Construct a generic PsiType for a PsiClass instead of a r... by Paul Duffin <paulduffin@google.com>
  - a4d30916d57001e83c7cd3a4baf36d5d438c6341 Add assertions to deconstruct various TypeItems by Paul Duffin <paulduffin@google.com>
  - b49fcb3b8a6b1e7040f7c9c763e9b2b6f1315f66 Add context to KotlinTypeInfo by Paul Duffin <paulduffin@google.com>
  - 6c448c3f7a731f4060f6b2806dfbb77fa6522d5c Improve the test for the retainAll(Collection<E>) issue by Paul Duffin <paulduffin@google.com>
  - b4deae986bfd98d89961e07f74933537bce36a78 Prepare TurbineSourceFile for getImports implementation by Pratyush <pratyushpks@google.com>
  - 8c8ef9859e9d5665faafcf1d6f1a15f98627bc87 Defer resolution of super classes and interfaces in psi m... by Paul Duffin <paulduffin@google.com>
  - a8e9a11852a5fdcd7b3d2fa870e48acbf030928c Use KtType to work around the retainAll(Collection<E>), e... by Paul Duffin <paulduffin@google.com>
  - b99fa51870024b01789c67e35c7d422d95054cae Add test for `SourceFile.classes()` by Pratyush <pratyushpks@google.com>
  - 15d85f09698c92728f7dd191b431c1ac16792c74 Mute actual typealias -- K2 test by Jinseong Jeon <jsjeon@google.com>
  - a619ec6c5ab80d6ae69a30b4578013361d01e9a7 Allow ThrowableType.classItem to be null by Paul Duffin <paulduffin@google.com>
  - be0eb7c23dc11d14a1a9d82ad30de1b12feb2e5c Move common Turbine code logic to utils by Pratyush <pratyushpks@google.com>
  - bd7585f4226197793a726eb91237c5a4ee5607c2 Implement `TurbineSourceFile.classes()` by Pratyush <pratyushpks@google.com>
  - 720de2577060082404b525b13e7aeea5a7673f51 Prevent registering duplicate PsiClassItems by Paul Duffin <paulduffin@google.com>
  - 97ff24ae9e6392e9baf6bb3681835a673893c27d Implement `TurbineSourceFile.getImports()` by Pratyush <pratyushpks@google.com>
  (And 1243 more changes)

NO_RELNOTES

PiperOrigin-RevId: 677805626
  • Loading branch information
@copybara-androidxtest
copybara-androidxtest committed Sep 23, 2024
1 parent 8e7b420 commit 00266a9
Show file tree
Hide file tree
Showing 12 changed files with 58 additions and 70 deletions.
30 changes: 15 additions & 15 deletions espresso/core/java/androidx/test/espresso/api/current_public.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ package androidx.test.espresso {
method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!);
}

public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View!> {
method public void describeTo(org.hamcrest.Description!);
method @Deprecated public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<?>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<?>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, Integer?, androidx.test.espresso.action.AdapterViewProtocol);
method @Deprecated public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<? extends java.lang.Object!>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<? extends java.lang.Object!>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, Integer?, androidx.test.espresso.action.AdapterViewProtocol);
method public boolean matchesSafely(android.view.View!);
}

public final class Espresso {
method public static void closeSoftKeyboard();
method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<?>!);
method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static void onIdle();
method public static <T> T! onIdle(java.util.concurrent.Callable<T!>!);
method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
Expand Down Expand Up @@ -193,8 +193,8 @@ package androidx.test.espresso {
package androidx.test.espresso.action {

public final class AdapterDataLoaderAction implements androidx.test.espresso.ViewAction {
ctor @Deprecated public AdapterDataLoaderAction(org.hamcrest.Matcher<?>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<?>!, Integer?, androidx.test.espresso.action.AdapterViewProtocol!);
ctor @Deprecated public AdapterDataLoaderAction(org.hamcrest.Matcher<? extends java.lang.Object!>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<? extends java.lang.Object!>!, Integer?, androidx.test.espresso.action.AdapterViewProtocol!);
method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! getAdaptedData();
method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
method public String! getDescription();
Expand Down Expand Up @@ -544,7 +544,7 @@ package androidx.test.espresso.base {
ctor public PlatformTestStorageModule();
}

@androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker implements javax.inject.Provider<android.view.View> {
@androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker implements javax.inject.Provider<android.view.View!> {
method public android.view.View! get();
}

Expand Down Expand Up @@ -585,19 +585,19 @@ package androidx.test.espresso.core.internal.deps.guava.base {

package androidx.test.espresso.matcher {

public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S> {
public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S!> {
ctor public BoundedDiagnosingMatcher(Class<? extends S!>!);
ctor public BoundedDiagnosingMatcher(Class<? extends S!>!, Class<?>!, Class<?>!...!);
ctor public BoundedDiagnosingMatcher(Class<? extends S!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
method public final void describeMismatch(Object!, org.hamcrest.Description!);
method protected abstract void describeMoreTo(org.hamcrest.Description!);
method public final void describeTo(org.hamcrest.Description!);
method public final boolean matches(Object!);
method protected abstract boolean matchesSafely(T!, org.hamcrest.Description!);
}

public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T> {
public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T!> {
ctor public BoundedMatcher(Class<? extends S!>!);
ctor public BoundedMatcher(Class<?>!, Class<?>!, Class<?>!...!);
ctor public BoundedMatcher(Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
method public final boolean matches(Object!);
method protected abstract boolean matchesSafely(S!);
}
Expand Down Expand Up @@ -640,13 +640,13 @@ package androidx.test.espresso.matcher {
method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
}

public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object,android.database.Cursor> {
public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object!,android.database.Cursor!> {
method public void describeTo(org.hamcrest.Description!);
method public boolean matchesSafely(android.database.Cursor!);
method public androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withStrictColumnChecks(boolean);
}

public final class HasBackgroundMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
public final class HasBackgroundMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View!> {
ctor public HasBackgroundMatcher(int);
method public void describeTo(org.hamcrest.Description!);
method protected boolean matchesSafely(android.view.View!);
Expand Down Expand Up @@ -741,7 +741,7 @@ package androidx.test.espresso.matcher {
method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(org.hamcrest.Matcher<java.lang.String!>!);
method public static org.hamcrest.Matcher<android.view.View!>! withSubstring(String!);
method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int);
method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<?>!);
method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static org.hamcrest.Matcher<android.view.View!>! withTagValue(org.hamcrest.Matcher<java.lang.Object!>!);
method public static org.hamcrest.Matcher<android.view.View!>! withText(int);
method public static org.hamcrest.Matcher<android.view.View!>! withText(String!);
Expand All @@ -768,7 +768,7 @@ package androidx.test.espresso.remote {
}

public final class ConstructorInvocation {
ctor public ConstructorInvocation(Class<?>, Class<? extends java.lang.annotation.Annotation!>?, Class<?>!...?);
ctor public ConstructorInvocation(Class<? extends java.lang.Object!>, Class<? extends java.lang.annotation.Annotation!>?, Class<? extends java.lang.Object!>!...?);
method public Object! invokeConstructor(java.lang.Object!...!);
}

Expand Down
16 changes: 2 additions & 14 deletions espresso/device/java/androidx/test/espresso/device/api/current_public.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ package androidx.test.espresso.device.action {
}

public enum ScreenOrientation {
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.action.ScreenOrientation> getEntries();
method public static androidx.test.espresso.device.action.ScreenOrientation valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
method public static androidx.test.espresso.device.action.ScreenOrientation[] values();
enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation LANDSCAPE;
enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation PORTRAIT;
}
Expand All @@ -55,9 +52,6 @@ package androidx.test.espresso.device.action {
package androidx.test.espresso.device.controller {

public enum DeviceMode {
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.controller.DeviceMode> getEntries();
method public static androidx.test.espresso.device.controller.DeviceMode valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
method public static androidx.test.espresso.device.controller.DeviceMode[] values();
enum_constant public static final androidx.test.espresso.device.controller.DeviceMode BOOK;
enum_constant public static final androidx.test.espresso.device.controller.DeviceMode CLOSED;
enum_constant public static final androidx.test.espresso.device.controller.DeviceMode FLAT;
Expand Down Expand Up @@ -125,10 +119,7 @@ package androidx.test.espresso.device.sizeclass {
}

public enum HeightSizeClass.Companion.HeightSizeClassEnum {
method public final String getDescription();
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum> getEntries();
method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum[] values();
method public String getDescription();
property public final String description;
enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum COMPACT;
enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum EXPANDED;
Expand All @@ -152,10 +143,7 @@ package androidx.test.espresso.device.sizeclass {
}

public enum WidthSizeClass.Companion.WidthSizeClassEnum {
method public final String getDescription();
method public static kotlin.enums.EnumEntries<androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum> getEntries();
method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum[] values();
method public String getDescription();
property public final String description;
enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum COMPACT;
enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum EXPANDED;
Expand Down
12 changes: 6 additions & 6 deletions espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ package androidx.test.espresso.intent.matcher {
@com.google.errorprone.annotations.CheckReturnValue public final class BundleMatchers {
method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(String);
method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(org.hamcrest.Matcher<java.lang.String!>);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<?>!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, T!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(String!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(org.hamcrest.Matcher<java.lang.String!>!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<?>!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasValue(T!);
method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmpty();
method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmptyOrNull();
Expand Down Expand Up @@ -137,9 +137,9 @@ package androidx.test.espresso.intent.matcher {
method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(String!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(org.hamcrest.Matcher<android.net.Uri!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasDataString(org.hamcrest.Matcher<java.lang.String!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, org.hamcrest.Matcher<?>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static <T> org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, T!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(String!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(org.hamcrest.Matcher<java.lang.String!>!);
method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
Expand Down Expand Up @@ -178,7 +178,7 @@ package androidx.test.espresso.intent.rule {
method protected void before();
}

@Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T> {
@Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T!> {
ctor @Deprecated public IntentsTestRule(Class<T!>!);
ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean);
ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean, boolean);
Expand Down
Loading

0 comments on commit 00266a9

Please sign in to comment.