Merge "Bump arch libraries to 2.1.0-beta01 and clean up deprecated alpha APIs" into androidx-master-dev

10 files changed, 78 insertions, 71 deletions

diff --git a/arch/core-common/api/2.1.0-beta01.txt b/arch/core-common/api/2.1.0-beta01.txt
new file mode 100644
index 00000000000..dba1d6a7926
--- /dev/null
+++ b/arch/core-common/api/2.1.0-beta01.txt
@@ -0,0 +1,9 @@
+// Signature format: 3.0
+package androidx.arch.core.util {
+
+  public interface Function<I, O> {
+    method public O! apply(I!);
+  }
+
+}
+
diff --git a/arch/core-common/api/current.txt b/arch/core-common/api/current.txt
index bd1e9846f8e..dba1d6a7926 100644
--- a/arch/core-common/api/current.txt
+++ b/arch/core-common/api/current.txt
@@ -1,12 +1,6 @@
 // Signature format: 3.0
 package androidx.arch.core.util {
 
-  @Deprecated public interface Cancellable {
-    method @Deprecated public void cancel();
-    method @Deprecated public boolean isCancelled();
-    field @Deprecated public static final androidx.arch.core.util.Cancellable CANCELLED;
-  }
-
   public interface Function<I, O> {
     method public O! apply(I!);
   }
diff --git a/arch/core-common/src/main/java/androidx/arch/core/util/Cancellable.java b/arch/core-common/src/main/java/androidx/arch/core/util/Cancellable.java
deleted file mode 100644
index 7555c5383ba..00000000000
--- a/arch/core-common/src/main/java/androidx/arch/core/util/Cancellable.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.arch.core.util;
-
-import androidx.annotation.NonNull;
-
-/**
- * Token representing a cancellable operation.
- * @deprecated Consider using <code>Disposable</code>.
- */
-@Deprecated
-public interface Cancellable {
-    /**
-     * An instance of Cancellable that is always cancelled - i.e., {@link #isCancelled()} will
-     * always return true.
-     * @deprecated Deprecated along with {@link Cancellable} itself.
-     */
-    @Deprecated
-    @NonNull
-    Cancellable CANCELLED = new Cancellable() {
-        @Override
-        public void cancel() {
-        }
-
-        @Override
-        public boolean isCancelled() {
-            return true;
-        }
-    };
-
-    /**
-     * Cancel the subscription. This call should be idempotent, making it safe to
-     * call multiple times.
-     * @deprecated Deprecated along with {@link Cancellable} itself.
-     */
-    @Deprecated
-    void cancel();
-
-    /**
-     * Returns true if the subscription has been cancelled. This is inherently a
-     * racy operation if you are calling {@link #cancel()} on another thread, so this
-     * should be treated as a 'best effort' signal.
-     *
-     * @return Whether the subscription has been cancelled.
-     * @deprecated Deprecated along with {@link Cancellable} itself.
-     */
-    @Deprecated
-    boolean isCancelled();
-}
diff --git a/arch/core-runtime/api/2.1.0-beta01.txt b/arch/core-runtime/api/2.1.0-beta01.txt
new file mode 100644
index 00000000000..da4f6cc18fe
--- /dev/null
+++ b/arch/core-runtime/api/2.1.0-beta01.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/arch/core-runtime/api/res-2.1.0-beta01.txt b/arch/core-runtime/api/res-2.1.0-beta01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/arch/core-runtime/api/res-2.1.0-beta01.txt
diff --git a/arch/core-runtime/api/restricted_2.1.0-beta01.txt b/arch/core-runtime/api/restricted_2.1.0-beta01.txt
new file mode 100644
index 00000000000..adaaab4342f
--- /dev/null
+++ b/arch/core-runtime/api/restricted_2.1.0-beta01.txt
@@ -0,0 +1,30 @@
+// Signature format: 3.0
+package androidx.arch.core.executor {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class ArchTaskExecutor extends androidx.arch.core.executor.TaskExecutor {
+    method public void executeOnDiskIO(Runnable!);
+    method public static java.util.concurrent.Executor getIOThreadExecutor();
+    method public static androidx.arch.core.executor.ArchTaskExecutor getInstance();
+    method public static java.util.concurrent.Executor getMainThreadExecutor();
+    method public boolean isMainThread();
+    method public void postToMainThread(Runnable!);
+    method public void setDelegate(androidx.arch.core.executor.TaskExecutor?);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class DefaultTaskExecutor extends androidx.arch.core.executor.TaskExecutor {
+    ctor public DefaultTaskExecutor();
+    method public void executeOnDiskIO(Runnable!);
+    method public boolean isMainThread();
+    method public void postToMainThread(Runnable!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public abstract class TaskExecutor {
+    ctor public TaskExecutor();
+    method public abstract void executeOnDiskIO(Runnable);
+    method public void executeOnMainThread(Runnable);
+    method public abstract boolean isMainThread();
+    method public abstract void postToMainThread(Runnable);
+  }
+
+}
+
diff --git a/arch/core-testing/api/2.1.0-beta01.txt b/arch/core-testing/api/2.1.0-beta01.txt
new file mode 100644
index 00000000000..7eb7fe1eb00
--- /dev/null
+++ b/arch/core-testing/api/2.1.0-beta01.txt
@@ -0,0 +1,16 @@
+// Signature format: 3.0
+package androidx.arch.core.executor.testing {
+
+  public class CountingTaskExecutorRule extends org.junit.rules.TestWatcher {
+    ctor public CountingTaskExecutorRule();
+    method public void drainTasks(int, java.util.concurrent.TimeUnit!) throws java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public boolean isIdle();
+    method protected void onIdle();
+  }
+
+  public class InstantTaskExecutorRule extends org.junit.rules.TestWatcher {
+    ctor public InstantTaskExecutorRule();
+  }
+
+}
+
diff --git a/arch/core-testing/api/res-2.1.0-beta01.txt b/arch/core-testing/api/res-2.1.0-beta01.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/arch/core-testing/api/res-2.1.0-beta01.txt
diff --git a/arch/core-testing/api/restricted_2.1.0-beta01.txt b/arch/core-testing/api/restricted_2.1.0-beta01.txt
new file mode 100644
index 00000000000..6b162df13ae
--- /dev/null
+++ b/arch/core-testing/api/restricted_2.1.0-beta01.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.arch.core.executor {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class JunitTaskExecutorRule implements org.junit.rules.TestRule {
+    ctor public JunitTaskExecutorRule(int, boolean);
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public void drainTasks(int) throws java.lang.InterruptedException;
+    method public androidx.arch.core.executor.TaskExecutor! getTaskExecutor();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public class TaskExecutorWithFakeMainThread extends androidx.arch.core.executor.TaskExecutor {
+    ctor public TaskExecutorWithFakeMainThread(int);
+    method public void drainTasks(int) throws java.lang.InterruptedException;
+    method public void executeOnDiskIO(Runnable!);
+    method public boolean isMainThread();
+    method public void postToMainThread(Runnable!);
+  }
+
+}
+
diff --git a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
index 6dbc7abae8b..2a9d4306b76 100644
--- a/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/LibraryVersions.kt
@@ -25,9 +25,9 @@ object LibraryVersions {
     val ANIMATION_TESTING = Version("1.1.0-alpha01")
     val ANNOTATION = Version("1.1.0-beta02")
     val APPCOMPAT = Version("1.1.0-alpha05")
-    val ARCH_CORE = Version("2.1.0-alpha02")
+    val ARCH_CORE = Version("2.1.0-beta01")
     val ARCH_CORE_TESTING = ARCH_CORE
-    val ARCH_RUNTIME = Version("2.1.0-alpha02")
+    val ARCH_RUNTIME = Version("2.1.0-beta01")
     val ASYNCLAYOUTINFLATER = Version("1.1.0-alpha01")
     val BENCHMARK = Version("1.0.0-alpha01")
     val BIOMETRIC = Version("1.0.0-alpha05")