diff --git a/.gitignore b/.gitignore index 0c0b5c6..8a68e40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,8 @@ .settings .project .classpath -.project .maven bin build +*.exe +*.dll \ No newline at end of file diff --git a/java/exec.connected/build.gradle b/java/exec.connected/build.gradle index b605a2e..af3d95c 100644 --- a/java/exec.connected/build.gradle +++ b/java/exec.connected/build.gradle @@ -1,14 +1,9 @@ -apply plugin: 'java' -apply plugin: 'eclipse' +dependencies { + compile project(':core.legacy') + compile project(':exec.mimis') -task wrapper(type: Wrapper) { - gradleVersion = '2.2' -} - -repositories { - mavenCentral() -} - -dependencies { compile 'com.esotericsoftware.yamlbeans:yamlbeans:1.09' + + // compile 'com.github.boukefalos:jlibibuddy:1.1' + // compile 'com.github.boukefalos:jliblirc:1.1' } \ No newline at end of file diff --git a/java/exec.connected/src/main/java/extra/Task.java b/java/exec.connected/src/main/java/extra/Task.java index 0e33685..c584d62 100644 --- a/java/exec.connected/src/main/java/extra/Task.java +++ b/java/exec.connected/src/main/java/extra/Task.java @@ -16,12 +16,10 @@ */ package extra; -import com.github.boukefalos.lirc.input.Input; -import com.github.boukefalos.lirc.util.Signal; -import com.github.boukefalos.lirc.value.Action; -import com.github.boukefalos.lirc.value.Target; - -import extra.Task; +import mimis.input.Input; +import mimis.value.Action; +import mimis.value.Signal; +import mimis.value.Target; public class Task implements Input { protected static final long serialVersionUID = 1L; diff --git a/java/exec.connected/src/main/java/map/DenonRC176EventMap.java b/java/exec.connected/src/main/java/map/DenonRC176EventMap.java index 11015b9..62f9192 100644 --- a/java/exec.connected/src/main/java/map/DenonRC176EventMap.java +++ b/java/exec.connected/src/main/java/map/DenonRC176EventMap.java @@ -17,11 +17,11 @@ package map; import com.github.boukefalos.lirc.button.remote.DenonRC176Button; -import com.github.boukefalos.lirc.state.TaskMap; -import com.github.boukefalos.lirc.value.Action; -import com.github.boukefalos.lirc.value.Target; import extra.Task; +import mimis.state.TaskMap; +import mimis.value.Action; +import mimis.value.Target; public class DenonRC176EventMap extends TaskMap { protected static final long serialVersionUID = 1L; diff --git a/java/exec.mimis/build.gradle b/java/exec.mimis/build.gradle index 61afa58..738a0bc 100644 --- a/java/exec.mimis/build.gradle +++ b/java/exec.mimis/build.gradle @@ -1,4 +1,5 @@ dependencies { + compile project(':device.lirc') compile project(':core.legacy') compile 'com.github.boukefalos:jlibmimis:0.1' diff --git a/java/exec.sound/build.gradle b/java/exec.sound/build.gradle index 8536a8e..83c34c4 100644 --- a/java/exec.sound/build.gradle +++ b/java/exec.sound/build.gradle @@ -1,4 +1,6 @@ -dependencies { +dependencies { + compile project(':core.legacy') + compile 'commons-io:commons-io:2.+' compile 'commons-cli:commons-cli:1.+' compile 'commons-pool:commons-pool:1.+' diff --git a/java/exec.test/build.gradle b/java/exec.test/build.gradle index a7ffd60..db85bcd 100644 --- a/java/exec.test/build.gradle +++ b/java/exec.test/build.gradle @@ -1,7 +1,12 @@ dependencies { + compile project(':device.wiimote') + 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' + + compile 'net.java.dev.jna:jna:4.2.2' + compile 'org.apache.logging.log4j:log4j-api:2.+' } \ No newline at end of file diff --git a/java/exec.test/src/main/java/jna/HelloTest.java b/java/exec.test/src/main/java/jna/HelloTest.java index 9d1e932..c3abd78 100644 --- a/java/exec.test/src/main/java/jna/HelloTest.java +++ b/java/exec.test/src/main/java/jna/HelloTest.java @@ -1,8 +1,8 @@ package jna; + import com.sun.jna.Library; import com.sun.jna.Native; - public class HelloTest { public interface HelloLibrary extends Library { public void helloFromC(); diff --git a/java/settings.gradle b/java/settings.gradle index ffe0a84..aa8e93a 100644 --- a/java/settings.gradle +++ b/java/settings.gradle @@ -6,6 +6,8 @@ include ':core.networking' include ':core.routing' include ':core.worker' include ':device.lirc' +include ':device.wiimote' include ':exec.mimis' include ':exec.sound' -include ':exec.test' \ No newline at end of file +include ':exec.test' +include ':exec.connected' \ No newline at end of file