Skip to content

Commit

Permalink
Update master (#26)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
andremion authored Nov 30, 2018
1 parent e726373 commit cc44c3c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
}
}
Expand All @@ -26,8 +26,8 @@ allprojects {
minSdkVersion = 16
targetSdkVersion = 27

versionCode = 5
versionName = "1.1.1"
versionCode = 6
versionName = "1.2.0"

supportLibraryVersion = '27.1.1'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import android.graphics.Typeface;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Parcel;
import android.os.Parcelable;
Expand Down Expand Up @@ -338,7 +339,11 @@ public String toString() {

@Override
public SavedState createFromParcel(Parcel in, ClassLoader loader) {
return new SavedState(in, loader);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return new SavedState(in, loader);
} else {
return new SavedState(in);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

0 comments on commit cc44c3c

Please sign in to comment.