Merge pull request #1 from yelinaung/general-fix

Gradle build fixes
chrisbanes · Jun 18, 2014 · 33560c0 · 33560c0
2 parents 1aef4f4 + 505afe0
commit 33560c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:0.11.0'
         classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.+'
     }
@@ -31,7 +31,7 @@ def versionBuild = 0 // bump for dogfood builds, public betas, etc.
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "19.1.0"
 
     defaultConfig {
         versionCode versionMajor * 10000 + versionMinor * 1000 + versionPatch * 100 + versionBuild
@@ -81,6 +81,8 @@ android {
 dependencies {
     compile project(':lib')
 
+    compile 'com.squareup.okhttp:okhttp:1.6.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:1.6.0'
     compile 'com.squareup.picasso:picasso:2.+'
     compile 'nl.qbusict:cupboard:2.+'
     compile 'com.crashlytics.android:crashlytics:1.+'

diff --git a/app/src/main/java/app/philm/in/util/PhilmBackgroundExecutor.java b/app/src/main/java/app/philm/in/util/PhilmBackgroundExecutor.java
@@ -16,13 +16,13 @@
 
 package app.philm.in.util;
 
-import com.google.common.base.Preconditions;
-
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Process;
 import android.util.Log;
 
+import com.google.common.base.Preconditions;
+
 import java.util.concurrent.ExecutorService;
 
 import app.philm.in.Constants;
@@ -115,7 +115,7 @@ public void run() {
             } catch (RetrofitError re) {
                 retrofitError = re;
                 if (Constants.DEBUG) {
-                    Log.d(getClass().getSimpleName(), "Error while completing network call", re);
+                    Log.d(((Object) this).getClass().getSimpleName(), "Error while completing network call", re);
                 }
             }
 

diff --git a/lib/build.gradle b/lib/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:0.11.0'
     }
 }
 
@@ -16,7 +16,7 @@ repositories {
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "19.1.0"
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
@@ -31,7 +31,8 @@ android {
 }
 
 dependencies {
-    compile 'com.squareup.okhttp:okhttp:1.5.+'
+    compile 'com.squareup.okhttp:okhttp:1.6.0'
+    compile 'com.squareup.okhttp:okhttp-urlconnection:1.6.0'
     compile 'com.squareup.retrofit:retrofit:1.4.+'
     compile 'com.squareup:otto:1.3.+'
     compile 'com.squareup.dagger:dagger:1.+'