Merged the tools module into core.
It wasn't actually providing any value. Neither tools nor core have any special dependencies. The code in tools operates on the same files, formats and data structures that core/runtime code operates on. It is simpler to have them in the same module.
This commit is contained in:
+1
-1
@@ -15,7 +15,7 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown-tools</artifactId>
|
||||
<artifactId>getdown-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@@ -25,11 +25,6 @@
|
||||
<artifactId>getdown-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown-tools</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.samskivert</groupId>
|
||||
<artifactId>samskivert</artifactId>
|
||||
@@ -74,10 +69,6 @@
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown-core</artifactId>
|
||||
</inclusion>
|
||||
<inclusion>
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown-tools</artifactId>
|
||||
</inclusion>
|
||||
<inclusion>
|
||||
<groupId>com.samskivert</groupId>
|
||||
<artifactId>samskivert</artifactId>
|
||||
|
||||
@@ -43,7 +43,6 @@
|
||||
|
||||
<modules>
|
||||
<module>core</module>
|
||||
<module>tools</module>
|
||||
<module>launcher</module>
|
||||
<module>ant</module>
|
||||
</modules>
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown</artifactId>
|
||||
<version>1.8-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>getdown-tools</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<name>Getdown App</name>
|
||||
<description>Tools for creating digests and patch files</description>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.threerings.getdown</groupId>
|
||||
<artifactId>getdown-core</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
<artifactId>junit</artifactId>
|
||||
<version>4.8.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user