Merge pull request #69 from ryanmoelter/update-dependencies-2017-02-25

Update dependencies except espresso (2017-02-25)
wealthfront · May 1, 2018 · 9083d2c · 9083d2c
2 parents a147c0f + 1f5425a
commit 9083d2c
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 76 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,13 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-25.0.1
-    - android-25
+    - build-tools-27.0.3
+    - android-27
     - extra
 
+before_install:
+  - yes | sdkmanager "platforms;android-27"
+
 jdk:
   - oraclejdk8
 

diff --git a/build.gradle b/build.gradle
@@ -4,9 +4,10 @@ buildscript {
   repositories {
     jcenter()
     mavenCentral()
+    google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.0'
+    classpath 'com.android.tools.build:gradle:3.1.2'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
@@ -17,6 +18,7 @@ allprojects {
   repositories {
     jcenter()
     mavenCentral()
+    google()
   }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,10 @@ POM_DEVELOPER_ID=wealthfront
 POM_DEVELOPER_NAME=Wealthfront, Inc.
 
 RELEASE_REPOSITORY_URL=https://oss.sonatype.org/service/local/staging/deploy/maven2/
-SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
+SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/
+
+BUILD_TOOLS_VERSION=27.0.3
+SUPPORT_LIBRARY_VERSION=27.1.1
+JUNIT_VERSION=4.12
+TRUTH_VERSION=0.39
+MOCKITO_VERSION=2.15.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Apr 04 18:34:54 PDT 2017
+#Mon Apr 30 10:10:33 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/magellan-library/build.gradle b/magellan-library/build.gradle
@@ -4,14 +4,14 @@ group = GROUP
 version = VERSION_NAME
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.1"
+  compileSdkVersion 27
+  buildToolsVersion BUILD_TOOLS_VERSION
 
   resourcePrefix 'magellan_'
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 25
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
 
@@ -29,13 +29,14 @@ apply from: rootProject.file('checkstyle/checkstyle.gradle')
 
 dependencies {
 
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.support:support-annotations:25.3.1'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation "com.android.support:support-annotations:${SUPPORT_LIBRARY_VERSION}"
+
+  testImplementation "junit:junit:${JUNIT_VERSION}"
+  testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
+  testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
+  testImplementation('org.robolectric:robolectric:3.7.1') {
 
-  testCompile 'junit:junit:4.12'
-  testCompile 'com.google.truth:truth:0.28'
-  testCompile 'org.mockito:mockito-core:2.0.31-beta'
-  testCompile('org.robolectric:robolectric:3.1-rc1') {
     exclude group: 'commons-logging', module: 'commons-logging'
     exclude group: 'org.apache.httpcomponents', module: 'httpclient'
   }

diff --git a/magellan-rx/build.gradle b/magellan-rx/build.gradle
@@ -4,12 +4,12 @@ group = GROUP
 version = VERSION_NAME
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.1"
+  compileSdkVersion 27
+  buildToolsVersion BUILD_TOOLS_VERSION
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 25
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
 
@@ -27,13 +27,13 @@ apply from: rootProject.file('checkstyle/checkstyle.gradle')
 
 dependencies {
 
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile project(':magellan-library')
-  compile 'io.reactivex:rxjava:1.2.2'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation project(':magellan-library')
+  implementation 'io.reactivex:rxjava:1.3.8'
 
-  testCompile 'junit:junit:4.12'
-  testCompile 'com.google.truth:truth:0.28'
-  testCompile 'org.mockito:mockito-core:2.0.31-beta'
+  testImplementation "junit:junit:${JUNIT_VERSION}"
+  testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
+  testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
diff --git a/magellan-rx2/build.gradle b/magellan-rx2/build.gradle
@@ -4,12 +4,12 @@ group = GROUP
 version = VERSION_NAME
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.1"
+  compileSdkVersion 27
+  buildToolsVersion BUILD_TOOLS_VERSION
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 25
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
 
@@ -27,13 +27,13 @@ apply from: rootProject.file('checkstyle/checkstyle.gradle')
 
 dependencies {
 
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile project(':magellan-library')
-  compile 'io.reactivex.rxjava2:rxjava:2.0.8'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation project(':magellan-library')
+  implementation 'io.reactivex.rxjava2:rxjava:2.1.13'
 
-  testCompile 'junit:junit:4.12'
-  testCompile 'com.google.truth:truth:0.28'
-  testCompile 'org.mockito:mockito-core:2.0.31-beta'
+  testImplementation "junit:junit:${JUNIT_VERSION}"
+  testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
+  testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
 }
 
 apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
diff --git a/magellan-sample-advanced/build.gradle b/magellan-sample-advanced/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.1"
+  compileSdkVersion 27
+  buildToolsVersion BUILD_TOOLS_VERSION
   defaultConfig {
     applicationId "com.wealthfront.magellan.sample"
     minSdkVersion 15
-    targetSdkVersion 25
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -22,37 +22,37 @@ android {
   }
 
   lintOptions {
-    disable 'InvalidPackage','IconDensities'
+    disable 'InvalidPackage','IconDensities', 'ObsoleteLintCustomCheck', 'IconMissingDensityFolder', 'AllowBackup'
   }
 }
 
 apply from: rootProject.file('checkstyle/checkstyle.gradle')
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.support:appcompat-v7:25.2.0'
-  compile project(':magellan-library')
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
+  implementation project(':magellan-library')
 
-  compile 'com.jakewharton:butterknife:8.5.1'
-  annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+  implementation 'com.jakewharton:butterknife:8.8.1'
+  annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
-  compile 'com.google.dagger:dagger:2.10'
-  annotationProcessor 'com.google.dagger:dagger-compiler:2.10'
+  implementation 'com.google.dagger:dagger:2.15'
+  annotationProcessor 'com.google.dagger:dagger-compiler:2.15'
 
-  compile project(path: ':magellan-rx')
+  implementation project(path: ':magellan-rx')
 
-  compile 'com.squareup.retrofit2:retrofit:2.2.0'
-  compile 'com.squareup.retrofit2:adapter-rxjava:2.2.0'
-  compile 'com.squareup.retrofit2:converter-jackson:2.2.0'
-  compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+  implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+  implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
+  implementation 'com.squareup.retrofit2:converter-jackson:2.3.0'
+  implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
 
-  compile 'io.reactivex:rxandroid:1.2.1'
+  implementation 'io.reactivex:rxandroid:1.2.1'
 
-  testCompile 'junit:junit:4.12'
-  testCompile "org.mockito:mockito-core:2.7.21"
-  testCompile "org.robolectric:robolectric:3.3.2"
+  testImplementation "junit:junit:${JUNIT_VERSION}"
+  testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
+  testImplementation 'org.robolectric:robolectric:3.7.1'
 
-  androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+  androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
     exclude group: 'com.android.support', module: 'support-annotations'
   })
 }
diff --git a/magellan-sample/build.gradle b/magellan-sample/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.1"
+  compileSdkVersion 27
+  buildToolsVersion BUILD_TOOLS_VERSION
   defaultConfig {
     applicationId "com.wealthfront.magellan.sample"
     minSdkVersion 15
-    targetSdkVersion 25
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,14 +21,14 @@ android {
 apply from: rootProject.file('checkstyle/checkstyle.gradle')
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.support:appcompat-v7:25.2.0'
-  compile project(':magellan-library')
-  compile project(':magellan-support')
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
+  implementation project(':magellan-library')
+  implementation project(':magellan-support')
 
-  testCompile 'junit:junit:4.12'
+  testImplementation "junit:junit:${JUNIT_VERSION}"
 
-  androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+  androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
     exclude group: 'com.android.support', module: 'support-annotations'
   })
 }
diff --git a/magellan-support/build.gradle b/magellan-support/build.gradle
@@ -4,12 +4,12 @@ group = GROUP
 version = VERSION_NAME
 
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.1"
+  compileSdkVersion 27
+  buildToolsVersion BUILD_TOOLS_VERSION
 
   defaultConfig {
     minSdkVersion 15
-    targetSdkVersion 25
+    targetSdkVersion 27
     versionCode 1
     versionName "1.0"
 
@@ -21,20 +21,24 @@ android {
       minifyEnabled false
     }
   }
+
+  lintOptions {
+    disable 'StaticFieldLeak'
+  }
 }
 
 apply from: rootProject.file('checkstyle/checkstyle.gradle')
 
 dependencies {
 
-  compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile project(':magellan-library')
-  compile 'com.android.support:appcompat-v7:25.3.1'
+  implementation fileTree(dir: 'libs', include: ['*.jar'])
+  implementation project(':magellan-library')
+  implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
 
-  testCompile 'junit:junit:4.12'
-  testCompile 'com.google.truth:truth:0.28'
-  testCompile 'org.mockito:mockito-core:2.0.31-beta'
-  testCompile('org.robolectric:robolectric:3.1-rc1') {
+  testImplementation "junit:junit:${JUNIT_VERSION}"
+  testImplementation "com.google.truth:truth:${TRUTH_VERSION}"
+  testImplementation "org.mockito:mockito-core:${MOCKITO_VERSION}"
+  testImplementation('org.robolectric:robolectric:3.7.1') {
     exclude group: 'commons-logging', module: 'commons-logging'
     exclude group: 'org.apache.httpcomponents', module: 'httpclient'
   }

diff --git a/magellan-support/src/main/java/com/wealthfront/magellan/support/SingleActivity.java b/magellan-support/src/main/java/com/wealthfront/magellan/support/SingleActivity.java
@@ -34,6 +34,7 @@ protected void onPostCreate(@Nullable Bundle savedInstanceState) {
   @Override
   public void onSaveInstanceState(Bundle outState) {
     navigator.onSaveInstanceState(outState);
+    super.onSaveInstanceState(outState);
   }
 
   @Override

diff --git a/magellan-support/src/main/res/values/strings.xml b/magellan-support/src/main/res/values/strings.xml