the-btfash-foundation/Markwon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prepare 4.6.1 release

Browse Source
This commit is contained in:
Dimitry Ivanov 2020-12-28 16:13:23 +03:00
parent eb3a986c48
commit 05cdf2c400
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,6 @@
# Changelog # Changelog
# 4.6.1-SNAPSHOT # 4.6.1
#### Changed #### Changed
* `core` - `CustomTypefaceSpan` new `mergeStyles` functionality and new factory method([#298])<br>Thanks [@c-b-h] * `core` - `CustomTypefaceSpan` new `mergeStyles` functionality and new factory method([#298])<br>Thanks [@c-b-h]

2
gradle.properties
View File

@ -8,7 +8,7 @@ android.enableJetifier=true
android.enableBuildCache=true android.enableBuildCache=true
android.buildCacheDir=build/pre-dex-cache android.buildCacheDir=build/pre-dex-cache
VERSION_NAME=4.6.1-SNAPSHOT VERSION_NAME=4.6.1
GROUP=io.noties.markwon GROUP=io.noties.markwon
POM_DESCRIPTION=Markwon markdown for Android POM_DESCRIPTION=Markwon markdown for Android

6
markwon-core/src/main/java/io/noties/markwon/core/spans/CustomTypefaceSpan.java
View File

@ -31,7 +31,7 @@ public class CustomTypefaceSpan extends MetricAffectingSpan {
* @param mergeStyles control if typeface styles must be merged, for example, if * @param mergeStyles control if typeface styles must be merged, for example, if
* this span (bold) is contained by other span (italic), * this span (bold) is contained by other span (italic),
* {@code mergeStyles=true} would result in bold-italic * {@code mergeStyles=true} would result in bold-italic
* @since $SNAPSHOT; * @since 4.6.1
*/ */
@NonNull @NonNull
public static CustomTypefaceSpan create(@NonNull Typeface typeface, boolean mergeStyles) { public static CustomTypefaceSpan create(@NonNull Typeface typeface, boolean mergeStyles) {
@ -43,7 +43,7 @@ public class CustomTypefaceSpan extends MetricAffectingSpan {
private final boolean mergeStyles; 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 * or {@link #create(Typeface, boolean)} factory method
*/ */
@Deprecated @Deprecated
@ -51,7 +51,7 @@ public class CustomTypefaceSpan extends MetricAffectingSpan {
this(typeface, false); this(typeface, false);
} }
// @since $SNAPSHOT; // @since 4.6.1
CustomTypefaceSpan(@NonNull Typeface typeface, boolean mergeStyles) { CustomTypefaceSpan(@NonNull Typeface typeface, boolean mergeStyles) {
this.typeface = typeface; this.typeface = typeface;
this.mergeStyles = mergeStyles; this.mergeStyles = mergeStyles;