From 39177057afab6905e6a704884492e611c2134e1b Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Fri, 15 Nov 2019 17:32:49 +0300 Subject: [PATCH] Prepare 4.2.0 release --- CHANGELOG.md | 2 +- gradle.properties | 2 +- .../main/java/io/noties/markwon/core/spans/HeadingSpan.java | 2 +- .../src/main/java/io/noties/markwon/core/spans/LinkSpan.java | 2 +- .../java/io/noties/markwon/editor/AbstractEditHandler.java | 2 +- .../src/main/java/io/noties/markwon/editor/EditHandler.java | 2 +- .../src/main/java/io/noties/markwon/editor/MarkwonEditor.java | 2 +- .../io/noties/markwon/editor/MarkwonEditorTextWatcher.java | 2 +- .../java/io/noties/markwon/editor/MarkwonEditorUtils.java | 2 +- .../main/java/io/noties/markwon/editor/PersistedSpans.java | 2 +- .../io/noties/markwon/editor/handler/EmphasisEditHandler.java | 2 +- .../markwon/editor/handler/StrongEmphasisEditHandler.java | 2 +- .../java/io/noties/markwon/image/coil/CoilImagesPlugin.java | 2 +- .../io/noties/markwon/image/svg/SvgPictureMediaDecoder.java | 2 +- .../noties/markwon/inlineparser/AutolinkInlineProcessor.java | 2 +- .../noties/markwon/inlineparser/BackslashInlineProcessor.java | 2 +- .../noties/markwon/inlineparser/BackticksInlineProcessor.java | 2 +- .../io/noties/markwon/inlineparser/BangInlineProcessor.java | 2 +- .../markwon/inlineparser/CloseBracketInlineProcessor.java | 2 +- .../io/noties/markwon/inlineparser/EntityInlineProcessor.java | 2 +- .../io/noties/markwon/inlineparser/HtmlInlineProcessor.java | 2 +- .../io/noties/markwon/inlineparser/InlineParserUtils.java | 2 +- .../java/io/noties/markwon/inlineparser/InlineProcessor.java | 2 +- .../io/noties/markwon/inlineparser/MarkwonInlineParser.java | 2 +- .../noties/markwon/inlineparser/NewLineInlineProcessor.java | 2 +- .../markwon/inlineparser/OpenBracketInlineProcessor.java | 2 +- .../main/java/io/noties/markwon/linkify/LinkifyPlugin.java | 4 ++-- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36caf420..1910f583 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -# 4.2.0-SNAPSHOT +# 4.2.0 * `MarkwonEditor` to highlight markdown input whilst editing (new module: `markwon-editor`) * `CoilImagesPlugin` image loader based on [Coil] library (new module: `markwon-image-coil`) ([#166], [#174])
Thanks to [@tylerbwong] diff --git a/gradle.properties b/gradle.properties index c87f3936..b1d69d1b 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.2.0-SNAPSHOT +VERSION_NAME=4.2.0 GROUP=io.noties.markwon POM_DESCRIPTION=Markwon markdown for Android diff --git a/markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java index 0c4bf49b..28cf3f35 100644 --- a/markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/HeadingSpan.java @@ -79,7 +79,7 @@ public class HeadingSpan extends MetricAffectingSpan implements LeadingMarginSpa } /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public int getLevel() { return level; diff --git a/markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java b/markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java index 481e3c0a..961afe26 100644 --- a/markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/spans/LinkSpan.java @@ -36,7 +36,7 @@ public class LinkSpan extends URLSpan { } /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ @NonNull public String getLink() { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/AbstractEditHandler.java b/markwon-editor/src/main/java/io/noties/markwon/editor/AbstractEditHandler.java index 00db0e24..25a556c0 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/AbstractEditHandler.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/AbstractEditHandler.java @@ -8,7 +8,7 @@ import io.noties.markwon.Markwon; * @see EditHandler * @see io.noties.markwon.editor.handler.EmphasisEditHandler * @see io.noties.markwon.editor.handler.StrongEmphasisEditHandler - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class AbstractEditHandler implements EditHandler { @Override diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/EditHandler.java b/markwon-editor/src/main/java/io/noties/markwon/editor/EditHandler.java index d9a1c756..999cb2c0 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/EditHandler.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/EditHandler.java @@ -11,7 +11,7 @@ import io.noties.markwon.editor.handler.StrongEmphasisEditHandler; /** * @see EmphasisEditHandler * @see StrongEmphasisEditHandler - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public interface EditHandler { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditor.java b/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditor.java index bea9f684..94770ae4 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditor.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditor.java @@ -14,7 +14,7 @@ import io.noties.markwon.Markwon; * @see #create(Markwon) * @see #process(Editable) * @see #preRender(Editable, PreRenderResultListener) - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class MarkwonEditor { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorTextWatcher.java b/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorTextWatcher.java index cfa3cbad..f643d580 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorTextWatcher.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorTextWatcher.java @@ -20,7 +20,7 @@ import java.util.concurrent.Future; * @see MarkwonEditor#preRender(Editable, MarkwonEditor.PreRenderResultListener) * @see #withProcess(MarkwonEditor) * @see #withPreRender(MarkwonEditor, ExecutorService, EditText) - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class MarkwonEditorTextWatcher implements TextWatcher { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorUtils.java b/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorUtils.java index 6471c624..3914f441 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorUtils.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/MarkwonEditorUtils.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Map; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class MarkwonEditorUtils { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/PersistedSpans.java b/markwon-editor/src/main/java/io/noties/markwon/editor/PersistedSpans.java index 1d4bf88d..0cb66bd6 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/PersistedSpans.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/PersistedSpans.java @@ -20,7 +20,7 @@ import static io.noties.markwon.editor.MarkwonEditorUtils.extractSpans; * * @see EditHandler#handleMarkdownSpan(PersistedSpans, Editable, String, Object, int, int) * @see EditHandler#configurePersistedSpans(Builder) - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class PersistedSpans { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/handler/EmphasisEditHandler.java b/markwon-editor/src/main/java/io/noties/markwon/editor/handler/EmphasisEditHandler.java index ca7044b2..c9902f3e 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/handler/EmphasisEditHandler.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/handler/EmphasisEditHandler.java @@ -11,7 +11,7 @@ import io.noties.markwon.editor.MarkwonEditorUtils; import io.noties.markwon.editor.PersistedSpans; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class EmphasisEditHandler extends AbstractEditHandler { diff --git a/markwon-editor/src/main/java/io/noties/markwon/editor/handler/StrongEmphasisEditHandler.java b/markwon-editor/src/main/java/io/noties/markwon/editor/handler/StrongEmphasisEditHandler.java index 90956c50..ab53a8d2 100644 --- a/markwon-editor/src/main/java/io/noties/markwon/editor/handler/StrongEmphasisEditHandler.java +++ b/markwon-editor/src/main/java/io/noties/markwon/editor/handler/StrongEmphasisEditHandler.java @@ -11,7 +11,7 @@ import io.noties.markwon.editor.MarkwonEditorUtils; import io.noties.markwon.editor.PersistedSpans; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class StrongEmphasisEditHandler extends AbstractEditHandler { diff --git a/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java b/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java index 47a43ad3..5d15dcfd 100644 --- a/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java +++ b/markwon-image-coil/src/main/java/io/noties/markwon/image/coil/CoilImagesPlugin.java @@ -30,7 +30,7 @@ import io.noties.markwon.image.ImageSpanFactory; /** * @author Tyler Wong - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class CoilImagesPlugin extends AbstractMarkwonPlugin { diff --git a/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgPictureMediaDecoder.java b/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgPictureMediaDecoder.java index bc35a76f..0035720f 100644 --- a/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgPictureMediaDecoder.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgPictureMediaDecoder.java @@ -17,7 +17,7 @@ import java.util.Collections; import io.noties.markwon.image.MediaDecoder; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class SvgPictureMediaDecoder extends MediaDecoder { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/AutolinkInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/AutolinkInlineProcessor.java index ed41a26d..cbba2763 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/AutolinkInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/AutolinkInlineProcessor.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Parses autolinks, for example {@code } * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class AutolinkInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackslashInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackslashInlineProcessor.java index 3dfc3560..c4afc3e0 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackslashInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackslashInlineProcessor.java @@ -6,7 +6,7 @@ import org.commonmark.node.Node; import java.util.regex.Pattern; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class BackslashInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackticksInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackticksInlineProcessor.java index ed9389d8..ef5be678 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackticksInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BackticksInlineProcessor.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Parses inline code surrounded with {@code `} chars {@code `code`} * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class BackticksInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BangInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BangInlineProcessor.java index adfcc9cf..75d6fb03 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BangInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/BangInlineProcessor.java @@ -7,7 +7,7 @@ import org.commonmark.node.Text; /** * Parses markdown images {@code ![alt](#href)} * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class BangInlineProcessor extends InlineProcessor { @Override diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/CloseBracketInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/CloseBracketInlineProcessor.java index 0d23dadf..b9d2f867 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/CloseBracketInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/CloseBracketInlineProcessor.java @@ -15,7 +15,7 @@ import static io.noties.markwon.inlineparser.InlineParserUtils.mergeChildTextNod * Parses markdown link or image, relies on {@link OpenBracketInlineProcessor} * to handle start of these elements * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class CloseBracketInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/EntityInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/EntityInlineProcessor.java index 0a1467f8..353f9902 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/EntityInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/EntityInlineProcessor.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Parses HTML entities {@code &} * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class EntityInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/HtmlInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/HtmlInlineProcessor.java index 7f9e032c..d3bd579d 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/HtmlInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/HtmlInlineProcessor.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; /** * Parses inline HTML tags * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class HtmlInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineParserUtils.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineParserUtils.java index 544576ee..1ffb9131 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineParserUtils.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineParserUtils.java @@ -4,7 +4,7 @@ import org.commonmark.node.Node; import org.commonmark.node.Text; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class InlineParserUtils { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineProcessor.java index b89ae1d0..b7917578 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/InlineProcessor.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; * @see OpenBracketInlineProcessor * @see MarkwonInlineParser.FactoryBuilder#addInlineProcessor(InlineProcessor) * @see MarkwonInlineParser.FactoryBuilder#excludeInlineProcessor(Class) - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public abstract class InlineProcessor { 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 45ebf141..2b2f26b3 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 @@ -34,7 +34,7 @@ import static io.noties.markwon.inlineparser.InlineParserUtils.mergeTextNodesBet * @see #factoryBuilder() * @see #factoryBuilderNoDefaults() * @see FactoryBuilder - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class MarkwonInlineParser implements InlineParser, MarkwonInlineParserContext { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/NewLineInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/NewLineInlineProcessor.java index 4ec874fc..ef978b72 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/NewLineInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/NewLineInlineProcessor.java @@ -9,7 +9,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class NewLineInlineProcessor extends InlineProcessor { diff --git a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/OpenBracketInlineProcessor.java b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/OpenBracketInlineProcessor.java index 9c065900..070d9ccc 100644 --- a/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/OpenBracketInlineProcessor.java +++ b/markwon-inline-parser/src/main/java/io/noties/markwon/inlineparser/OpenBracketInlineProcessor.java @@ -7,7 +7,7 @@ import org.commonmark.node.Text; /** * Parses markdown links {@code [link](#href)} * - * @since 4.2.0-SNAPSHOT + * @since 4.2.0 */ public class OpenBracketInlineProcessor extends InlineProcessor { @Override diff --git a/markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java b/markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java index 2bbef877..cb5c889e 100644 --- a/markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java +++ b/markwon-linkify/src/main/java/io/noties/markwon/linkify/LinkifyPlugin.java @@ -69,14 +69,14 @@ public class LinkifyPlugin extends AbstractMarkwonPlugin { @Override public void onTextAdded(@NonNull MarkwonVisitor visitor, @NonNull String text, int start) { - // @since 4.2.0-SNAPSHOT obtain span factory for links + // @since 4.2.0 obtain span factory for links // we will be using the link that is used by markdown (instead of directly applying URLSpan) final SpanFactory spanFactory = visitor.configuration().spansFactory().get(Link.class); if (spanFactory == null) { return; } - // @since 4.2.0-SNAPSHOT we no longer re-use builder (thread safety achieved for + // @since 4.2.0 we no longer re-use builder (thread safety achieved for // render calls from different threads and ... better performance) final SpannableStringBuilder builder = new SpannableStringBuilder(text);