Permalink
Browse files

Uses dotify.api v4.4.0, dotify.formatter v4.4.0, braille-utils.pef-to…

…ols v5.0.0 and braille-utils.impl v6.0.0
  • Loading branch information...
joeha480 committed Sep 12, 2018
1 parent 77e1e07 commit 32b8ad225509649674a229a518a57c12796feeb9
View
@@ -83,20 +83,19 @@ repositories {
dependencies {
compileOnly 'org.osgi:org.osgi.service.component.annotations:1.3.0'
compile 'org.daisy.braille:braille-utils.api:5.1.0'
compile 'org.daisy.streamline:streamline-cli:1.0.0'
compile ('org.daisy.braille:braille-utils.pef-tools:4.0.0') {
compile ('org.daisy.braille:braille-utils.pef-tools:5.0.0') {
exclude module: 'Saxon-HE'
}
compile 'org.daisy.dotify:dotify.api:4.2.0'
compile 'org.daisy.dotify:dotify.api:4.4.0'
compile 'org.daisy.dotify:dotify.common:4.3.0'
compile ('org.daisy.streamline:streamline-engine:1.2.0') {
exclude module: 'streamline-api'
}
compile 'org.daisy.streamline:streamline-api:1.3.0'
runtime 'org.daisy.braille:braille-utils.impl:5.1.0'
runtime ('org.daisy.dotify:dotify.formatter.impl:4.3.0') {
runtime 'org.daisy.braille:braille-utils.impl:6.0.0'
runtime ('org.daisy.dotify:dotify.formatter.impl:4.4.0') {
exclude module: 'Saxon-HE'
}
runtime 'org.daisy.dotify:dotify.hyphenator.impl:4.0.0'
@@ -5,8 +5,8 @@
import java.io.IOException;
import org.daisy.braille.utils.api.embosser.Embosser;
import org.daisy.braille.utils.api.embosser.EmbosserCatalogService;
import org.daisy.dotify.api.embosser.Embosser;
import org.daisy.dotify.api.embosser.EmbosserCatalogService;
import org.junit.Test;
@SuppressWarnings("javadoc")
@@ -4,9 +4,9 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.daisy.braille.utils.api.paper.Length;
import org.daisy.braille.utils.api.paper.Paper;
import org.daisy.braille.utils.api.paper.PaperCatalogService;
import org.daisy.dotify.api.paper.Length;
import org.daisy.dotify.api.paper.Paper;
import org.daisy.dotify.api.paper.PaperCatalogService;
import org.junit.Test;
@SuppressWarnings("javadoc")
@@ -4,9 +4,9 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.daisy.braille.utils.api.table.BrailleConverter;
import org.daisy.braille.utils.api.table.Table;
import org.daisy.braille.utils.api.table.TableCatalogService;
import org.daisy.dotify.api.table.BrailleConverter;
import org.daisy.dotify.api.table.Table;
import org.daisy.dotify.api.table.TableCatalogService;
import org.junit.Test;
@SuppressWarnings("javadoc")
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.utils.api.embosser.EmbosserCatalogService;
import org.daisy.dotify.api.embosser.EmbosserCatalogService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.utils.api.paper.PaperCatalogService;
import org.daisy.dotify.api.paper.PaperCatalogService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -5,7 +5,7 @@
import javax.inject.Inject;
import org.daisy.braille.utils.api.table.TableCatalogService;
import org.daisy.dotify.api.table.TableCatalogService;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
@@ -18,19 +18,19 @@ public static Option felixDS() {
public static Option brailleUtilsCore() {
return composite(
dotifyApi(),
MavenRepo.CENTRAL.get("org.daisy.libs", "jing", "20120724.0.0"),
MavenRepo.CENTRAL.get("org.daisy.libs", "saxon-he", "9.5.1.5"),
MavenRepo.SONATYPE_STAGING.get("org.daisy.braille", "braille-utils.api", "5.1.0"),
MavenRepo.SONATYPE_STAGING.get("org.daisy.braille", "braille-utils.pef-tools", "4.0.0")
MavenRepo.SONATYPE_STAGING.get("org.daisy.braille", "braille-utils.pef-tools", "5.0.0")
);
}
public static Option brailleUtilsCatalog() {
return MavenRepo.SONATYPE_STAGING.get("org.daisy.braille", "braille-utils.impl", "5.1.0");
return MavenRepo.SONATYPE_STAGING.get("org.daisy.braille", "braille-utils.impl", "6.0.0");
}
static Option dotifyApi() {
return MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.api", "4.2.0");
return MavenRepo.SONATYPE_STAGING.get("org.daisy.dotify", "dotify.api", "4.4.0");
}
static Option dotifyCommon() {
@@ -96,7 +96,7 @@ public static Option dotifyFormatter() {
dotifyTranslator(),
wstx(),
saxon(),
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.formatter.impl", "4.3.0")
MavenRepo.SONATYPE_STAGING.get("org.daisy.dotify", "dotify.formatter.impl", "4.4.0")
);
}
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.utils.api.embosser.EmbosserCatalogService;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.dotify.api.embosser.EmbosserCatalogService;
import org.daisy.dotify.api.embosser.EmbosserCatalog;
import base.EmbosserCatalogTestbase;
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.utils.api.paper.PaperCatalogService;
import org.daisy.braille.utils.api.paper.PaperCatalog;
import org.daisy.dotify.api.paper.PaperCatalogService;
import org.daisy.dotify.api.paper.PaperCatalog;
import base.PaperCatalogTestbase;
@@ -1,7 +1,7 @@
package spi;
import org.daisy.braille.utils.api.table.TableCatalogService;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.table.TableCatalogService;
import org.daisy.dotify.api.table.TableCatalog;
import base.TableCatalogTestbase;
@@ -4,10 +4,10 @@
import java.util.Collection;
import java.util.List;
import org.daisy.braille.utils.api.factory.Factory;
import org.daisy.braille.utils.api.factory.FactoryCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.factory.Factory;
import org.daisy.dotify.api.factory.FactoryCatalog;
import org.daisy.dotify.api.factory.FactoryProperties;
import org.daisy.dotify.api.table.TableCatalog;
import org.daisy.streamline.cli.Definition;
import org.daisy.streamline.cli.ShortFormResolver;
@@ -15,8 +15,8 @@
import javax.xml.parsers.ParserConfigurationException;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.embosser.EmbosserFactoryException;
import org.daisy.dotify.api.embosser.EmbosserCatalog;
import org.daisy.dotify.api.embosser.EmbosserFactoryException;
import org.daisy.braille.utils.pef.PEFConverterFacade;
import org.daisy.braille.utils.pef.UnsupportedWidthException;
import org.daisy.dotify.Dotify;
@@ -30,26 +30,26 @@
import javax.print.PrintService;
import javax.xml.parsers.ParserConfigurationException;
import org.daisy.braille.utils.api.embosser.Device;
import org.daisy.braille.utils.api.embosser.Embosser;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.embosser.EmbosserFeatures;
import org.daisy.braille.utils.api.embosser.EmbosserProperties;
import org.daisy.braille.utils.api.embosser.EmbosserProperties.PrintMode;
import org.daisy.braille.utils.api.embosser.EmbosserWriter;
import org.daisy.braille.utils.api.embosser.PrintPage;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.paper.Length;
import org.daisy.braille.utils.api.paper.PageFormat;
import org.daisy.braille.utils.api.paper.Paper;
import org.daisy.braille.utils.api.paper.PaperCatalog;
import org.daisy.braille.utils.api.paper.PaperFilter;
import org.daisy.braille.utils.api.paper.RollPaperFormat;
import org.daisy.braille.utils.api.paper.SheetPaperFormat;
import org.daisy.braille.utils.api.paper.SheetPaperFormat.Orientation;
import org.daisy.braille.utils.api.paper.TractorPaperFormat;
import org.daisy.braille.utils.api.table.Table;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.embosser.Device;
import org.daisy.dotify.api.embosser.Embosser;
import org.daisy.dotify.api.embosser.EmbosserCatalog;
import org.daisy.dotify.api.embosser.EmbosserFeatures;
import org.daisy.dotify.api.embosser.EmbosserProperties;
import org.daisy.dotify.api.embosser.EmbosserProperties.PrintMode;
import org.daisy.dotify.api.embosser.EmbosserWriter;
import org.daisy.dotify.api.embosser.PrintPage;
import org.daisy.dotify.api.factory.FactoryProperties;
import org.daisy.dotify.api.paper.Length;
import org.daisy.dotify.api.paper.PageFormat;
import org.daisy.dotify.api.paper.Paper;
import org.daisy.dotify.api.paper.PaperCatalog;
import org.daisy.dotify.api.paper.PaperFilter;
import org.daisy.dotify.api.paper.RollPaperFormat;
import org.daisy.dotify.api.paper.SheetPaperFormat;
import org.daisy.dotify.api.paper.SheetPaperFormat.Orientation;
import org.daisy.dotify.api.paper.TractorPaperFormat;
import org.daisy.dotify.api.table.Table;
import org.daisy.dotify.api.table.TableCatalog;
import org.daisy.braille.utils.pef.FileDevice;
import org.daisy.braille.utils.pef.PEFConverterFacade;
import org.daisy.braille.utils.pef.PEFHandler;
@@ -24,7 +24,7 @@
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.dotify.api.factory.FactoryProperties;
/**
* Provides a command line input helper for setting arguments interactively and
@@ -7,11 +7,11 @@
import java.util.Map;
import java.util.stream.Collectors;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.factory.FactoryProperties.ComparatorBuilder.SortProperty;
import org.daisy.braille.utils.api.paper.PaperCatalog;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.embosser.EmbosserCatalog;
import org.daisy.dotify.api.factory.FactoryProperties;
import org.daisy.dotify.api.factory.FactoryProperties.ComparatorBuilder.SortProperty;
import org.daisy.dotify.api.paper.PaperCatalog;
import org.daisy.dotify.api.table.TableCatalog;
import org.daisy.dotify.api.hyphenator.HyphenatorFactoryMaker;
import org.daisy.streamline.cli.Argument;
import org.daisy.streamline.cli.CommandDetails;
@@ -24,12 +24,12 @@
import java.util.List;
import java.util.Map;
import org.daisy.braille.utils.api.embosser.EmbosserCatalog;
import org.daisy.braille.utils.api.embosser.StandardLineBreaks;
import org.daisy.braille.utils.api.factory.Factory;
import org.daisy.braille.utils.api.factory.FactoryCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.embosser.EmbosserCatalog;
import org.daisy.dotify.api.embosser.StandardLineBreaks;
import org.daisy.dotify.api.factory.Factory;
import org.daisy.dotify.api.factory.FactoryCatalog;
import org.daisy.dotify.api.factory.FactoryProperties;
import org.daisy.dotify.api.table.TableCatalog;
import org.daisy.braille.utils.pef.PEFConverterFacade;
import org.daisy.streamline.cli.Argument;
import org.daisy.streamline.cli.CommandDetails;
@@ -24,10 +24,10 @@
import java.util.List;
import java.util.Map;
import org.daisy.braille.utils.api.factory.Factory;
import org.daisy.braille.utils.api.factory.FactoryCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.factory.Factory;
import org.daisy.dotify.api.factory.FactoryCatalog;
import org.daisy.dotify.api.factory.FactoryProperties;
import org.daisy.dotify.api.table.TableCatalog;
import org.daisy.braille.utils.pef.TextHandler;
import org.daisy.streamline.cli.Argument;
import org.daisy.streamline.cli.CommandDetails;
@@ -9,11 +9,11 @@
import java.util.Locale;
import java.util.stream.Collectors;
import org.daisy.braille.utils.api.factory.Factory;
import org.daisy.braille.utils.api.factory.FactoryCatalog;
import org.daisy.braille.utils.api.factory.FactoryProperties;
import org.daisy.braille.utils.api.table.BrailleConverter;
import org.daisy.braille.utils.api.table.TableCatalog;
import org.daisy.dotify.api.factory.Factory;
import org.daisy.dotify.api.factory.FactoryCatalog;
import org.daisy.dotify.api.factory.FactoryProperties;
import org.daisy.dotify.api.table.BrailleConverter;
import org.daisy.dotify.api.table.TableCatalog;
import org.daisy.dotify.api.translator.BrailleTranslator;
import org.daisy.dotify.api.translator.BrailleTranslatorFactory;
import org.daisy.dotify.api.translator.Translatable;

0 comments on commit 32b8ad2

Please sign in to comment.