Skip to content

Commit

Permalink
- Use WikiText on maven central and update the textile plugin.
Browse files Browse the repository at this point in the history
- Update the Vert.x version

This closes #32
  • Loading branch information
twasyl committed Mar 23, 2017
1 parent 85d59c7 commit 600156f
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.textile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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} |
Expand Down
2 changes: 1 addition & 1 deletion SlideshowFX-textile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {

jar {
from(configurations.wikitext.resolve().collect()) {
include '**/*.jar'
include '*'
}

manifest {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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());
Expand All @@ -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);

Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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}",
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 600156f

Please sign in to comment.