Skip to content

Commit cc44c3c

Browse files
authored
Update master (#26)
* Upgrade build gradle tools to 3.1.4 * Add badge position feature. (#18) * Feature/add text color attribute (#23) * Add badge text color attribute * Upgrade gradle build tools version to 3.2.1 * Fix usage of SavedState for API < 24 * Bump to version 1.2.0
1 parent e726373 commit cc44c3c

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.1.4'
9+
classpath 'com.android.tools.build:gradle:3.2.1'
1010
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1111
}
1212
}
@@ -26,8 +26,8 @@ allprojects {
2626
minSdkVersion = 16
2727
targetSdkVersion = 27
2828

29-
versionCode = 5
30-
versionName = "1.1.1"
29+
versionCode = 6
30+
versionName = "1.2.0"
3131

3232
supportLibraryVersion = '27.1.1'
3333

counterfab/src/main/java/com/andremion/counterfab/CounterFab.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import android.graphics.Typeface;
2929
import android.graphics.drawable.ColorDrawable;
3030
import android.graphics.drawable.Drawable;
31+
import android.os.Build;
3132
import android.os.Build.VERSION_CODES;
3233
import android.os.Parcel;
3334
import android.os.Parcelable;
@@ -338,7 +339,11 @@ public String toString() {
338339

339340
@Override
340341
public SavedState createFromParcel(Parcel in, ClassLoader loader) {
341-
return new SavedState(in, loader);
342+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
343+
return new SavedState(in, loader);
344+
} else {
345+
return new SavedState(in);
346+
}
342347
}
343348

344349
@Override

gradle/wrapper/gradle-wrapper.properties

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-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 commit comments

Comments
 (0)