Merge pull request #23 from TuMoH/master

fix duplicate attr "srcCompat" in support library >23.2.0
ozodrukh · Mar 30, 2016 · 8bb990d · 8bb990d
2 parents 0069195 + ca5d028
commit 8bb990d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.library'
 apply plugin: 'android-maven'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
     }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:22.1.1'
+    compile 'com.android.support:appcompat-v7:23.2.1'
 }
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -3,8 +3,6 @@
 
     <!-- Background Drawable of View's -->
     <attr name="backgroundCompat" format="reference" />
-    <!-- Drawable used to show image in ImageView. -->
-    <attr name="srcCompat" format="reference" />
     <!-- Extra attribute for RippleDrawable, to add support of scroll containers -->
     <attr name="isInScrollContainer" format="boolean" />
 

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "dreamers.sample"
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
@@ -22,6 +22,6 @@ dependencies {
     compile project(':app')
     compile fileTree(dir: 'libs', include: ['*.jar'])
 
-    compile 'com.android.support:cardview-v7:22.1.1'
-    compile 'com.android.support:recyclerview-v7:22.1.1'
+    compile 'com.android.support:cardview-v7:23.2.1'
+    compile 'com.android.support:recyclerview-v7:23.2.1'
 }