Create lifecycle:livedata-core dependency
Move the core classes of LiveData into a separate
lifecycle:livedata-core dependency that represents
the very minimal API surface needed for LiveData.
The lifecycle:livedata dependency will keep the
non-essential LiveData APIs (such as Transformations
and MediatorLiveData) and have livedata-core as a
transitive dependency.
Test: tests still pass
BUG: 70681466
Change-Id: I1d2974f7f95f27e19bcca8be32d0ddc4283d5d43
diff --git a/app-toolkit/settings.gradle b/app-toolkit/settings.gradle
index 62ea628..43237a4 100644
--- a/app-toolkit/settings.gradle
+++ b/app-toolkit/settings.gradle
@@ -45,6 +45,9 @@
include ':arch:core-testing'
project(':arch:core-testing').projectDir = new File(supportRoot, "app-toolkit/core-testing")
+include ':lifecycle:livedata-core'
+project(':lifecycle:livedata-core').projectDir = new File(supportRoot, "lifecycle/livedata-core")
+
include ':lifecycle:livedata'
project(':lifecycle:livedata').projectDir = new File(supportRoot, "lifecycle/livedata")
diff --git a/lifecycle/livedata-core/api/current.txt b/lifecycle/livedata-core/api/current.txt
new file mode 100644
index 0000000..0c855c4
--- /dev/null
+++ b/lifecycle/livedata-core/api/current.txt
@@ -0,0 +1,29 @@
+package android.arch.lifecycle {
+
+ public abstract class LiveData<T> {
+ ctor public LiveData();
+ method public T getValue();
+ method public boolean hasActiveObservers();
+ method public boolean hasObservers();
+ method public void observe(android.arch.lifecycle.LifecycleOwner, android.arch.lifecycle.Observer<T>);
+ method public void observeForever(android.arch.lifecycle.Observer<T>);
+ method protected void onActive();
+ method protected void onInactive();
+ method protected void postValue(T);
+ method public void removeObserver(android.arch.lifecycle.Observer<T>);
+ method public void removeObservers(android.arch.lifecycle.LifecycleOwner);
+ method protected void setValue(T);
+ }
+
+ public class MutableLiveData<T> extends android.arch.lifecycle.LiveData {
+ ctor public MutableLiveData();
+ method public void postValue(T);
+ method public void setValue(T);
+ }
+
+ public abstract interface Observer<T> {
+ method public abstract void onChanged(T);
+ }
+
+}
+
diff --git a/lifecycle/livedata-core/build.gradle b/lifecycle/livedata-core/build.gradle
new file mode 100644
index 0000000..58765a0
--- /dev/null
+++ b/lifecycle/livedata-core/build.gradle
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2017 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.
+ */
+
+import static android.support.dependencies.DependenciesKt.*
+import android.support.LibraryGroups
+import android.support.LibraryVersions
+import android.support.SupportLibraryExtension
+
+plugins {
+ id("SupportAndroidLibraryPlugin")
+}
+
+dependencies {
+ implementation(project(":arch:common"))
+ implementation(project(":arch:runtime"))
+ api(project(":lifecycle:common"))
+
+ testImplementation(project(":lifecycle:runtime"))
+ testImplementation(project(":arch:core-testing"))
+ testImplementation(JUNIT)
+ testImplementation(MOCKITO_CORE)
+}
+
+supportLibrary {
+ name = "Android Lifecycle LiveData Core"
+ publish = true
+ mavenVersion = LibraryVersions.LIFECYCLES_LIVEDATA
+ mavenGroup = LibraryGroups.LIFECYCLE
+ inceptionYear = "2017"
+ description = "Android Lifecycle LiveData Core"
+ url = SupportLibraryExtension.ARCHITECTURE_URL
+}
diff --git a/lifecycle/livedata-core/src/main/AndroidManifest.xml b/lifecycle/livedata-core/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..6d2f964
--- /dev/null
+++ b/lifecycle/livedata-core/src/main/AndroidManifest.xml
@@ -0,0 +1,19 @@
+<!--
+ ~ Copyright 2017 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.arch.lifecycle.livedata.core">
+</manifest>
diff --git a/lifecycle/livedata/src/main/java/android/arch/lifecycle/LiveData.java b/lifecycle/livedata-core/src/main/java/android/arch/lifecycle/LiveData.java
similarity index 100%
rename from lifecycle/livedata/src/main/java/android/arch/lifecycle/LiveData.java
rename to lifecycle/livedata-core/src/main/java/android/arch/lifecycle/LiveData.java
diff --git a/lifecycle/livedata/src/main/java/android/arch/lifecycle/MutableLiveData.java b/lifecycle/livedata-core/src/main/java/android/arch/lifecycle/MutableLiveData.java
similarity index 100%
rename from lifecycle/livedata/src/main/java/android/arch/lifecycle/MutableLiveData.java
rename to lifecycle/livedata-core/src/main/java/android/arch/lifecycle/MutableLiveData.java
diff --git a/lifecycle/livedata/src/main/java/android/arch/lifecycle/Observer.java b/lifecycle/livedata-core/src/main/java/android/arch/lifecycle/Observer.java
similarity index 100%
rename from lifecycle/livedata/src/main/java/android/arch/lifecycle/Observer.java
rename to lifecycle/livedata-core/src/main/java/android/arch/lifecycle/Observer.java
diff --git a/lifecycle/livedata/src/test/java/android/arch/lifecycle/LiveDataTest.java b/lifecycle/livedata-core/src/test/java/android/arch/lifecycle/LiveDataTest.java
similarity index 99%
rename from lifecycle/livedata/src/test/java/android/arch/lifecycle/LiveDataTest.java
rename to lifecycle/livedata-core/src/test/java/android/arch/lifecycle/LiveDataTest.java
index dafa46d..046059b 100644
--- a/lifecycle/livedata/src/test/java/android/arch/lifecycle/LiveDataTest.java
+++ b/lifecycle/livedata-core/src/test/java/android/arch/lifecycle/LiveDataTest.java
@@ -38,11 +38,12 @@
import static org.mockito.Mockito.when;
import android.arch.core.executor.ArchTaskExecutor;
-import android.arch.lifecycle.util.InstantTaskExecutor;
+import android.arch.core.executor.testing.InstantTaskExecutorRule;
import android.support.annotation.Nullable;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -53,6 +54,10 @@
@SuppressWarnings({"unchecked"})
@RunWith(JUnit4.class)
public class LiveDataTest {
+
+ @Rule
+ public InstantTaskExecutorRule mInstantTaskExecutorRule = new InstantTaskExecutorRule();
+
private PublicLiveData<String> mLiveData;
private MethodExec mActiveObserversChanged;
@@ -103,11 +108,6 @@
when(mOwner4.getLifecycle()).thenReturn(mLifecycle4);
}
- @Before
- public void swapExecutorDelegate() {
- ArchTaskExecutor.getInstance().setDelegate(new InstantTaskExecutor());
- }
-
@After
public void removeExecutorDelegate() {
ArchTaskExecutor.getInstance().setDelegate(null);
diff --git a/lifecycle/livedata/src/test/java/android/arch/lifecycle/ThreadedLiveDataTest.java b/lifecycle/livedata-core/src/test/java/android/arch/lifecycle/ThreadedLiveDataTest.java
similarity index 97%
rename from lifecycle/livedata/src/test/java/android/arch/lifecycle/ThreadedLiveDataTest.java
rename to lifecycle/livedata-core/src/test/java/android/arch/lifecycle/ThreadedLiveDataTest.java
index ca27067..3366641 100644
--- a/lifecycle/livedata/src/test/java/android/arch/lifecycle/ThreadedLiveDataTest.java
+++ b/lifecycle/livedata-core/src/test/java/android/arch/lifecycle/ThreadedLiveDataTest.java
@@ -30,10 +30,13 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+@RunWith(JUnit4.class)
public class ThreadedLiveDataTest {
private static final int TIMEOUT_SECS = 3;
diff --git a/lifecycle/livedata/api/current.txt b/lifecycle/livedata/api/current.txt
index 64f199f..f9783ec 100644
--- a/lifecycle/livedata/api/current.txt
+++ b/lifecycle/livedata/api/current.txt
@@ -1,36 +1,11 @@
package android.arch.lifecycle {
- public abstract class LiveData<T> {
- ctor public LiveData();
- method public T getValue();
- method public boolean hasActiveObservers();
- method public boolean hasObservers();
- method public void observe(android.arch.lifecycle.LifecycleOwner, android.arch.lifecycle.Observer<T>);
- method public void observeForever(android.arch.lifecycle.Observer<T>);
- method protected void onActive();
- method protected void onInactive();
- method protected void postValue(T);
- method public void removeObserver(android.arch.lifecycle.Observer<T>);
- method public void removeObservers(android.arch.lifecycle.LifecycleOwner);
- method protected void setValue(T);
- }
-
public class MediatorLiveData<T> extends android.arch.lifecycle.MutableLiveData {
ctor public MediatorLiveData();
method public <S> void addSource(android.arch.lifecycle.LiveData<S>, android.arch.lifecycle.Observer<S>);
method public <S> void removeSource(android.arch.lifecycle.LiveData<S>);
}
- public class MutableLiveData<T> extends android.arch.lifecycle.LiveData {
- ctor public MutableLiveData();
- method public void postValue(T);
- method public void setValue(T);
- }
-
- public abstract interface Observer<T> {
- method public abstract void onChanged(T);
- }
-
public class Transformations {
method public static <X, Y> android.arch.lifecycle.LiveData<Y> map(android.arch.lifecycle.LiveData<X>, android.arch.core.util.Function<X, Y>);
method public static <X, Y> android.arch.lifecycle.LiveData<Y> switchMap(android.arch.lifecycle.LiveData<X>, android.arch.core.util.Function<X, android.arch.lifecycle.LiveData<Y>>);
diff --git a/lifecycle/livedata/build.gradle b/lifecycle/livedata/build.gradle
index 9906c0e..7047886 100644
--- a/lifecycle/livedata/build.gradle
+++ b/lifecycle/livedata/build.gradle
@@ -24,11 +24,11 @@
}
dependencies {
- api(project(":arch:common"))
+ implementation(project(":arch:common"))
api(project(":arch:runtime"))
- api(project(":lifecycle:common"))
- api(project(":lifecycle:runtime"))
+ api(project(":lifecycle:livedata-core"))
+ testImplementation(project(":lifecycle:runtime"))
testImplementation(project(":arch:core-testing"))
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)