Merge "Merge cherrypicks of [984557] into androidx-lifecycle-release" into androidx-lifecycle-release

52 files changed, 384 insertions, 18 deletions

diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index 5675de5c2ff..1a8ca658477 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -60,7 +60,7 @@ object LibraryVersions {
     val LEANBACK_PREFERENCE = Version("1.1.0-alpha02")
     val LEGACY = Version("1.1.0-alpha01")
     val LOCALBROADCASTMANAGER = Version("1.1.0-alpha02")
-    val LIFECYCLE = Version("2.1.0-beta01")
+    val LIFECYCLE = Version("2.1.0-rc01")
     val LIFECYCLES_COROUTINES = Version("1.0.0-alpha01")
     val LIFECYCLES_SAVEDSTATE = Version("1.0.0-alpha01")
     val LOADER = Version("1.1.0-beta02")
diff --git a/core/build.gradle b/core/build.gradle
index ac8e25f139b..1453971fa4d 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -11,7 +11,7 @@ plugins {
 dependencies {
     api(project(":annotation"))
     implementation("androidx.collection:collection:1.0.0")
-    api(ARCH_LIFECYCLE_RUNTIME, libs.exclude_annotations_transitive)
+    api(project(":lifecycle:lifecycle-runtime"))
     api(project(":versionedparcelable"))
     api(GUAVA_LISTENABLE_FUTURE)
     implementation(project(":concurrent:concurrent-futures"))
diff --git a/lifecycle/common-java8/api/2.1.0-rc01.txt b/lifecycle/common-java8/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..498d3a9a5e8
--- /dev/null
+++ b/lifecycle/common-java8/api/2.1.0-rc01.txt
@@ -0,0 +1,14 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public interface DefaultLifecycleObserver extends androidx.lifecycle.LifecycleObserver androidx.lifecycle.LifecycleObserver {
+    method public default void onCreate(androidx.lifecycle.LifecycleOwner);
+    method public default void onDestroy(androidx.lifecycle.LifecycleOwner);
+    method public default void onPause(androidx.lifecycle.LifecycleOwner);
+    method public default void onResume(androidx.lifecycle.LifecycleOwner);
+    method public default void onStart(androidx.lifecycle.LifecycleOwner);
+    method public default void onStop(androidx.lifecycle.LifecycleOwner);
+  }
+
+}
+
diff --git a/lifecycle/common-java8/api/restricted_2.1.0-rc01.txt b/lifecycle/common-java8/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/common-java8/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/common/api/2.1.0-rc01.txt b/lifecycle/common/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..f23b5eb194c
--- /dev/null
+++ b/lifecycle/common/api/2.1.0-rc01.txt
@@ -0,0 +1,46 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public abstract class Lifecycle {
+    ctor public Lifecycle();
+    method @MainThread public abstract void addObserver(androidx.lifecycle.LifecycleObserver);
+    method @MainThread public abstract androidx.lifecycle.Lifecycle.State getCurrentState();
+    method @MainThread public abstract void removeObserver(androidx.lifecycle.LifecycleObserver);
+  }
+
+  public enum Lifecycle.Event {
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_ANY;
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_CREATE;
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_DESTROY;
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_PAUSE;
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_RESUME;
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_START;
+    enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_STOP;
+  }
+
+  public enum Lifecycle.State {
+    method public boolean isAtLeast(androidx.lifecycle.Lifecycle.State);
+    enum_constant public static final androidx.lifecycle.Lifecycle.State CREATED;
+    enum_constant public static final androidx.lifecycle.Lifecycle.State DESTROYED;
+    enum_constant public static final androidx.lifecycle.Lifecycle.State INITIALIZED;
+    enum_constant public static final androidx.lifecycle.Lifecycle.State RESUMED;
+    enum_constant public static final androidx.lifecycle.Lifecycle.State STARTED;
+  }
+
+  public interface LifecycleEventObserver extends androidx.lifecycle.LifecycleObserver {
+    method public void onStateChanged(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Lifecycle.Event);
+  }
+
+  public interface LifecycleObserver {
+  }
+
+  public interface LifecycleOwner {
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.METHOD) public @interface OnLifecycleEvent {
+    method public abstract androidx.lifecycle.Lifecycle.Event value();
+  }
+
+}
+
diff --git a/lifecycle/common/api/restricted_2.1.0-rc01.txt b/lifecycle/common/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..7aa1c383cbf
--- /dev/null
+++ b/lifecycle/common/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1,21 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public interface GeneratedAdapter {
+    method public void callMethods(androidx.lifecycle.LifecycleOwner!, androidx.lifecycle.Lifecycle.Event!, boolean, androidx.lifecycle.MethodCallsLogger!);
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public interface GenericLifecycleObserver extends androidx.lifecycle.LifecycleEventObserver {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class Lifecycling {
+    method public static String! getAdapterName(String!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class MethodCallsLogger {
+    ctor public MethodCallsLogger();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public boolean approveCall(String!, int);
+  }
+
+}
+
diff --git a/lifecycle/extensions/api/2.1.0-rc01.txt b/lifecycle/extensions/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..c85f1ab2fdc
--- /dev/null
+++ b/lifecycle/extensions/api/2.1.0-rc01.txt
@@ -0,0 +1,22 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public class ViewModelProviders {
+    ctor @Deprecated public ViewModelProviders();
+    method @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.Fragment);
+    method @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.FragmentActivity);
+    method @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.Fragment, androidx.lifecycle.ViewModelProvider.Factory?);
+    method @MainThread public static androidx.lifecycle.ViewModelProvider of(androidx.fragment.app.FragmentActivity, androidx.lifecycle.ViewModelProvider.Factory?);
+  }
+
+  @Deprecated public static class ViewModelProviders.DefaultFactory extends androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory {
+    ctor @Deprecated public ViewModelProviders.DefaultFactory(android.app.Application);
+  }
+
+  @Deprecated public class ViewModelStores {
+    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelStore of(androidx.fragment.app.FragmentActivity);
+    method @Deprecated @MainThread public static androidx.lifecycle.ViewModelStore of(androidx.fragment.app.Fragment);
+  }
+
+}
+
diff --git a/lifecycle/extensions/api/res-2.1.0-rc01.txt b/lifecycle/extensions/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/extensions/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/extensions/api/restricted_2.1.0-rc01.txt b/lifecycle/extensions/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/extensions/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index 2dcdaa4aeff..a79b692f3a1 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -32,8 +32,8 @@ android {
 
 dependencies {
     api(project(":lifecycle:lifecycle-runtime"))
-    api(project(":arch:core-common"))
-    api(project(":arch:core-runtime"))
+    api("androidx.arch.core:core-common:2.1.0-rc01")
+    api("androidx.arch.core:core-runtime:2.1.0-rc01")
     api(SUPPORT_FRAGMENTS, libs.support_exclude_config)
     api(project(":lifecycle:lifecycle-common"))
     api(project(":lifecycle:lifecycle-livedata"))
@@ -41,7 +41,7 @@ dependencies {
     api(project(":lifecycle:lifecycle-service"))
     api(project(":lifecycle:lifecycle-viewmodel"))
 
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
     testImplementation(JUNIT)
     testImplementation(MOCKITO_CORE)
 
diff --git a/lifecycle/livedata-core/api/2.1.0-rc01.txt b/lifecycle/livedata-core/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..f0db7dba4f7
--- /dev/null
+++ b/lifecycle/livedata-core/api/2.1.0-rc01.txt
@@ -0,0 +1,32 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public abstract class LiveData<T> {
+    ctor public LiveData(T!);
+    ctor public LiveData();
+    method public T? getValue();
+    method public boolean hasActiveObservers();
+    method public boolean hasObservers();
+    method @MainThread public void observe(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.Observer<? super T>);
+    method @MainThread public void observeForever(androidx.lifecycle.Observer<? super T>);
+    method protected void onActive();
+    method protected void onInactive();
+    method protected void postValue(T!);
+    method @MainThread public void removeObserver(androidx.lifecycle.Observer<? super T>);
+    method @MainThread public void removeObservers(androidx.lifecycle.LifecycleOwner);
+    method @MainThread protected void setValue(T!);
+  }
+
+  public class MutableLiveData<T> extends androidx.lifecycle.LiveData<T> {
+    ctor public MutableLiveData(T!);
+    ctor public MutableLiveData();
+    method public void postValue(T!);
+    method public void setValue(T!);
+  }
+
+  public interface Observer<T> {
+    method public void onChanged(T!);
+  }
+
+}
+
diff --git a/lifecycle/livedata-core/api/res-2.1.0-rc01.txt b/lifecycle/livedata-core/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/livedata-core/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/livedata-core/api/restricted_2.1.0-rc01.txt b/lifecycle/livedata-core/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/livedata-core/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/livedata-core/build.gradle b/lifecycle/livedata-core/build.gradle
index a92c5b2f51f..945e4f9881c 100644
--- a/lifecycle/livedata-core/build.gradle
+++ b/lifecycle/livedata-core/build.gradle
@@ -25,12 +25,12 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":arch:core-common"))
-    implementation(project(":arch:core-runtime"))
+    implementation("androidx.arch.core:core-common:2.1.0-rc01")
+    implementation("androidx.arch.core:core-runtime:2.1.0-rc01")
     api(project(":lifecycle:lifecycle-common"))
 
     testImplementation(project(":lifecycle:lifecycle-runtime"))
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
     testImplementation(JUNIT)
     testImplementation(MOCKITO_CORE)
 }
diff --git a/lifecycle/livedata-core/ktx/api/2.1.0-rc01.txt b/lifecycle/livedata-core/ktx/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..861a341befb
--- /dev/null
+++ b/lifecycle/livedata-core/ktx/api/2.1.0-rc01.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public final class LiveDataKt {
+    ctor public LiveDataKt();
+    method @MainThread public static inline <T> androidx.lifecycle.Observer<T> observe(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner owner, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onChanged);
+  }
+
+}
+
diff --git a/lifecycle/livedata-core/ktx/api/res-2.1.0-rc01.txt b/lifecycle/livedata-core/ktx/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/livedata-core/ktx/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/livedata-core/ktx/api/restricted_2.1.0-rc01.txt b/lifecycle/livedata-core/ktx/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/livedata-core/ktx/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/livedata-core/ktx/build.gradle b/lifecycle/livedata-core/ktx/build.gradle
index 9cfef8100b1..35f682798e7 100644
--- a/lifecycle/livedata-core/ktx/build.gradle
+++ b/lifecycle/livedata-core/ktx/build.gradle
@@ -36,7 +36,7 @@ dependencies {
     api(project(":lifecycle:lifecycle-livedata-core"))
     api(KOTLIN_STDLIB)
     testImplementation(project(":lifecycle:lifecycle-runtime"))
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
     testImplementation(JUNIT)
     testImplementation(TRUTH)
 }
diff --git a/lifecycle/livedata/api/2.1.0-rc01.txt b/lifecycle/livedata/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..2f5616b20e9
--- /dev/null
+++ b/lifecycle/livedata/api/2.1.0-rc01.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public class MediatorLiveData<T> extends androidx.lifecycle.MutableLiveData<T> {
+    ctor public MediatorLiveData();
+    method @MainThread public <S> void addSource(androidx.lifecycle.LiveData<S>, androidx.lifecycle.Observer<? super S>);
+    method @MainThread public <S> void removeSource(androidx.lifecycle.LiveData<S>);
+  }
+
+  public class Transformations {
+    method @MainThread public static <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
+    method @MainThread public static <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, androidx.arch.core.util.Function<X,Y>);
+    method @MainThread public static <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, androidx.arch.core.util.Function<X,androidx.lifecycle.LiveData<Y>>);
+  }
+
+}
+
diff --git a/lifecycle/livedata/api/res-2.1.0-rc01.txt b/lifecycle/livedata/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/livedata/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/livedata/api/restricted_2.1.0-rc01.txt b/lifecycle/livedata/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..c4aa36c16b9
--- /dev/null
+++ b/lifecycle/livedata/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1,13 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract class ComputableLiveData<T> {
+    ctor public ComputableLiveData();
+    ctor public ComputableLiveData(java.util.concurrent.Executor);
+    method @WorkerThread protected abstract T! compute();
+    method public androidx.lifecycle.LiveData<T> getLiveData();
+    method public void invalidate();
+  }
+
+}
+
diff --git a/lifecycle/livedata/build.gradle b/lifecycle/livedata/build.gradle
index 3b05b2aa1d9..edb916d5754 100644
--- a/lifecycle/livedata/build.gradle
+++ b/lifecycle/livedata/build.gradle
@@ -31,12 +31,12 @@ android {
 }
 
 dependencies {
-    implementation(project(":arch:core-common"))
-    api(project(":arch:core-runtime"))
+    implementation("androidx.arch.core:core-common:2.1.0-rc01")
+    api("androidx.arch.core:core-runtime:2.1.0-rc01")
     api(project(":lifecycle:lifecycle-livedata-core"))
 
     testImplementation(project(":lifecycle:lifecycle-runtime"))
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
     testImplementation(JUNIT)
     testImplementation(MOCKITO_CORE)
 }
diff --git a/lifecycle/livedata/eap/build.gradle b/lifecycle/livedata/eap/build.gradle
index cc4484a9e99..f6434ddd7c2 100644
--- a/lifecycle/livedata/eap/build.gradle
+++ b/lifecycle/livedata/eap/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     api(KOTLIN_STDLIB)
     api(KOTLIN_COROUTINES_CORE)
     testImplementation(project(":lifecycle:lifecycle-runtime"))
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
     testImplementation(project(":lifecycle:lifecycle-livedata-ktx"))
     testImplementation(JUNIT)
     testImplementation(TRUTH)
diff --git a/lifecycle/livedata/ktx/api/2.1.0-rc01.txt b/lifecycle/livedata/ktx/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..a21c943fe68
--- /dev/null
+++ b/lifecycle/livedata/ktx/api/2.1.0-rc01.txt
@@ -0,0 +1,12 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public final class TransformationsKt {
+    ctor public TransformationsKt();
+    method public static inline <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
+    method public static inline <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends Y> transform);
+    method public static inline <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends androidx.lifecycle.LiveData<Y>> transform);
+  }
+
+}
+
diff --git a/lifecycle/livedata/ktx/api/res-2.1.0-rc01.txt b/lifecycle/livedata/ktx/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/livedata/ktx/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/livedata/ktx/api/restricted_2.1.0-rc01.txt b/lifecycle/livedata/ktx/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/livedata/ktx/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/livedata/ktx/build.gradle b/lifecycle/livedata/ktx/build.gradle
index 7c65cf7e0a2..232cc1c674d 100644
--- a/lifecycle/livedata/ktx/build.gradle
+++ b/lifecycle/livedata/ktx/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     api(project(":lifecycle:lifecycle-livedata-core-ktx"))
     api(KOTLIN_STDLIB)
     testImplementation(project(":lifecycle:lifecycle-runtime"))
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
     testImplementation(JUNIT)
     testImplementation(TRUTH)
 }
diff --git a/lifecycle/process/api/2.1.0-rc01.txt b/lifecycle/process/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..beea61968f3
--- /dev/null
+++ b/lifecycle/process/api/2.1.0-rc01.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public class ProcessLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
+    method public static androidx.lifecycle.LifecycleOwner get();
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+  }
+
+}
+
diff --git a/lifecycle/process/api/res-2.1.0-rc01.txt b/lifecycle/process/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/process/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/process/api/restricted_2.1.0-rc01.txt b/lifecycle/process/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..eab29765a3b
--- /dev/null
+++ b/lifecycle/process/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1,15 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ProcessLifecycleOwnerInitializer extends android.content.ContentProvider {
+    ctor public ProcessLifecycleOwnerInitializer();
+    method public int delete(android.net.Uri, String!, String[]!);
+    method public String? getType(android.net.Uri);
+    method public android.net.Uri? insert(android.net.Uri, android.content.ContentValues!);
+    method public boolean onCreate();
+    method public android.database.Cursor? query(android.net.Uri, String[]!, String!, String[]!, String!);
+    method public int update(android.net.Uri, android.content.ContentValues!, String!, String[]!);
+  }
+
+}
+
diff --git a/lifecycle/reactivestreams/api/2.1.0-rc01.txt b/lifecycle/reactivestreams/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..f3d107a176b
--- /dev/null
+++ b/lifecycle/reactivestreams/api/2.1.0-rc01.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public final class LiveDataReactiveStreams {
+    method public static <T> androidx.lifecycle.LiveData<T> fromPublisher(org.reactivestreams.Publisher<T>);
+    method public static <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LifecycleOwner, androidx.lifecycle.LiveData<T>);
+  }
+
+}
+
diff --git a/lifecycle/reactivestreams/api/res-2.1.0-rc01.txt b/lifecycle/reactivestreams/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/reactivestreams/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/reactivestreams/api/restricted_2.1.0-rc01.txt b/lifecycle/reactivestreams/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/reactivestreams/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/reactivestreams/build.gradle b/lifecycle/reactivestreams/build.gradle
index 8bb41475165..fda46527c68 100644
--- a/lifecycle/reactivestreams/build.gradle
+++ b/lifecycle/reactivestreams/build.gradle
@@ -31,7 +31,7 @@ android {
 }
 
 dependencies {
-    api(project(":arch:core-common"))
+    api("androidx.arch.core:core-common:2.1.0-rc01")
     api(project(":lifecycle:lifecycle-common"))
     api(project(":lifecycle:lifecycle-livedata"))
     api(project(":lifecycle:lifecycle-runtime"))
@@ -42,7 +42,7 @@ dependencies {
 
     testImplementation(JUNIT)
     testImplementation(RX_JAVA)
-    testImplementation(project(":arch:core-testing"))
+    testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
 }
 
 androidx {
diff --git a/lifecycle/reactivestreams/ktx/api/2.1.0-rc01.txt b/lifecycle/reactivestreams/ktx/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..659d07d290d
--- /dev/null
+++ b/lifecycle/reactivestreams/ktx/api/2.1.0-rc01.txt
@@ -0,0 +1,11 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public final class LiveDataReactiveSteamsKt {
+    ctor public LiveDataReactiveSteamsKt();
+    method public static inline <T> androidx.lifecycle.LiveData<T> toLiveData(org.reactivestreams.Publisher<T>);
+    method public static inline <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner lifecycle);
+  }
+
+}
+
diff --git a/lifecycle/reactivestreams/ktx/api/res-2.1.0-rc01.txt b/lifecycle/reactivestreams/ktx/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/reactivestreams/ktx/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/reactivestreams/ktx/api/restricted_2.1.0-rc01.txt b/lifecycle/reactivestreams/ktx/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/reactivestreams/ktx/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/reactivestreams/ktx/build.gradle b/lifecycle/reactivestreams/ktx/build.gradle
index ee08c940cdb..8397ebc9ca0 100644
--- a/lifecycle/reactivestreams/ktx/build.gradle
+++ b/lifecycle/reactivestreams/ktx/build.gradle
@@ -32,7 +32,7 @@ dependencies {
   testImplementation(JUNIT)
   testImplementation(RX_JAVA)
   testImplementation(TRUTH)
-  testImplementation(project(":arch:core-testing"))
+  testImplementation("androidx.arch.core:core-testing:2.1.0-rc01")
 }
 
 androidx {
diff --git a/lifecycle/runtime/api/2.1.0-rc01.txt b/lifecycle/runtime/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..0a652c0bbbc
--- /dev/null
+++ b/lifecycle/runtime/api/2.1.0-rc01.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public class LifecycleRegistry extends androidx.lifecycle.Lifecycle {
+    ctor public LifecycleRegistry(androidx.lifecycle.LifecycleOwner);
+    method public void addObserver(androidx.lifecycle.LifecycleObserver);
+    method public androidx.lifecycle.Lifecycle.State getCurrentState();
+    method public int getObserverCount();
+    method public void handleLifecycleEvent(androidx.lifecycle.Lifecycle.Event);
+    method @Deprecated @MainThread public void markState(androidx.lifecycle.Lifecycle.State);
+    method public void removeObserver(androidx.lifecycle.LifecycleObserver);
+    method @MainThread public void setCurrentState(androidx.lifecycle.Lifecycle.State);
+  }
+
+  @Deprecated public interface LifecycleRegistryOwner extends androidx.lifecycle.LifecycleOwner {
+    method @Deprecated public androidx.lifecycle.LifecycleRegistry getLifecycle();
+  }
+
+}
+
diff --git a/lifecycle/runtime/api/res-2.1.0-rc01.txt b/lifecycle/runtime/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/runtime/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/runtime/api/restricted_2.1.0-rc01.txt b/lifecycle/runtime/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..c79f82deab3
--- /dev/null
+++ b/lifecycle/runtime/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ReportFragment extends android.app.Fragment {
+    ctor public ReportFragment();
+    method public static void injectIfNeededIn(android.app.Activity!);
+  }
+
+}
+
diff --git a/lifecycle/runtime/build.gradle b/lifecycle/runtime/build.gradle
index bfb812b88d6..470d42720e6 100644
--- a/lifecycle/runtime/build.gradle
+++ b/lifecycle/runtime/build.gradle
@@ -20,7 +20,7 @@ android {
 
 dependencies {
     api(project(":lifecycle:lifecycle-common"))
-    api(project(":arch:core-common"))
+    api("androidx.arch.core:core-common:2.1.0-rc01")
     // necessary for IJ to resolve dependencies.
     api(project(":annotation"))
 
diff --git a/lifecycle/service/api/2.1.0-rc01.txt b/lifecycle/service/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..a12d86eb283
--- /dev/null
+++ b/lifecycle/service/api/2.1.0-rc01.txt
@@ -0,0 +1,21 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public class LifecycleService extends android.app.Service implements androidx.lifecycle.LifecycleOwner {
+    ctor public LifecycleService();
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+    method @CallSuper public android.os.IBinder? onBind(android.content.Intent);
+    method @CallSuper public void onStart(android.content.Intent, int);
+  }
+
+  public class ServiceLifecycleDispatcher {
+    ctor public ServiceLifecycleDispatcher(androidx.lifecycle.LifecycleOwner);
+    method public androidx.lifecycle.Lifecycle getLifecycle();
+    method public void onServicePreSuperOnBind();
+    method public void onServicePreSuperOnCreate();
+    method public void onServicePreSuperOnDestroy();
+    method public void onServicePreSuperOnStart();
+  }
+
+}
+
diff --git a/lifecycle/service/api/res-2.1.0-rc01.txt b/lifecycle/service/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/service/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/service/api/restricted_2.1.0-rc01.txt b/lifecycle/service/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/service/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/viewmodel/api/2.1.0-rc01.txt b/lifecycle/viewmodel/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..d30b55ffb04
--- /dev/null
+++ b/lifecycle/viewmodel/api/2.1.0-rc01.txt
@@ -0,0 +1,45 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public class AndroidViewModel extends androidx.lifecycle.ViewModel {
+    ctor public AndroidViewModel(android.app.Application);
+    method public <T extends android.app.Application> T getApplication();
+  }
+
+  public abstract class ViewModel {
+    ctor public ViewModel();
+    method protected void onCleared();
+  }
+
+  public class ViewModelProvider {
+    ctor public ViewModelProvider(androidx.lifecycle.ViewModelStoreOwner, androidx.lifecycle.ViewModelProvider.Factory);
+    ctor public ViewModelProvider(androidx.lifecycle.ViewModelStore, androidx.lifecycle.ViewModelProvider.Factory);
+    method @MainThread public <T extends androidx.lifecycle.ViewModel> T get(Class<T>);
+    method @MainThread public <T extends androidx.lifecycle.ViewModel> T get(String, Class<T>);
+  }
+
+  public static class ViewModelProvider.AndroidViewModelFactory extends androidx.lifecycle.ViewModelProvider.NewInstanceFactory {
+    ctor public ViewModelProvider.AndroidViewModelFactory(android.app.Application);
+    method public static androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory getInstance(android.app.Application);
+  }
+
+  public static interface ViewModelProvider.Factory {
+    method public <T extends androidx.lifecycle.ViewModel> T create(Class<T>);
+  }
+
+  public static class ViewModelProvider.NewInstanceFactory implements androidx.lifecycle.ViewModelProvider.Factory {
+    ctor public ViewModelProvider.NewInstanceFactory();
+    method public <T extends androidx.lifecycle.ViewModel> T create(Class<T>);
+  }
+
+  public class ViewModelStore {
+    ctor public ViewModelStore();
+    method public final void clear();
+  }
+
+  public interface ViewModelStoreOwner {
+    method public androidx.lifecycle.ViewModelStore getViewModelStore();
+  }
+
+}
+
diff --git a/lifecycle/viewmodel/api/res-2.1.0-rc01.txt b/lifecycle/viewmodel/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/viewmodel/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/viewmodel/api/restricted_2.1.0-rc01.txt b/lifecycle/viewmodel/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/viewmodel/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/lifecycle/viewmodel/ktx/api/2.1.0-rc01.ignore b/lifecycle/viewmodel/ktx/api/2.1.0-rc01.ignore
new file mode 100644
index 00000000000..9f949927aed
--- /dev/null
+++ b/lifecycle/viewmodel/ktx/api/2.1.0-rc01.ignore
@@ -0,0 +1,5 @@
+// Baseline format: 1.0
+ChangedType: androidx.lifecycle.ViewModelProviderKt#get(androidx.lifecycle.ViewModelProvider):
+    Method androidx.lifecycle.ViewModelProviderKt.get has changed return type from VM to VM
+
+
diff --git a/lifecycle/viewmodel/ktx/api/2.1.0-rc01.txt b/lifecycle/viewmodel/ktx/api/2.1.0-rc01.txt
new file mode 100644
index 00000000000..ab9fc633033
--- /dev/null
+++ b/lifecycle/viewmodel/ktx/api/2.1.0-rc01.txt
@@ -0,0 +1,22 @@
+// Signature format: 3.0
+package androidx.lifecycle {
+
+  public final class ViewModelKt {
+    ctor public ViewModelKt();
+    method public static kotlinx.coroutines.CoroutineScope getViewModelScope(androidx.lifecycle.ViewModel);
+  }
+
+  public final class ViewModelLazy<VM extends androidx.lifecycle.ViewModel> implements kotlin.Lazy<VM> {
+    ctor public ViewModelLazy(kotlin.reflect.KClass<VM> viewModelClass, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStore> storeProducer, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory> factoryProducer);
+    method public VM getValue();
+    method public boolean isInitialized();
+    property public VM value;
+  }
+
+  public final class ViewModelProviderKt {
+    ctor public ViewModelProviderKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> VM! get(androidx.lifecycle.ViewModelProvider);
+  }
+
+}
+
diff --git a/lifecycle/viewmodel/ktx/api/res-2.1.0-rc01.txt b/lifecycle/viewmodel/ktx/api/res-2.1.0-rc01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/lifecycle/viewmodel/ktx/api/res-2.1.0-rc01.txt
diff --git a/lifecycle/viewmodel/ktx/api/restricted_2.1.0-rc01.txt b/lifecycle/viewmodel/ktx/api/restricted_2.1.0-rc01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/lifecycle/viewmodel/ktx/api/restricted_2.1.0-rc01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0