diff --git a/ant/pom.xml b/ant/pom.xml index f588b4e..80f7c75 100644 --- a/ant/pom.xml +++ b/ant/pom.xml @@ -15,7 +15,7 @@ com.threerings.getdown - getdown-tools + getdown-core ${project.version} diff --git a/tools/src/main/java/com/threerings/getdown/tools/Differ.java b/core/src/main/java/com/threerings/getdown/tools/Differ.java similarity index 100% rename from tools/src/main/java/com/threerings/getdown/tools/Differ.java rename to core/src/main/java/com/threerings/getdown/tools/Differ.java diff --git a/tools/src/main/java/com/threerings/getdown/tools/Digester.java b/core/src/main/java/com/threerings/getdown/tools/Digester.java similarity index 100% rename from tools/src/main/java/com/threerings/getdown/tools/Digester.java rename to core/src/main/java/com/threerings/getdown/tools/Digester.java diff --git a/tools/src/main/java/com/threerings/getdown/tools/JarDiff.java b/core/src/main/java/com/threerings/getdown/tools/JarDiff.java similarity index 100% rename from tools/src/main/java/com/threerings/getdown/tools/JarDiff.java rename to core/src/main/java/com/threerings/getdown/tools/JarDiff.java diff --git a/tools/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java b/core/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java similarity index 100% rename from tools/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java rename to core/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java diff --git a/tools/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java b/core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java similarity index 100% rename from tools/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java rename to core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java diff --git a/tools/src/main/java/com/threerings/getdown/tools/Patcher.java b/core/src/main/java/com/threerings/getdown/tools/Patcher.java similarity index 100% rename from tools/src/main/java/com/threerings/getdown/tools/Patcher.java rename to core/src/main/java/com/threerings/getdown/tools/Patcher.java diff --git a/launcher/pom.xml b/launcher/pom.xml index daf561d..9ea8e99 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -25,11 +25,6 @@ getdown-core ${project.version} - - com.threerings.getdown - getdown-tools - ${project.version} - com.samskivert samskivert @@ -74,10 +69,6 @@ com.threerings.getdown getdown-core - - com.threerings.getdown - getdown-tools - com.samskivert samskivert diff --git a/pom.xml b/pom.xml index 4208d9c..f22024d 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ core - tools launcher ant diff --git a/tools/pom.xml b/tools/pom.xml deleted file mode 100644 index 0548472..0000000 --- a/tools/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - com.threerings.getdown - getdown - 1.8-SNAPSHOT - - - getdown-tools - jar - Getdown App - Tools for creating digests and patch files - - - - com.threerings.getdown - getdown-core - ${project.version} - - - junit - junit - 4.8.1 - test - - - - diff --git a/tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java b/tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java deleted file mode 100644 index ae15ff3..0000000 --- a/tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java +++ /dev/null @@ -1,32 +0,0 @@ -// -// Getdown - application installer, patcher and launcher -// Copyright (C) 2004-2016 Getdown authors -// https://github.com/threerings/getdown/blob/master/LICENSE - -package com.threerings.getdown.tools; - -import java.io.IOException; -import java.io.StringWriter; - -import org.junit.Test; - -import static com.threerings.getdown.tools.JarDiff.writeEscapedString; -import static org.junit.Assert.assertEquals; - -/** - * Tests {@link JarDiff}. - */ -public class JarDiffTest { - - @Test - public void testWriteEscapedString () throws IOException - { - assertEquals("abc", writeEscapedString(new StringWriter(), "abc").toString()); - assertEquals("abc\\ xyz", writeEscapedString(new StringWriter(), "abc xyz").toString()); - assertEquals("\\ xyz", writeEscapedString(new StringWriter(), " xyz").toString()); - assertEquals("abc\\ ", writeEscapedString(new StringWriter(), "abc ").toString()); - assertEquals("\\ ", writeEscapedString(new StringWriter(), " ").toString()); - assertEquals("", writeEscapedString(new StringWriter(), "").toString()); - } - -}