Skip to content

Commit

Permalink
Prepare 4.6.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
noties committed Dec 28, 2020
1 parent eb3a986 commit 05cdf2c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

# 4.6.1-SNAPSHOT
# 4.6.1

#### Changed
* `core` - `CustomTypefaceSpan` new `mergeStyles` functionality and new factory method([#298])<br>Thanks [@c-b-h]
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android.enableJetifier=true
android.enableBuildCache=true
android.buildCacheDir=build/pre-dex-cache

VERSION_NAME=4.6.1-SNAPSHOT
VERSION_NAME=4.6.1

GROUP=io.noties.markwon
POM_DESCRIPTION=Markwon markdown for Android
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static CustomTypefaceSpan create(@NonNull Typeface typeface) {
* @param mergeStyles control if typeface styles must be merged, for example, if
* this span (bold) is contained by other span (italic),
* {@code mergeStyles=true} would result in bold-italic
* @since $SNAPSHOT;
* @since 4.6.1
*/
@NonNull
public static CustomTypefaceSpan create(@NonNull Typeface typeface, boolean mergeStyles) {
Expand All @@ -43,15 +43,15 @@ public static CustomTypefaceSpan create(@NonNull Typeface typeface, boolean merg
private final boolean mergeStyles;

/**
* @deprecated $SNAPSHOT; use {{@link #create(Typeface)}}
* @deprecated 4.6.1 use {{@link #create(Typeface)}}
* or {@link #create(Typeface, boolean)} factory method
*/
@Deprecated
public CustomTypefaceSpan(@NonNull Typeface typeface) {
this(typeface, false);
}

// @since $SNAPSHOT;
// @since 4.6.1
CustomTypefaceSpan(@NonNull Typeface typeface, boolean mergeStyles) {
this.typeface = typeface;
this.mergeStyles = mergeStyles;
Expand Down

0 comments on commit 05cdf2c

Please sign in to comment.