Merge pull request #249 from KoMinkyu/2.x

Update android arch lifecycle version
trello-archive · Nov 15, 2017 · f2146fd · f2146fd
2 parents 9a1e2fb + 912868a
commit f2146fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git 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
+script: ./gradlew build test
diff --git a/build.gradle b/build.gradle
@@ -4,10 +4,11 @@ buildscript {
         verKotlin = '1.1.4-3'
     }
     repositories {
+        google()
         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,10 +27,11 @@ ext {
     minSdkVersion = 14
     compileSdkVersion = 26
     targetSdkVersion = compileSdkVersion
-    buildToolsVersion = '26.0.1'
+    buildToolsVersion = '26.0.2'
 
     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 +40,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"

diff --git a/...src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java b/...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/...src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java b/...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