From f41b6903b4e497c8693decedde6d15e194372da7 Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Mon, 15 Dec 2014 22:03:46 +0000 Subject: [PATCH] Move test files --- java/build.gradle | 35 ++++++++++++++++--- java/mimis/build.gradle | 34 ------------------ java/settings.gradle | 2 +- java/sound/src/main/java/test/Test.java | 6 ++-- java/test/build.gradle | 11 +++++- .../{test => java}/jni/TestIntellitype.java | 0 .../main/{test => java}/jni/TestNative.java | 0 .../main/{test => java}/jni/TestWiiuse.java | 0 .../main/{test => java}/jni/TestXinput.java | 0 .../main/{test => java}/jni/TestiTunes.java | 3 +- .../{test => java}/test/CustomAppender.java | 0 .../{test => java}/util/BufferedSound.java | 2 +- .../test/src/main/{test => java}/util/Ir.java | 2 +- .../src/main/{test => java}/util/Sound.java | 2 +- 14 files changed, 50 insertions(+), 47 deletions(-) rename java/test/src/main/{test => java}/jni/TestIntellitype.java (100%) rename java/test/src/main/{test => java}/jni/TestNative.java (100%) rename java/test/src/main/{test => java}/jni/TestWiiuse.java (100%) rename java/test/src/main/{test => java}/jni/TestXinput.java (100%) rename java/test/src/main/{test => java}/jni/TestiTunes.java (88%) rename java/test/src/main/{test => java}/test/CustomAppender.java (100%) rename java/test/src/main/{test => java}/util/BufferedSound.java (96%) rename java/test/src/main/{test => java}/util/Ir.java (99%) rename java/test/src/main/{test => java}/util/Sound.java (99%) diff --git a/java/build.gradle b/java/build.gradle index dbe3e5c..838fe26 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -6,9 +6,36 @@ subprojects { apply plugin: 'maven' repositories { - mavenCentral() - } - - dependencies { + maven { + url 'https://github.com/Boukefalos/mimis/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/wiigee/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibcom/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibitunes/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibwiiuse/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibwiigee/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/libwiiuse/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibintellitype/raw/mvn-repo/' + } + maven { + url 'https://github.com/Boukefalos/jlibxinput/raw/mvn-repo/' + } + mavenCentral() } } diff --git a/java/mimis/build.gradle b/java/mimis/build.gradle index e514de7..3d7f985 100644 --- a/java/mimis/build.gradle +++ b/java/mimis/build.gradle @@ -6,40 +6,6 @@ task wrapper(type: Wrapper) { gradleVersion = '2.2' } -repositories { - maven { - url 'https://github.com/Boukefalos/mimis/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/wiigee/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibcom/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibitunes/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibwiiuse/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibwiigee/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/libwiiuse/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibintellitype/raw/mvn-repo/' - } - maven { - url 'https://github.com/Boukefalos/jlibxinput/raw/mvn-repo/' - } - mavenCentral() -} - dependencies { compile project(':base') diff --git a/java/settings.gradle b/java/settings.gradle index 7bd51cb..e0fd83d 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -1 +1 @@ -include 'base', 'mimis', 'test' \ No newline at end of file +include 'base', 'mimis', 'test', 'sound' \ No newline at end of file diff --git a/java/sound/src/main/java/test/Test.java b/java/sound/src/main/java/test/Test.java index 067f2bf..a20ca4d 100644 --- a/java/sound/src/main/java/test/Test.java +++ b/java/sound/src/main/java/test/Test.java @@ -19,8 +19,8 @@ public class Test { AudioFormat audioFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 48000f, 16, 2, 4, 48000f, true); try { //Producer p1 = new Target("Line-In (Creative SB X-Fi)"); - Producer p2 = new Target("Line 1 (Virtual Audio Cable)", audioFormat); - p2.start(); + //Producer p2 = new Target("Line 1 (Virtual Audio Cable)", audioFormat); + //p2.start(); Producer p3 = new Stream("http://ics2gss.omroep.nl:80/3fm-bb-mp3"); Producer p4 = new Stream("http://sc7.mystreamserver.com:8004"); @@ -32,7 +32,7 @@ public class Test { //Utils.write(p3.getInputStream(), new File("stream.out")); //Utils.play(p3.getInputStream()); - c3.start(p3); + c4.start(p3); //while (true) { //Thread.sleep(300000); diff --git a/java/test/build.gradle b/java/test/build.gradle index 0ce6a16..117179b 100644 --- a/java/test/build.gradle +++ b/java/test/build.gradle @@ -1,3 +1,12 @@ -dependencies { +apply plugin: 'java' +apply plugin: 'eclipse' +dependencies { + compile project(':mimis') + + compile 'com.github.boukefalos:jlibmimis:0.1' + compile 'com.github.boukefalos:jlibitunes:0.3' + compile 'com.github.boukefalos:jlibwiiuse:0.12' + compile 'com.github.boukefalos:jlibintellitype:1.3.9' + compile 'com.github.boukefalos:jlibxinput:1.0' } \ No newline at end of file diff --git a/java/test/src/main/test/jni/TestIntellitype.java b/java/test/src/main/java/jni/TestIntellitype.java similarity index 100% rename from java/test/src/main/test/jni/TestIntellitype.java rename to java/test/src/main/java/jni/TestIntellitype.java diff --git a/java/test/src/main/test/jni/TestNative.java b/java/test/src/main/java/jni/TestNative.java similarity index 100% rename from java/test/src/main/test/jni/TestNative.java rename to java/test/src/main/java/jni/TestNative.java diff --git a/java/test/src/main/test/jni/TestWiiuse.java b/java/test/src/main/java/jni/TestWiiuse.java similarity index 100% rename from java/test/src/main/test/jni/TestWiiuse.java rename to java/test/src/main/java/jni/TestWiiuse.java diff --git a/java/test/src/main/test/jni/TestXinput.java b/java/test/src/main/java/jni/TestXinput.java similarity index 100% rename from java/test/src/main/test/jni/TestXinput.java rename to java/test/src/main/java/jni/TestXinput.java diff --git a/java/test/src/main/test/jni/TestiTunes.java b/java/test/src/main/java/jni/TestiTunes.java similarity index 88% rename from java/test/src/main/test/jni/TestiTunes.java rename to java/test/src/main/java/jni/TestiTunes.java index 6b33e5c..b7e9db2 100644 --- a/java/test/src/main/test/jni/TestiTunes.java +++ b/java/test/src/main/java/jni/TestiTunes.java @@ -6,5 +6,6 @@ public class TestiTunes { public static void main(String[] args) { iTunes iTunes = new iTunes(); iTunes.connect(); + iTunes.playPause(); } -} +} \ No newline at end of file diff --git a/java/test/src/main/test/test/CustomAppender.java b/java/test/src/main/java/test/CustomAppender.java similarity index 100% rename from java/test/src/main/test/test/CustomAppender.java rename to java/test/src/main/java/test/CustomAppender.java diff --git a/java/test/src/main/test/util/BufferedSound.java b/java/test/src/main/java/util/BufferedSound.java similarity index 96% rename from java/test/src/main/test/util/BufferedSound.java rename to java/test/src/main/java/util/BufferedSound.java index edf3f19..a378204 100644 --- a/java/test/src/main/test/util/BufferedSound.java +++ b/java/test/src/main/java/util/BufferedSound.java @@ -1,4 +1,4 @@ -package mimis.util; +package util; public class BufferedSound { private byte[][] soundData; diff --git a/java/test/src/main/test/util/Ir.java b/java/test/src/main/java/util/Ir.java similarity index 99% rename from java/test/src/main/test/util/Ir.java rename to java/test/src/main/java/util/Ir.java index e246c62..45168a0 100644 --- a/java/test/src/main/test/util/Ir.java +++ b/java/test/src/main/java/util/Ir.java @@ -1,4 +1,4 @@ -package mimis.util; +package util; import java.awt.Color; import java.awt.Graphics2D; diff --git a/java/test/src/main/test/util/Sound.java b/java/test/src/main/java/util/Sound.java similarity index 99% rename from java/test/src/main/test/util/Sound.java rename to java/test/src/main/java/util/Sound.java index b0573b2..c1d25ef 100644 --- a/java/test/src/main/test/util/Sound.java +++ b/java/test/src/main/java/util/Sound.java @@ -1,4 +1,4 @@ -package mimis.util; +package util; import java.io.File; import java.io.IOException;