From 0a7356ecf871c13470b5ff07919ec7fbb0b62d15 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Thu, 29 Aug 2019 13:54:53 +0300 Subject: [PATCH] Prepare 4.1.1 release --- CHANGELOG.md | 2 +- gradle.properties | 2 +- .../src/main/java/io/noties/markwon/MarkwonBuilderImpl.java | 2 +- .../src/main/java/io/noties/markwon/MarkwonImpl.java | 6 +++--- .../main/java/io/noties/markwon/MarkwonVisitorFactory.java | 2 +- .../src/main/java/io/noties/markwon/MarkwonVisitorImpl.java | 2 +- .../src/main/java/io/noties/markwon/core/CorePlugin.java | 2 +- .../src/main/java/io/noties/markwon/core/CoreProps.java | 2 +- .../src/test/java/io/noties/markwon/MarkwonImplTest.java | 4 ++-- .../main/java/io/noties/markwon/ext/tables/TablePlugin.java | 2 +- .../main/java/io/noties/markwon/image/gif/GifSupport.java | 4 ++-- .../main/java/io/noties/markwon/image/svg/SvgSupport.java | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2232b3fc..e8992853 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -# 4.1.1-SNAPSHOT +# 4.1.1 * `markwon-ext-tables`: fix padding between subsequent table blocks ([#159]) * `markwon-images`: print a single warning instead full stacktrace in case when SVG or GIF are not present in the classpath ([#160]) diff --git a/gradle.properties b/gradle.properties index aea3b99f..bc71ace9 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.1.1-SNAPSHOT +VERSION_NAME=4.1.1 GROUP=io.noties.markwon POM_DESCRIPTION=Markwon markdown for Android diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java index 1fe21edb..a14002f1 100644 --- a/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonBuilderImpl.java @@ -104,7 +104,7 @@ class MarkwonBuilderImpl implements Markwon.Builder { final RenderProps renderProps = new RenderPropsImpl(); - // @since 4.1.1-SNAPSHOT + // @since 4.1.1 final MarkwonVisitorFactory visitorFactory = MarkwonVisitorFactory.create( visitorBuilder, configuration, diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java index 9d7ffee0..3f0ee18c 100644 --- a/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonImpl.java @@ -20,7 +20,7 @@ class MarkwonImpl extends Markwon { private final TextView.BufferType bufferType; private final Parser parser; - private final MarkwonVisitorFactory visitorFactory; // @since 4.1.1-SNAPSHOT + private final MarkwonVisitorFactory visitorFactory; // @since 4.1.1 private final List plugins; // @since 4.1.0 @@ -60,7 +60,7 @@ class MarkwonImpl extends Markwon { plugin.beforeRender(node); } - // @since 4.1.1-SNAPSHOT obtain visitor via factory + // @since 4.1.1 obtain visitor via factory final MarkwonVisitor visitor = visitorFactory.create(); node.accept(visitor); @@ -73,7 +73,7 @@ class MarkwonImpl extends Markwon { final Spanned spanned = visitor.builder().spannableStringBuilder(); // clear render props and builder after rendering - // @since 4.1.1-SNAPSHOT as we no longer reuse visitor - there is no need to clean it + // @since 4.1.1 as we no longer reuse visitor - there is no need to clean it // we might still do it if we introduce a thread-local storage though // visitor.clear(); diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorFactory.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorFactory.java index 429e5080..98b0187e 100644 --- a/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorFactory.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorFactory.java @@ -3,7 +3,7 @@ package io.noties.markwon; import androidx.annotation.NonNull; /** - * @since 4.1.1-SNAPSHOT + * @since 4.1.1 */ abstract class MarkwonVisitorFactory { diff --git a/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java index ea4d6118..c6361a00 100644 --- a/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java +++ b/markwon-core/src/main/java/io/noties/markwon/MarkwonVisitorImpl.java @@ -270,7 +270,7 @@ class MarkwonVisitorImpl implements MarkwonVisitor { @Override public Builder on(@NonNull Class node, @Nullable NodeVisitor nodeVisitor) { - // @since 4.1.1-SNAPSHOT we might actually introduce a local flag to check if it's been built + // @since 4.1.1 we might actually introduce a local flag to check if it's been built // and throw an exception here if some modification is requested // NB, as we might be built from different threads this flag must be synchronized diff --git a/markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java b/markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java index 783dadc0..dffa215d 100644 --- a/markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/CorePlugin.java @@ -328,7 +328,7 @@ public class CorePlugin extends AbstractMarkwonPlugin { visitor.builder().append('\u00a0'); - // @since 4.1.1-SNAPSHOT + // @since 4.1.1 CoreProps.CODE_BLOCK_INFO.set(visitor.renderProps(), info); visitor.setSpansForNodeOptional(node, length); diff --git a/markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java b/markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java index 5b2140ed..23d8d374 100644 --- a/markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java +++ b/markwon-core/src/main/java/io/noties/markwon/core/CoreProps.java @@ -20,7 +20,7 @@ public abstract class CoreProps { public static final Prop PARAGRAPH_IS_IN_TIGHT_LIST = Prop.of("paragraph-is-in-tight-list"); /** - * @since 4.1.1-SNAPSHOT + * @since 4.1.1 */ public static final Prop CODE_BLOCK_INFO = Prop.of("code-block-info"); diff --git a/markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java b/markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java index c557cdb7..2eb4f3f8 100644 --- a/markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java +++ b/markwon-core/src/test/java/io/noties/markwon/MarkwonImplTest.java @@ -149,7 +149,7 @@ public class MarkwonImplTest { impl.render(mock(Node.class)); - // obsolete starting with 4.1.1-SNAPSHOT + // obsolete starting with 4.1.1 // verify(visitor, times(1)).clear(); verify(visitor, never()).clear(); } @@ -201,7 +201,7 @@ public class MarkwonImplTest { assertTrue(flag.get()); - // obsolete starting with 4.1.1-SNAPSHOT + // obsolete starting with 4.1.1 // verify(renderProps, times(1)).clearAll(); verify(renderProps, never()).clearAll(); } diff --git a/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java index e1950d59..086afd75 100644 --- a/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java +++ b/markwon-ext-tables/src/main/java/io/noties/markwon/ext/tables/TablePlugin.java @@ -116,7 +116,7 @@ public class TablePlugin extends AbstractMarkwonPlugin { void configure(@NonNull MarkwonVisitor.Builder builder) { builder - // @since 4.1.1-SNAPSHOT we use TableBlock instead of TableBody to add new lines + // @since 4.1.1 we use TableBlock instead of TableBody to add new lines .on(TableBlock.class, new MarkwonVisitor.NodeVisitor() { @Override public void visit(@NonNull MarkwonVisitor visitor, @NonNull TableBlock tableBlock) { diff --git a/markwon-image/src/main/java/io/noties/markwon/image/gif/GifSupport.java b/markwon-image/src/main/java/io/noties/markwon/image/gif/GifSupport.java index b8d91bb5..70a143fc 100644 --- a/markwon-image/src/main/java/io/noties/markwon/image/gif/GifSupport.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/gif/GifSupport.java @@ -17,7 +17,7 @@ public abstract class GifSupport { pl.droidsonroids.gif.GifDrawable.class.getName(); result = true; } catch (Throwable t) { - // @since 4.1.1-SNAPSHOT instead of printing full stacktrace of the exception, + // @since 4.1.1 instead of printing full stacktrace of the exception, // just print a warning to the console Log.w("MarkwonImagesPlugin", missingMessage()); result = false; @@ -30,7 +30,7 @@ public abstract class GifSupport { } /** - * @since 4.1.1-SNAPSHOT + * @since 4.1.1 */ @NonNull static String missingMessage() { diff --git a/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgSupport.java b/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgSupport.java index 775cde3d..4afe2506 100644 --- a/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgSupport.java +++ b/markwon-image/src/main/java/io/noties/markwon/image/svg/SvgSupport.java @@ -17,7 +17,7 @@ public abstract class SvgSupport { com.caverock.androidsvg.SVG.class.getName(); result = true; } catch (Throwable t) { - // @since 4.1.1-SNAPSHOT instead of printing full stacktrace of the exception, + // @since 4.1.1 instead of printing full stacktrace of the exception, // just print a warning to the console Log.w("MarkwonImagesPlugin", missingMessage()); result = false; @@ -30,7 +30,7 @@ public abstract class SvgSupport { } /** - * @since 4.1.1-SNAPSHOT + * @since 4.1.1 */ @NonNull static String missingMessage() {