diff --git a/.gitignore b/.gitignore index 8c94d06..23483cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +.gradle/ build/ *.sw* diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..866e865 --- /dev/null +++ b/build.gradle @@ -0,0 +1,17 @@ +apply plugin: "groovy" +apply plugin: "maven" + +group = "com.jdbernard" +version = "3.4" + +repositories { + mavenCentral() } + +dependencies { + compile 'org.codehaus.groovy:groovy-all:2.3.6' + compile 'org.slf4j:slf4j-api:1.7.10' + compile 'ch.qos.logback:logback-core:1.1.2' + compile 'ch.qos.logback:logback-classic:1.1.2' + + testCompile 'junit:junit:4.12' +} diff --git a/build.xml b/build.xml deleted file mode 100644 index 684935a..0000000 --- a/build.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/jdb-build-1.10.xml b/jdb-build-1.10.xml deleted file mode 100644 index 38056a4..0000000 --- a/jdb-build-1.10.xml +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lib/compile/jar/slf4j-api-1.6.1.jar b/lib/compile/jar/slf4j-api-1.6.1.jar deleted file mode 100644 index 42e0ad0..0000000 Binary files a/lib/compile/jar/slf4j-api-1.6.1.jar and /dev/null differ diff --git a/lib/runtime/jar/logback-classic-0.9.26.jar b/lib/runtime/jar/logback-classic-0.9.26.jar deleted file mode 100644 index b900b64..0000000 Binary files a/lib/runtime/jar/logback-classic-0.9.26.jar and /dev/null differ diff --git a/lib/runtime/jar/logback-core-0.9.26.jar b/lib/runtime/jar/logback-core-0.9.26.jar deleted file mode 100644 index d50f3cd..0000000 Binary files a/lib/runtime/jar/logback-core-0.9.26.jar and /dev/null differ diff --git a/lib/runtime/jar/slf4j-api-1.6.1.jar b/lib/runtime/jar/slf4j-api-1.6.1.jar deleted file mode 100644 index 42e0ad0..0000000 Binary files a/lib/runtime/jar/slf4j-api-1.6.1.jar and /dev/null differ diff --git a/project.properties b/project.properties deleted file mode 100644 index 24c6503..0000000 --- a/project.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri, 21 Nov 2014 15:30:57 -0600 -name=jdb-util -version=3.4 -lib.local=true - -build.number=1 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..afa1d04 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "jdb-util" diff --git a/src/main/com/jdbernard/net/HttpContext.groovy b/src/main/groovy/com/jdbernard/net/HttpContext.groovy similarity index 100% rename from src/main/com/jdbernard/net/HttpContext.groovy rename to src/main/groovy/com/jdbernard/net/HttpContext.groovy diff --git a/src/main/com/jdbernard/util/ConsoleProgressBar.groovy b/src/main/groovy/com/jdbernard/util/ConsoleProgressBar.groovy similarity index 100% rename from src/main/com/jdbernard/util/ConsoleProgressBar.groovy rename to src/main/groovy/com/jdbernard/util/ConsoleProgressBar.groovy diff --git a/src/main/com/jdbernard/util/ExtRobot.groovy b/src/main/groovy/com/jdbernard/util/ExtRobot.groovy similarity index 100% rename from src/main/com/jdbernard/util/ExtRobot.groovy rename to src/main/groovy/com/jdbernard/util/ExtRobot.groovy diff --git a/src/main/com/jdbernard/util/JarUtils.groovy b/src/main/groovy/com/jdbernard/util/JarUtils.groovy similarity index 100% rename from src/main/com/jdbernard/util/JarUtils.groovy rename to src/main/groovy/com/jdbernard/util/JarUtils.groovy diff --git a/src/main/com/jdbernard/util/LightOptionParser.groovy b/src/main/groovy/com/jdbernard/util/LightOptionParser.groovy similarity index 100% rename from src/main/com/jdbernard/util/LightOptionParser.groovy rename to src/main/groovy/com/jdbernard/util/LightOptionParser.groovy diff --git a/src/main/com/jdbernard/util/SmartConfig.groovy b/src/main/groovy/com/jdbernard/util/SmartConfig.groovy similarity index 100% rename from src/main/com/jdbernard/util/SmartConfig.groovy rename to src/main/groovy/com/jdbernard/util/SmartConfig.groovy diff --git a/src/main/com/jdbernard/util/Util.groovy b/src/main/groovy/com/jdbernard/util/Util.groovy similarity index 100% rename from src/main/com/jdbernard/util/Util.groovy rename to src/main/groovy/com/jdbernard/util/Util.groovy diff --git a/src/main/com/jdbernard/io/NonBlockingInputStreamReader.java b/src/main/java/com/jdbernard/io/NonBlockingInputStreamReader.java similarity index 100% rename from src/main/com/jdbernard/io/NonBlockingInputStreamReader.java rename to src/main/java/com/jdbernard/io/NonBlockingInputStreamReader.java diff --git a/src/main/com/jdbernard/io/NullOutputStream.java b/src/main/java/com/jdbernard/io/NullOutputStream.java similarity index 100% rename from src/main/com/jdbernard/io/NullOutputStream.java rename to src/main/java/com/jdbernard/io/NullOutputStream.java diff --git a/src/main/com/jdbernard/io/WrappedPrinter.java b/src/main/java/com/jdbernard/io/WrappedPrinter.java similarity index 100% rename from src/main/com/jdbernard/io/WrappedPrinter.java rename to src/main/java/com/jdbernard/io/WrappedPrinter.java diff --git a/src/main/com/jdbernard/net/ParameterizedSocket.java b/src/main/java/com/jdbernard/net/ParameterizedSocket.java similarity index 100% rename from src/main/com/jdbernard/net/ParameterizedSocket.java rename to src/main/java/com/jdbernard/net/ParameterizedSocket.java diff --git a/src/main/com/jdbernard/slf4j/LoggerOutputStream.java b/src/main/java/com/jdbernard/slf4j/LoggerOutputStream.java similarity index 100% rename from src/main/com/jdbernard/slf4j/LoggerOutputStream.java rename to src/main/java/com/jdbernard/slf4j/LoggerOutputStream.java diff --git a/src/main/com/jdbernard/util/ConsoleColor.java b/src/main/java/com/jdbernard/util/ConsoleColor.java similarity index 100% rename from src/main/com/jdbernard/util/ConsoleColor.java rename to src/main/java/com/jdbernard/util/ConsoleColor.java diff --git a/src/test/com/jdbernard/util/LightOptionParserTests.groovy b/src/test/groovy/com/jdbernard/util/LightOptionParserTests.groovy similarity index 100% rename from src/test/com/jdbernard/util/LightOptionParserTests.groovy rename to src/test/groovy/com/jdbernard/util/LightOptionParserTests.groovy