Update all dependencies and support library version

mafujuls · Nov 22, 2017 · 8d3cb0c · 8d3cb0c
1 parent cbd98f1
commit 8d3cb0c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,14 +7,14 @@ repositories {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion '26.0.2'
 
     defaultConfig {
         versionCode 227
         versionName "10.10.2"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         testApplicationId "org.liberty.android.fantastischmemo.test"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
         multiDexEnabled true
@@ -84,42 +84,38 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-core-utils:26.0.2'
-    compile 'com.android.support:support-fragment:26.0.2'
-    compile 'com.android.support:cardview-v7:26.0.2'
-    compile 'com.android.support:design:26.0.2'
-    compile 'com.android.support:support-annotations:26.0.2'
-    compile 'com.android.support:customtabs:26.0.2'
-    compile 'com.android.support:multidex:1.0.1'
+    compile 'com.android.support:support-core-utils:27.0.1'
+    compile 'com.android.support:support-fragment:27.0.1'
+    compile 'com.android.support:cardview-v7:27.0.1'
+    compile 'com.android.support:design:27.0.1'
+    compile 'com.android.support:support-annotations:27.0.1'
+    compile 'com.android.support:customtabs:27.0.1'
+    compile 'com.android.support:multidex:1.0.2'
 
     compile 'com.j256.ormlite:ormlite-core:4.48'
     compile 'com.j256.ormlite:ormlite-android:4.48'
-    compile 'com.squareup.okhttp3:okhttp:3.5.0'
+    compile 'com.squareup.okhttp3:okhttp:3.7.0'
     compile 'org.greenrobot:eventbus:3.0.0'
 
     compile 'io.reactivex.rxjava2:rxjava:2.0.4'
     compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
 
     compile 'commons-io:commons-io:2.4'
 
-    compile 'com.google.guava:guava:20.0'
+    compile 'com.google.guava:guava:22.0-android'
     compile 'com.opencsv:opencsv:3.4'
     compile 'com.github.PhilJay:MPAndroidChart:v2.1.6'
     compile 'com.rarepebble:colorpicker:2.0.0'
     compile 'com.simplify:ink:1.0.0'
     compile 'com.google.dagger:dagger:2.8'
-    compile 'com.google.android.gms:play-services-auth:11.0.4'
+    compile 'com.google.android.gms:play-services-auth:11.6.0'
     provided 'javax.annotation:jsr250-api:1.0'
 
     androidTestCompile 'com.crittercism.dexmaker:dexmaker:1.4'
     androidTestCompile 'com.crittercism.dexmaker:dexmaker-dx:1.4'
     androidTestCompile 'com.crittercism.dexmaker:dexmaker-mockito:1.4'
     androidTestCompile 'org.mockito:mockito-core:1.10.19'
-    androidTestCompile 'com.android.support.test:runner:0.5'
-    androidTestCompile 'com.android.support.test:rules:0.5'
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
-    androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
-    androidTestCompile 'com.android.support:support-annotations:26.0.2'
+    androidTestCompile 'com.android.support:support-annotations:27.0.1'
 
     annotationProcessor 'com.google.dagger:dagger-compiler:2.8'
 }

diff --git a/app/src/main/java/org/liberty/android/fantastischmemo/entity/Card.java b/app/src/main/java/org/liberty/android/fantastischmemo/entity/Card.java
@@ -1,6 +1,6 @@
 package org.liberty.android.fantastischmemo.entity;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.j256.ormlite.field.DataType;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
@@ -151,7 +151,7 @@ public void setLearningData(LearningData learningData) {
 
     @Override
     public String toString() {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
             .add("id", id)
             .add("question", question)
             .add("answer", answer)

diff --git a/app/src/main/java/org/liberty/android/fantastischmemo/service/AnyMemoService.java b/app/src/main/java/org/liberty/android/fantastischmemo/service/AnyMemoService.java
@@ -29,7 +29,7 @@ of the License, or (at your option) any later version.
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 
 import com.google.common.base.Strings;

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
     }
 }