From ff2db579313f42a34d6b4edfe96daa546ffd3667 Mon Sep 17 00:00:00 2001 From: Harry Minkyu Ko Date: Tue, 14 Nov 2017 22:03:41 +0900 Subject: [PATCH 1/5] update android arch lifecycle version --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index c6d1443..452d206 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,8 @@ ext { buildToolsVersion = '26.0.1' supportLibVersion = '26.0.2' - lifecycleVersion = '1.0.0-alpha9' + lifecycleVersion = '1.0.0' + lifecycleRuntimeVersion = '1.0.3' sourceCompatibilityVersion = JavaVersion.VERSION_1_7 targetCompatibilityVersion = JavaVersion.VERSION_1_7 @@ -38,7 +39,7 @@ ext { rxJava = 'io.reactivex.rxjava2:rxjava:2.1.3' rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.1' navi = 'com.trello.navi2:navi:2.0' - lifecycle = "android.arch.lifecycle:runtime:$lifecycleVersion" + lifecycle = "android.arch.lifecycle:runtime:$lifecycleRuntimeVersion" lifecycleProcessor = "android.arch.lifecycle:compiler:$lifecycleVersion" lifecycleExtensions = "android.arch.lifecycle:extensions:$lifecycleVersion" kotlinStdlib = "org.jetbrains.kotlin:kotlin-stdlib:$verKotlin" From d717cc6e9384685e052febfa7d362bbb89e8bc3d Mon Sep 17 00:00:00 2001 From: Harry Minkyu Ko Date: Wed, 15 Nov 2017 16:14:02 +0900 Subject: [PATCH 2/5] update android build gradle and buildTools version. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 452d206..5a75dad 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$verKotlin" classpath "org.jetbrains.kotlin:kotlin-android-extensions:$verKotlin" classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' @@ -26,7 +26,7 @@ ext { minSdkVersion = 14 compileSdkVersion = 26 targetSdkVersion = compileSdkVersion - buildToolsVersion = '26.0.1' + buildToolsVersion = '26.0.2' supportLibVersion = '26.0.2' lifecycleVersion = '1.0.0' From a5b769299e73feb96b3e0d4314e56047b9c31c3c Mon Sep 17 00:00:00 2001 From: Harry Minkyu Ko Date: Wed, 15 Nov 2017 16:17:50 +0900 Subject: [PATCH 3/5] forgot google repository --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 5a75dad..3c01d7d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ buildscript { verKotlin = '1.1.4-3' } repositories { + google() jcenter() } dependencies { From d0fbb77b9b7617e1df94f4ca7ec71c506c6868b1 Mon Sep 17 00:00:00 2001 From: Harry Minkyu Ko Date: Wed, 15 Nov 2017 16:23:41 +0900 Subject: [PATCH 4/5] LifecycleRegistryOwner is deprecated. So there is no more content provider needed. --- .../android/lifecycle/AndroidLifecycleActivityTest.java | 3 --- .../android/lifecycle/AndroidLifecycleFragmentTest.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java index 7d8b0ad..1d6e3cd 100644 --- a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java +++ b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java @@ -3,7 +3,6 @@ import android.arch.lifecycle.Lifecycle; import android.arch.lifecycle.LifecycleActivity; import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.LifecycleRuntimeTrojanProvider; import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle; import com.trello.rxlifecycle2.LifecycleProvider; import io.reactivex.Observable; @@ -26,8 +25,6 @@ public class AndroidLifecycleActivityTest { @Before public void setup() { observable = PublishSubject.create().hide(); - // LifecycleRegistryOwner requires a content provider to init correctly. - Robolectric.buildContentProvider(LifecycleRuntimeTrojanProvider.class).create(); } @Test diff --git a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java index 23d7eeb..0f3c091 100644 --- a/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java +++ b/rxlifecycle-android-lifecycle/src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java @@ -3,7 +3,6 @@ import android.arch.lifecycle.Lifecycle; import android.arch.lifecycle.LifecycleFragment; import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.LifecycleRuntimeTrojanProvider; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle; @@ -27,8 +26,6 @@ public class AndroidLifecycleFragmentTest { @Before public void setup() { observable = PublishSubject.create().hide(); - // LifecycleRegistryOwner requires a content provider to init correctly. - Robolectric.buildContentProvider(LifecycleRuntimeTrojanProvider.class).create(); } @Test From 912868ae6940b992bee015d24a2400f7c44274cf Mon Sep 17 00:00:00 2001 From: Harry Minkyu Ko Date: Wed, 15 Nov 2017 16:30:50 +0900 Subject: [PATCH 5/5] update travis configuration --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a65498e..40da072 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ android: components: - tools - platform-tools - - build-tools-26.0.1 + - build-tools-26.0.2 - android-26 - extra-android-m2repository @@ -19,4 +19,4 @@ cache: directories: - $HOME/.gradle -script: ./gradlew build test \ No newline at end of file +script: ./gradlew build test