From aad277b9f5974598998f03b749edb8f7f0f5dd90 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Mon, 11 May 2015 16:16:01 +0200
Subject: [PATCH] Gradle update

---
 android-app-tests/build.gradle | 14 +++++++-------
 android-app/build.gradle       |  6 +++---
 build.gradle                   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/android-app-tests/build.gradle b/android-app-tests/build.gradle
index d08d0786..8ecf7445 100644
--- a/android-app-tests/build.gradle
+++ b/android-app-tests/build.gradle
@@ -23,19 +23,19 @@
 apply plugin: 'java'
 
 dependencies {
-    def androidModule = project(':android-app')
-    compile androidModule
+    def app = project(':android-app')
+    compile app
 
-    testCompile androidModule.android.applicationVariants.toList().first().javaCompile.classpath
-    testCompile androidModule.android.applicationVariants.toList().first().javaCompile.outputs.files
-    testCompile files(androidModule.plugins.findPlugin("com.android.application").getBootClasspath())
+    testCompile app.android.applicationVariants.toList().first().javaCompile.classpath
+    testCompile app.android.applicationVariants.toList().first().javaCompile.outputs.files
+    testCompile files(app.android.bootClasspath)
 
     testCompile 'junit:junit:4.11'
     testCompile 'org.robolectric:robolectric:2.3'
     testCompile 'org.mockito:mockito-all:1.9.5'
     testCompile 'org.skyscreamer:jsonassert:1.2.3'
-    testCompile 'com.android.support:support-v4:21.0.3'
-    testCompile 'com.android.support:appcompat-v7:21.0.3'
+    testCompile 'com.android.support:support-v4:22.1.1'
+    testCompile 'com.android.support:appcompat-v7:22.1.1'
 }
 
 tasks.withType(Test) {
diff --git a/android-app/build.gradle b/android-app/build.gradle
index acbb5c1d..1761c158 100644
--- a/android-app/build.gradle
+++ b/android-app/build.gradle
@@ -56,8 +56,8 @@ dependencies {
     compile 'org.solovyev:common-core:1.0.7'
     compile 'org.solovyev:common-text:1.0.7'
     compile 'org.solovyev:common-security:1.0.7'
-    compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:support-v4:22.1.1'
+    compile 'com.android.support:appcompat-v7:22.1.1'
     compile('ch.acra:acra:4.5.0') {
         exclude group: 'org.json'
     }
@@ -79,7 +79,7 @@ dependencies {
 
 task androidJavadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.plugin.getBootClasspath().join(File.pathSeparator))
+    classpath += project.files(android.bootClasspath.join(File.pathSeparator))
     configurations.compile.each { File file -> classpath += project.files(file.path) }
 }
 
diff --git a/build.gradle b/build.gradle
index 09f5f525..3d965603 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,11 +7,11 @@ public String version_name() {
 }
 
 public int android_sdk_version() {
-  return 21
+  return 22
 }
 
 public String android_build_tools_version() {
-  return '21.1.2'
+  return '22.0.1'
 }
 
 public String android_min_sdk_version() {
@@ -24,7 +24,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.0.0'
+    classpath 'com.android.tools.build:gradle:1.2.2'
   }
 }