Upgrade gradle deps

kriegfrj · Mar 17, 2015 · 5a0924d · 5a0924d
1 parent cd80727
commit 5a0924d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,10 @@ language: android
 
 android:
   components:
-    - build-tools-21.1.1
+    - build-tools-22.0.0
     - extra-android-m2repository
     - extra-google-m2repository
-    - android-21
+    - android-22
   licenses:
     - android-sdk-license-5be876d5
 

diff --git a/assertj-android-appcompat-v7/build.gradle b/assertj-android-appcompat-v7/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:appcompat-v7:20.0.0'
+  compile 'com.android.support:appcompat-v7:22.0.0'
 }
 
 android {

diff --git a/...compat-v7/src/main/java/org/assertj/android/appcompat/v7/api/widget/SearchViewAssert.java b/...compat-v7/src/main/java/org/assertj/android/appcompat/v7/api/widget/SearchViewAssert.java
@@ -3,12 +3,12 @@
 
 import android.support.v4.widget.CursorAdapter;
 import android.support.v7.widget.SearchView;
-import org.assertj.android.api.widget.AbstractLinearLayoutAssert;
+import org.assertj.android.api.view.AbstractViewGroupAssert;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /** Assertions for {@link SearchView} instances. */
-public class SearchViewAssert extends AbstractLinearLayoutAssert<SearchViewAssert, SearchView> {
+public class SearchViewAssert extends AbstractViewGroupAssert<SearchViewAssert, SearchView> {
   public SearchViewAssert(SearchView actual) {
     super(actual, SearchViewAssert.class);
   }

diff --git a/assertj-android-cardview-v7/build.gradle b/assertj-android-cardview-v7/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:cardview-v7:21.0.2'
+  compile 'com.android.support:cardview-v7:22.0.0'
 }
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion
   buildToolsVersion rootProject.ext.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion 'L'
+    minSdkVersion 21
   }
 
   compileOptions {

diff --git a/assertj-android-gridlayout-v7/build.gradle b/assertj-android-gridlayout-v7/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:gridlayout-v7:21.0.2'
+  compile 'com.android.support:gridlayout-v7:22.0.0'
 }
 
 android {

diff --git a/assertj-android-mediarouter-v7/build.gradle b/assertj-android-mediarouter-v7/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:mediarouter-v7:21.0.2'
+  compile 'com.android.support:mediarouter-v7:22.0.0'
 }
 
 android {

diff --git a/assertj-android-palette-v7/build.gradle b/assertj-android-palette-v7/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:palette-v7:21.0.2'
+  compile 'com.android.support:palette-v7:22.0.0'
 }
 
 android {

diff --git a/assertj-android-recyclerview-v7/build.gradle b/assertj-android-recyclerview-v7/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:recyclerview-v7:21.0.0'
+  compile 'com.android.support:recyclerview-v7:22.0.0'
 }
 
 android {
   compileSdkVersion rootProject.ext.compileSdkVersion
   buildToolsVersion rootProject.ext.buildToolsVersion
 
   defaultConfig {
-    minSdkVersion 'L'
+    minSdkVersion 21
   }
 
   compileOptions {

diff --git a/assertj-android-support-v4/build.gradle b/assertj-android-support-v4/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile project(':assertj-android')
-  compile 'com.android.support:support-v4:21.0.2'
+  compile 'com.android.support:support-v4:22.0.0'
 }
 
 android {

diff --git a/assertj-android/build.gradle b/assertj-android/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
   compile 'org.assertj:assertj-core:1.7.0'
-  compile 'com.android.support:support-annotations:21.0.2'
+  compile 'com.android.support:support-annotations:22.0.0'
 }
 
 android {

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ subprojects {
       mavenCentral()
     }
     dependencies {
-      classpath 'com.android.tools.build:gradle:0.14.4'
+      classpath 'com.android.tools.build:gradle:1.1.3'
     }
   }
 
@@ -18,6 +18,6 @@ subprojects {
 
 ext {
   minSdkVersion = 9
-  compileSdkVersion = 21
-  buildToolsVersion = '21.1.1'
+  compileSdkVersion = 22
+  buildToolsVersion = '22.0.0'
 }