diff --git a/CHANGELOG.textile b/CHANGELOG.textile index d46b1c7b..d5f6a2ed 100755 --- a/CHANGELOG.textile +++ b/CHANGELOG.textile @@ -8,6 +8,8 @@ h3(#NEXT_VERSION). "Version @@NEXT-VERSION@@":#NEXT_VERSION h4. New and noteworthy +* Update the SlideshowFX-textile plugin ("#32":https://github.com/twasyl/SlideshowFX/issues/32) + h4. Bug fixes h3(#1_4). "Version 1.4":#1_4 diff --git a/SlideshowFX-app/src/main/resources/com/twasyl/slideshowfx/documentation/SlideshowFX_developer.asciidoc b/SlideshowFX-app/src/main/resources/com/twasyl/slideshowfx/documentation/SlideshowFX_developer.asciidoc index 7ec8afc3..9a4c463d 100755 --- a/SlideshowFX-app/src/main/resources/com/twasyl/slideshowfx/documentation/SlideshowFX_developer.asciidoc +++ b/SlideshowFX-app/src/main/resources/com/twasyl/slideshowfx/documentation/SlideshowFX_developer.asciidoc @@ -33,8 +33,6 @@ But SlideshowFX isn't just another simple presentation engine. It brings much mo | jsoup | {jsoup-version} | -| org.eclipse.mylyn.wikitext.core | {wikitext-core-version} | Library used for textile support - | org.eclipse.mylyn.wikitext.textile.core | {wikitext-textile-core-version} | Library used for textile support | twitter4j | {twitter4j-version} | diff --git a/SlideshowFX-textile/build.gradle b/SlideshowFX-textile/build.gradle index d75708fd..c7973ad2 100755 --- a/SlideshowFX-textile/build.gradle +++ b/SlideshowFX-textile/build.gradle @@ -11,7 +11,7 @@ dependencies { jar { from(configurations.wikitext.resolve().collect()) { - include '**/*.jar' + include '*' } manifest { diff --git a/SlideshowFX-textile/src/main/java/com/twasyl/slideshowfx/markup/textile/TextileMarkup.java b/SlideshowFX-textile/src/main/java/com/twasyl/slideshowfx/markup/textile/TextileMarkup.java index d798d3dc..40f07953 100644 --- a/SlideshowFX-textile/src/main/java/com/twasyl/slideshowfx/markup/textile/TextileMarkup.java +++ b/SlideshowFX-textile/src/main/java/com/twasyl/slideshowfx/markup/textile/TextileMarkup.java @@ -1,10 +1,10 @@ package com.twasyl.slideshowfx.markup.textile; import com.twasyl.slideshowfx.markup.AbstractMarkup; -import org.eclipse.mylyn.wikitext.core.parser.DocumentBuilder; -import org.eclipse.mylyn.wikitext.core.parser.MarkupParser; -import org.eclipse.mylyn.wikitext.core.parser.builder.HtmlDocumentBuilder; -import org.eclipse.mylyn.wikitext.textile.core.TextileLanguage; +import org.eclipse.mylyn.wikitext.parser.DocumentBuilder; +import org.eclipse.mylyn.wikitext.parser.MarkupParser; +import org.eclipse.mylyn.wikitext.parser.builder.HtmlDocumentBuilder; +import org.eclipse.mylyn.wikitext.textile.TextileLanguage; import java.io.IOException; import java.io.StringWriter; @@ -16,8 +16,8 @@ * This markup language is identified byt the code {@code TEXTILE} which is returned by {@link com.twasyl.slideshowfx.markup.IMarkup#getCode()}. * * @author Thierry Wasylczenko - * @since SlideshowFX 1.0 * @version 1.0 + * @since SlideshowFX 1.0 */ public class TextileMarkup extends AbstractMarkup { private static final Logger LOGGER = Logger.getLogger(TextileMarkup.class.getName()); @@ -36,11 +36,12 @@ public TextileMarkup() { */ @Override public String convertAsHtml(String markupString) throws IllegalArgumentException { - if(markupString == null) throw new IllegalArgumentException("Can not convert " + getName() + " to HTML : the String is null"); + if (markupString == null) + throw new IllegalArgumentException("Can not convert " + getName() + " to HTML : the String is null"); String result = null; - try(final StringWriter writer = new StringWriter()) { + try (final StringWriter writer = new StringWriter()) { final DocumentBuilder builder = new HtmlDocumentBuilder(writer); final MarkupParser parser = new MarkupParser(new TextileLanguage(), builder); diff --git a/build.gradle b/build.gradle index 1571b371..bfaeafc1 100755 --- a/build.gradle +++ b/build.gradle @@ -49,8 +49,8 @@ allprojects { jsoup 'org.jsoup:jsoup:1.10.2' markdown 'com.github.rjeschke:txtmark:0.13' twitter4j 'org.twitter4j:twitter4j-core:4.0.6', 'org.twitter4j:twitter4j-stream:4.0.6' - vertx 'io.vertx:vertx-core:3.3.3', 'io.vertx:vertx-web:3.3.3' - wikitext fileTree(dir: "${rootDir.absolutePath}/lib/WikiText", include: '*.jar') + vertx 'io.vertx:vertx-core:3.4.1', 'io.vertx:vertx-web:3.4.1' + wikitext 'org.eclipse.mylyn.docs:wikitext.core:3.0.6', 'org.eclipse.mylyn.docs:org.eclipse.mylyn.wikitext.textile:3.0.6' zxing 'com.google.zxing:core:3.3.0', 'com.google.zxing:javase:3.3.0' junit 'junit:junit:4.12' @@ -268,8 +268,7 @@ asciidoctor { 'apache-felix-version': "${configurations.felix.dependencies[0].version}", 'freemarker-version': "${configurations.freemarker.dependencies[0].version}", 'jsoup-version': "${configurations.jsoup.dependencies[0].version}", - 'wikitext-core-version': '2.11.0.N20161225-2213', - 'wikitext-textile-core-version': '2.11.0.N20161028-1624', + 'wikitext-textile-core-version': "${configurations.wikitext.dependencies[0].version}", 'twitter4j-version': "${configurations.twitter4j.dependencies[0].version}", 'txtmark-version': "${configurations.markdown.dependencies[0].version}", 'vertx-version': "${configurations.vertx.dependencies[0].version}", diff --git a/lib/WikiText/com.google.guava_15.0.0.v201403281430.jar b/lib/WikiText/com.google.guava_15.0.0.v201403281430.jar deleted file mode 100644 index 16c60565..00000000 Binary files a/lib/WikiText/com.google.guava_15.0.0.v201403281430.jar and /dev/null differ diff --git a/lib/WikiText/org.eclipse.mylyn.wikitext.core_2.11.0.N20161225-2213.jar b/lib/WikiText/org.eclipse.mylyn.wikitext.core_2.11.0.N20161225-2213.jar deleted file mode 100755 index c4c222d0..00000000 Binary files a/lib/WikiText/org.eclipse.mylyn.wikitext.core_2.11.0.N20161225-2213.jar and /dev/null differ diff --git a/lib/WikiText/org.eclipse.mylyn.wikitext.textile.core_2.11.0.N20161028-1624.jar b/lib/WikiText/org.eclipse.mylyn.wikitext.textile.core_2.11.0.N20161028-1624.jar deleted file mode 100755 index a7c6c25d..00000000 Binary files a/lib/WikiText/org.eclipse.mylyn.wikitext.textile.core_2.11.0.N20161028-1624.jar and /dev/null differ