Merge pull request #275 from trello/dlew/dependencies

Updated dependencies
trello-archive · Jul 29, 2018 · 56a0435 · 56a0435
2 parents ad7dc38 + bf5c5a2
commit 56a0435
Show file tree

Hide file tree

Showing 15 changed files with 65 additions and 58 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,8 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-26.0.2
-    - android-26
+    - build-tools-27.0.3
+    - android-27
     - extra-android-m2repository
 
 jdk: oraclejdk8

diff --git a/build.gradle b/build.gradle
@@ -1,18 +1,18 @@
 buildscript {
     ext {
         //version here to share between build script and projects
-        verKotlin = '1.1.4-3'
+        verKotlin = '1.2.51'
     }
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         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'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
 
@@ -25,21 +25,21 @@ apply plugin: 'com.github.ben-manes.versions'
 
 ext {
     minSdkVersion = 14
-    compileSdkVersion = 26
+    compileSdkVersion = 27
     targetSdkVersion = compileSdkVersion
-    buildToolsVersion = '26.0.2'
+    buildToolsVersion = '27.0.3'
 
-    supportLibVersion = '26.0.2'
-    lifecycleVersion = '1.0.0'
-    lifecycleRuntimeVersion = '1.0.3'
+    supportLibVersion = '27.1.1'
+    lifecycleVersion = '1.1.1'
+    lifecycleRuntimeVersion = '1.1.1'
 
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 
     // Define all dependencies in the base project, to unify & make it easy to update
-    rxJava = 'io.reactivex.rxjava2:rxjava:2.1.3'
-    rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    navi = 'com.trello.navi2:navi:2.0'
+    rxJava = 'io.reactivex.rxjava2:rxjava:2.1.17'
+    rxAndroid = 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    navi = 'com.trello.navi2:navi:2.0.1'
     lifecycle = "android.arch.lifecycle:runtime:$lifecycleRuntimeVersion"
     lifecycleProcessor = "android.arch.lifecycle:compiler:$lifecycleVersion"
     lifecycleExtensions = "android.arch.lifecycle:extensions:$lifecycleVersion"
@@ -49,5 +49,5 @@ ext {
     supportAnnotations = "com.android.support:support-annotations:$supportLibVersion"
     jsr305Annotations = 'com.google.code.findbugs:jsr305:3.0.2'
     junit = 'junit:junit:4.12'
-    robolectric = 'org.robolectric:robolectric:3.4.2'
+    robolectric = 'org.robolectric:robolectric:3.8'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/rxlifecycle-android-lifecycle-kotlin/build.gradle b/rxlifecycle-android-lifecycle-kotlin/build.gradle
@@ -14,11 +14,12 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile kotlinStdlib
-    compile project(':rxlifecycle-android-lifecycle')
+    implementation kotlinStdlib
+    api project(':rxlifecycle-android-lifecycle')
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/rxlifecycle-android-lifecycle/build.gradle b/rxlifecycle-android-lifecycle/build.gradle
@@ -13,19 +13,20 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile project(':rxlifecycle')
+    api project(':rxlifecycle')
 
-    compile rootProject.ext.rxAndroid
-    compile rootProject.ext.supportAnnotations
-    compile rootProject.ext.lifecycle
+    implementation rootProject.ext.rxAndroid
+    implementation rootProject.ext.supportAnnotations
+    api rootProject.ext.lifecycle
     annotationProcessor rootProject.ext.lifecycleProcessor
 
-    testCompile rootProject.ext.junit
-    testCompile rootProject.ext.robolectric
-    testCompile rootProject.ext.lifecycleExtensions
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
+    testImplementation rootProject.ext.lifecycleExtensions
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/...src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java b/...src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleActivityTest.java
@@ -1,8 +1,8 @@
 package com.trello.rxlifecycle2.android.lifecycle;
 
 import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleActivity;
 import android.arch.lifecycle.LifecycleOwner;
+import android.support.v4.app.FragmentActivity;
 import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle;
 import com.trello.rxlifecycle2.LifecycleProvider;
 import io.reactivex.Observable;
@@ -29,9 +29,9 @@ public void setup() {
 
     @Test
     public void testLifecycleActivity() {
-        testLifecycle(Robolectric.buildActivity(LifecycleActivity.class));
-        testBindUntilEvent(Robolectric.buildActivity(LifecycleActivity.class));
-        testBindToLifecycle(Robolectric.buildActivity(LifecycleActivity.class));
+        testLifecycle(Robolectric.buildActivity(FragmentActivity.class));
+        testBindUntilEvent(Robolectric.buildActivity(FragmentActivity.class));
+        testBindToLifecycle(Robolectric.buildActivity(FragmentActivity.class));
     }
 
 

diff --git a/...src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java b/...src/test/java/com/trello/rxlifecycle2/android/lifecycle/AndroidLifecycleFragmentTest.java
@@ -1,7 +1,6 @@
 package com.trello.rxlifecycle2.android.lifecycle;
 
 import android.arch.lifecycle.Lifecycle;
-import android.arch.lifecycle.LifecycleFragment;
 import android.arch.lifecycle.LifecycleOwner;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
@@ -30,9 +29,9 @@ public void setup() {
 
     @Test
     public void testLifecycleFragment() {
-        testLifecycle(new LifecycleFragment());
-        testBindUntilEvent(new LifecycleFragment());
-        testBindToLifecycle(new LifecycleFragment());
+        testLifecycle(new Fragment());
+        testBindUntilEvent(new Fragment());
+        testBindToLifecycle(new Fragment());
     }
 
     private void testLifecycle(LifecycleOwner owner) {

diff --git a/rxlifecycle-android/build.gradle b/rxlifecycle-android/build.gradle
@@ -13,16 +13,17 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile project(':rxlifecycle')
+    api project(':rxlifecycle')
 
-    compile rootProject.ext.rxAndroid
-    compile rootProject.ext.supportAnnotations
+    implementation rootProject.ext.rxAndroid
+    implementation rootProject.ext.supportAnnotations
 
-    testCompile rootProject.ext.junit
-    testCompile rootProject.ext.robolectric
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/rxlifecycle-components-preference/build.gradle b/rxlifecycle-components-preference/build.gradle
@@ -13,17 +13,18 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile project(':rxlifecycle-android')
+    api project(':rxlifecycle-android')
 
-    compile rootProject.ext.rxJava
+    implementation rootProject.ext.rxJava
 
-    compile rootProject.ext.preferenceCompat
+    implementation rootProject.ext.preferenceCompat
 
-    testCompile rootProject.ext.junit
-    testCompile rootProject.ext.robolectric
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/rxlifecycle-components/build.gradle b/rxlifecycle-components/build.gradle
@@ -13,17 +13,18 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile project(':rxlifecycle-android')
+    api project(':rxlifecycle-android')
 
-    compile rootProject.ext.rxJava
+    implementation rootProject.ext.rxJava
 
-    compile rootProject.ext.appCompat
+    implementation rootProject.ext.appCompat
 
-    testCompile rootProject.ext.junit
-    testCompile rootProject.ext.robolectric
+    testImplementation rootProject.ext.junit
+    testImplementation rootProject.ext.robolectric
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/rxlifecycle-kotlin/build.gradle b/rxlifecycle-kotlin/build.gradle
@@ -14,11 +14,12 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile kotlinStdlib
-    compile project(':rxlifecycle-android')
+    implementation kotlinStdlib
+    api project(':rxlifecycle-android')
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/rxlifecycle-navi/build.gradle b/rxlifecycle-navi/build.gradle
@@ -13,14 +13,15 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile project(':rxlifecycle-android')
+    api project(':rxlifecycle-android')
 
-    compile rootProject.ext.navi
+    api rootProject.ext.navi
 
-    testCompile rootProject.ext.junit
+    testImplementation rootProject.ext.junit
 }
 
 apply from: "$rootDir/gradle/artifacts.gradle"

diff --git a/rxlifecycle-sample/build.gradle b/rxlifecycle-sample/build.gradle
@@ -23,13 +23,14 @@ android {
 repositories {
     mavenCentral()
     google()
+    jcenter()
 }
 
 dependencies {
-    compile project(':rxlifecycle-components')
-    compile project(':rxlifecycle-kotlin')
+    implementation project(':rxlifecycle-components')
+    implementation project(':rxlifecycle-kotlin')
 
-    compile rootProject.ext.appCompat
+    implementation rootProject.ext.appCompat
 
-    compile rootProject.ext.kotlinStdlib
+    implementation rootProject.ext.kotlinStdlib
 }
diff --git a/rxlifecycle/build.gradle b/rxlifecycle/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     compile rootProject.ext.rxJava
     compileOnly rootProject.ext.jsr305Annotations
 
-    testCompile rootProject.ext.junit
+    testImplementation rootProject.ext.junit
 }
 
 // Add sources/javadoc artifacts