Move Function from runtime to core DO NOT MERGE
Fixes: 74643902
Test: ./gradlew checkApi
Change-Id: I49d1e564543c2780aac47856f04bb496f6fa7754
diff --git a/app-toolkit/common/api/1.1.0.txt b/app-toolkit/common/api/1.1.0.txt
new file mode 100644
index 0000000..af5b253
--- /dev/null
+++ b/app-toolkit/common/api/1.1.0.txt
@@ -0,0 +1,8 @@
+package android.arch.core.util {
+
+ public abstract interface Function<I, O> {
+ method public abstract O apply(I);
+ }
+
+}
+
diff --git a/app-toolkit/runtime/src/main/java/android/arch/core/util/Function.java b/app-toolkit/common/src/main/java/android/arch/core/util/Function.java
similarity index 100%
rename from app-toolkit/runtime/src/main/java/android/arch/core/util/Function.java
rename to app-toolkit/common/src/main/java/android/arch/core/util/Function.java
diff --git a/app-toolkit/runtime/api/1.1.0.ignore b/app-toolkit/runtime/api/1.1.0.ignore
new file mode 100644
index 0000000..fd6cc23
--- /dev/null
+++ b/app-toolkit/runtime/api/1.1.0.ignore
@@ -0,0 +1 @@
+da4cffc
diff --git a/app-toolkit/runtime/api/1.1.0.txt b/app-toolkit/runtime/api/1.1.0.txt
index af5b253..e69de29 100644
--- a/app-toolkit/runtime/api/1.1.0.txt
+++ b/app-toolkit/runtime/api/1.1.0.txt
@@ -1,8 +0,0 @@
-package android.arch.core.util {
-
- public abstract interface Function<I, O> {
- method public abstract O apply(I);
- }
-
-}
-
diff --git a/app-toolkit/runtime/api/current.txt b/app-toolkit/runtime/api/current.txt
index af5b253..e69de29 100644
--- a/app-toolkit/runtime/api/current.txt
+++ b/app-toolkit/runtime/api/current.txt
@@ -1,8 +0,0 @@
-package android.arch.core.util {
-
- public abstract interface Function<I, O> {
- method public abstract O apply(I);
- }
-
-}
-
diff --git a/buildSrc/src/main/kotlin/android/support/LibraryVersions.kt b/buildSrc/src/main/kotlin/android/support/LibraryVersions.kt
index 2000b57..1fe2b54 100644
--- a/buildSrc/src/main/kotlin/android/support/LibraryVersions.kt
+++ b/buildSrc/src/main/kotlin/android/support/LibraryVersions.kt
@@ -50,7 +50,7 @@
*/
val PAGING = Version("1.0.0-alpha6")
- private val LIFECYCLES = Version("1.1.0")
+ private val LIFECYCLES = Version("1.1.1-alpha1")
/**
* Version code for Lifecycle libs that are required by the support library
@@ -65,7 +65,7 @@
/**
* Version code for shared code of flatfoot
*/
- val ARCH_CORE = Version("1.1.0")
+ val ARCH_CORE = Version("1.1.1-alpha1")
/**
* Version code for shared code of flatfoot runtime
diff --git a/lifecycle/runtime/api/current.txt b/lifecycle/runtime/api/current.txt
index 93a55fc..2b900b0 100644
--- a/lifecycle/runtime/api/current.txt
+++ b/lifecycle/runtime/api/current.txt
@@ -10,7 +10,7 @@
method public void removeObserver(android.arch.lifecycle.LifecycleObserver);
}
- public abstract interface LifecycleRegistryOwner implements android.arch.lifecycle.LifecycleOwner {
+ public abstract deprecated interface LifecycleRegistryOwner implements android.arch.lifecycle.LifecycleOwner {
method public abstract android.arch.lifecycle.LifecycleRegistry getLifecycle();
}