Merge pull request #3 from Guardiola31337/master

Update project to Lollipop

Author: pedrovgs

.travis.yml

@@ -2,10 +2,12 @@ language: android
 
 android:
   components:
-    - build-tools-19.1.0
-    - android-19
+    - build-tools-21.0.2
+    - android-21
     - extra-google-google_play_services
     - extra-google-m2repository
+    - extra-android-m2repository
+    - extra-android-support
 
 script:
   ./gradlew build

app/build.gradle

@@ -3,10 +3,10 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.+'
+    classpath 'com.android.tools.build:gradle:0.13.+'
   }
 }
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply plugin: 'checkstyle'
 apply plugin: "sonar-runner"
 
@@ -15,12 +15,12 @@ repositories {
 }
 
 android {
-  compileSdkVersion 19
-  buildToolsVersion "19.1.0"
+  compileSdkVersion 21
+  buildToolsVersion "21.0.2"
 
   defaultConfig {
     minSdkVersion 8
-    targetSdkVersion 19
+    targetSdkVersion 21
     versionCode 1
     versionName "1.0"
   }
@@ -37,8 +37,8 @@ android {
 
 dependencies {
   compile fileTree(dir: 'libs', include: ['*.jar'])
-  compile 'com.android.support:appcompat-v7:19.1.0'
-  compile 'com.android.support:support-v4:19.1.0'
+  compile 'com.android.support:appcompat-v7:21.+'
+  compile 'com.android.support:support-v4:21.+'
   compile 'javax.inject:javax.inject:1@jar'
   compile 'com.squareup.dagger:dagger-compiler:1.2.+'
   compile 'com.squareup.dagger:dagger:1.2.+'

build.gradle

@@ -6,9 +6,16 @@ buildscript {
     mavenLocal()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.9.+'
+    classpath 'com.android.tools.build:gradle:0.13.+'
   }
 }
 
-
-
+allprojects {
+  repositories {
+    // Work around https://code.google.com/p/android/issues/detail?id=69270.
+    def androidHome = System.getenv("ANDROID_HOME")
+    maven {
+      url "$androidHome/extras/android/m2repository/"
+    }
+  }
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Thu Jun 26 22:43:33 CEST 2014
+#Wed Apr 10 15:27:10 PDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip