Skip to content

Commit 02b434d

Browse files
author
Dominique Tremblay
committed
Support library Update to 23.0.1
Fix crash from PR: Update RippleView.java for crashing on api 23+ traex#111
1 parent df5f9e4 commit 02b434d

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:2.2.3'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.jar

100644100755
File mode changed.

gradle/wrapper/gradle-wrapper.properties

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

library/build.gradle

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

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
4+
compileSdkVersion 25
5+
buildToolsVersion "25.0.1"
66

77
defaultConfig {
88
minSdkVersion 9
9-
targetSdkVersion 23
9+
targetSdkVersion 25
1010
versionCode 9
11-
versionName "1.3"
11+
versionName "1.4"
1212
}
1313
lintOptions {
1414
abortOnError false
@@ -23,7 +23,7 @@ android {
2323

2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
compile 'com.android.support:support-annotations:23.1.1'
26+
compile 'com.android.support:support-annotations:25.0.1'
2727
}
2828

2929
if (hasProperty("VERSION_NAME"))

library/src/main/java/com/andexert/library/RippleView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void draw(Canvas canvas) {
167167
timerEmpty = 0;
168168
// There is problem on Android M where canvas.restore() seems to be called automatically
169169
// For now, don't call canvas.restore() manually on Android M (API 23)
170-
if(Build.VERSION.SDK_INT != 23) {
170+
if(Build.VERSION.SDK_INT < 23) {
171171
canvas.restore();
172172
}
173173
invalidate();

sample/build.gradle

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

33
android {
4-
compileSdkVersion 23
5-
buildToolsVersion '23.0.1'
4+
compileSdkVersion 25
5+
buildToolsVersion '25.0.1'
66

77
defaultConfig {
88
minSdkVersion 14
9-
targetSdkVersion 23
9+
targetSdkVersion 25
1010
versionCode 1
11-
versionName '1.0'
11+
versionName '1.1'
1212
}
1313
buildTypes {
1414
release {
@@ -24,9 +24,9 @@ android {
2424
dependencies {
2525
compile fileTree(dir: 'libs', include: ['*.jar'])
2626
compile project(':library')
27-
compile 'com.android.support:appcompat-v7:23.0.1'
28-
compile 'com.android.support:palette-v7:23.0.1'
29-
compile 'com.android.support:recyclerview-v7:23.0.1'
30-
compile 'com.android.support:support-v4:23.0.1'
27+
compile 'com.android.support:appcompat-v7:25.0.1'
28+
compile 'com.android.support:palette-v7:25.0.1'
29+
compile 'com.android.support:recyclerview-v7:25.0.1'
30+
compile 'com.android.support:support-v4:25.0.1'
3131
compile 'com.squareup.picasso:picasso:2.5.1'
3232
}

0 commit comments

Comments
 (0)