From 7002dbfb8d2a6b32bf8ab6aaa2edfef96899cace Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Fri, 18 Sep 2020 23:55:54 +0300 Subject: [PATCH] Prepare 4.6.0 release --- CHANGELOG.md | 2 +- gradle.properties | 2 +- .../main/java/io/noties/markwon/utils/DumpNodes.java | 2 +- .../main/java/io/noties/markwon/utils/ParserUtils.java | 2 +- .../markwon/ext/tables/TableAwareMovementMethod.java | 2 +- .../io/noties/markwon/ext/tables/TableRowSpan.java | 10 +++++----- .../markwon/ext/tasklist/TaskListPostProcessor.java | 2 +- .../markwon/inlineparser/MarkwonInlineParser.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47d8defa..c8fa907b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -# SNAPSHOT +# 4.6.0 #### Added * `ext-tables` - `TableAwareMovementMethod` a special movement method to handle clicks inside tables ([#289]) diff --git a/gradle.properties b/gradle.properties index 94e63a4d..f0e810f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ android.enableJetifier=true android.enableBuildCache=true android.buildCacheDir=build/pre-dex-cache -VERSION_NAME=4.5.2-SNAPSHOT +VERSION_NAME=4.6.0 GROUP=io.noties.markwon POM_DESCRIPTION=Markwon markdown for Android diff --git a/markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java b/markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java index 5782354b..e06194b8 100644 --- a/markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/DumpNodes.java @@ -54,7 +54,7 @@ public abstract class DumpNodes { // node info builder.append(processor.process(argument)); - // @since $SNAPSHOT; check for first child instead of casting to Block + // @since 4.6.0 check for first child instead of casting to Block // (regular nodes can contain other nodes, for example Text) if (argument.getFirstChild() != null) { builder.append(" [\n"); diff --git a/markwon-core/src/main/java/io/noties/markwon/utils/ParserUtils.java b/markwon-core/src/main/java/io/noties/markwon/utils/ParserUtils.java index 80ad4596..d697d26f 100644 --- a/markwon-core/src/main/java/io/noties/markwon/utils/ParserUtils.java +++ b/markwon-core/src/main/java/io/noties/markwon/utils/ParserUtils.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import org.commonmark.node.Node; /** - * @since $SNAPSHOT; + * @since 4.6.0 */ public abstract class ParserUtils { diff --git a/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableAwareMovementMethod.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableAwareMovementMethod.java index a178d719..7e8c690f 100644 --- a/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableAwareMovementMethod.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableAwareMovementMethod.java @@ -13,7 +13,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; /** - * @since $SNAPSHOT; + * @since 4.6.0 */ public class TableAwareMovementMethod implements MovementMethod { diff --git a/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java index 52c07cbf..44b4989b 100644 --- a/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TableRowSpan.java @@ -173,7 +173,7 @@ public class TableRowSpan extends ReplacementSpan { final int w = cellWidth(size); - // @since $SNAPSHOT; roundingDiff to offset last vertical border + // @since 4.6.0 roundingDiff to offset last vertical border final int roundingDiff = w - (width / size); // @since 1.1.1 @@ -268,7 +268,7 @@ public class TableRowSpan extends ReplacementSpan { canvas.drawRect(rect, paint); if (i == (size - 1)) { - // @since $SNAPSHOT; subtract rounding offset for the last vertical divider + // @since 4.6.0 subtract rounding offset for the last vertical divider rect.set( w - borderWidth - roundingDiff, borderTop, @@ -387,7 +387,7 @@ public class TableRowSpan extends ReplacementSpan { /** * Obtain Layout given horizontal offset. Primary usage target - MovementMethod * - * @since $SNAPSHOT; + * @since 4.6.0 */ @Nullable public Layout findLayoutForHorizontalOffset(int x) { @@ -401,13 +401,13 @@ public class TableRowSpan extends ReplacementSpan { } /** - * @since $SNAPSHOT; + * @since 4.6.0 */ public int cellWidth() { return cellWidth(layouts.size()); } - // @since $SNAPSHOT; + // @since 4.6.0 protected int cellWidth(int size) { return (int) (1F * width / size + 0.5F); } diff --git a/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPostProcessor.java b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPostProcessor.java index 34651533..7ea97244 100644 --- a/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPostProcessor.java +++ b/markwon-ext-tasklist/src/main/java/io/noties/markwon/ext/tasklist/TaskListPostProcessor.java @@ -14,7 +14,7 @@ import java.util.regex.Pattern; import io.noties.markwon.utils.ParserUtils; -// @since $SNAPSHOT; +// @since 4.6.0 // Hint taken from commonmark-ext-task-list-items artifact class TaskListPostProcessor implements PostProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/MarkwonInlineParser.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/MarkwonInlineParser.java index d241a1fb..14c24597 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/MarkwonInlineParser.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/MarkwonInlineParser.java @@ -266,7 +266,7 @@ public class MarkwonInlineParser implements InlineParser, MarkwonInlineParserCon final List inlines = this.inlineProcessors.get(c); if (inlines != null) { - // @since $SNAPSHOT; index must not be advanced if inline-processor returned null + // @since 4.6.0 index must not be advanced if inline-processor returned null // so, further processors can be called at the _same_ position (and thus char) final int startIndex = index;