Skip to content

Commit 8bb990d

Browse files
committed
Merge pull request #23 from TuMoH/master
fix duplicate attr "srcCompat" in support library >23.2.0
2 parents 0069195 + ca5d028 commit 8bb990d

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ apply plugin: 'com.android.library'
22
apply plugin: 'android-maven'
33

44
android {
5-
compileSdkVersion 22
6-
buildToolsVersion "21.1.2"
5+
compileSdkVersion 23
6+
buildToolsVersion "23.0.2"
77

88
defaultConfig {
99
minSdkVersion 14
10-
targetSdkVersion 22
10+
targetSdkVersion 23
1111
}
1212
}
1313

1414
dependencies {
15-
compile 'com.android.support:appcompat-v7:22.1.1'
15+
compile 'com.android.support:appcompat-v7:23.2.1'
1616
}

app/src/main/res/values/attrs.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
<!-- Background Drawable of View's -->
55
<attr name="backgroundCompat" format="reference" />
6-
<!-- Drawable used to show image in ImageView. -->
7-
<attr name="srcCompat" format="reference" />
86
<!-- Extra attribute for RippleDrawable, to add support of scroll containers -->
97
<attr name="isInScrollContainer" format="boolean" />
108

sample/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "21.1.2"
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
applicationId "dreamers.sample"
99
minSdkVersion 14
10-
targetSdkVersion 22
10+
targetSdkVersion 23
1111
versionCode 1
1212
versionName "1.0"
1313
}
@@ -22,6 +22,6 @@ dependencies {
2222
compile project(':app')
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
2424

25-
compile 'com.android.support:cardview-v7:22.1.1'
26-
compile 'com.android.support:recyclerview-v7:22.1.1'
25+
compile 'com.android.support:cardview-v7:23.2.1'
26+
compile 'com.android.support:recyclerview-v7:23.2.1'
2727
}

0 commit comments

Comments
 (0)