Merge branch 'master' into dagger-android

build.gradle

@@ -5,6 +5,7 @@ buildscript {
         mavenCentral()
         jcenter()
     }
+
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.1'
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,6 +19,7 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven { url "https://maven.google.com" }
 
         flatDir {
             dirs 'libs'

networking/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.Wolox'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
         consumerProguardFiles 'proguard-retrofit.pro', 'proguard-okhttp.pro', 'proguard-gson.pro'
     }
 
@@ -19,17 +19,18 @@ android {
 }
 
 buildscript {
+    // TODO We need to update the wolmo version when wolmo-core-android is merged
+    ext.wolmo_version = 'dagger-android-SNAPSHOT'
+    ext.retrofit_version = '2.3.0'
+    ext.okhttp3_version = '3.9.0'
     ext.dagger_version = '2.11-rc2'
-    ext.retrofit_version = '2.2.0'
-    ext.okhttp_version = '3.7.0'
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
     // Wolmo
-    // TODO We need to update the wolmo version when wolmo-core-android is merged
-    compile 'com.github.Wolox:wolmo-core-android:dagger-android-SNAPSHOT'
+    compile "com.github.Wolox:wolmo-core-android:$wolmo_version"
 
     // Dagger
     provided "com.google.dagger:dagger:$dagger_version"
@@ -38,6 +39,6 @@ dependencies {
     // Third party
     compile "com.squareup.retrofit2:retrofit:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
-    compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttp_version"
-    compile "com.squareup.okhttp3:okhttp:$okhttp_version"
-}
+    compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttp3_version"
+    compile "com.squareup.okhttp3:okhttp:$okhttp3_version"
+}

networking/proguard-okhttp.pro

@@ -1,6 +1,7 @@
 -keepattributes Signature
--keepattributes Annotation
--keep class okhttp3.** { *; }
--keep interface okhttp3.** { *; }
+-keepattributes *Annotation*
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
+-dontwarn com.squareup.okhttp.**
 -dontwarn okhttp3.**
 -dontwarn okio.**