From 41f9b5aa1e210bca15252016e56560401921d7a6 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Mon, 11 Jul 2016 23:14:44 +0100
Subject: [PATCH] Correct device.hotkey and dependencies

---
 java/application.itunes/build.gradle                   |  2 ++
 java/core.input/build.gradle                           |  2 ++
 java/core.mimis/build.gradle                           | 10 +---------
 java/core.windows/build.gradle                         |  3 +++
 java/device.hotkey/build.gradle                        |  2 ++
 .../java/mimis/device/jintellitype/CommandButton.java  |  0
 .../main/java/mimis/device/jintellitype/Hotkey.java    |  0
 .../mimis/device/jintellitype/JIntellitypeDevice.java  |  0
 .../device/jintellitype/JIntellitypeTaskMapCycle.java  |  0
 .../main/java/mimis/device/jintellitype/Modifier.java  |  0
 java/settings.gradle                                   |  1 +
 11 files changed, 11 insertions(+), 9 deletions(-)
 rename java/{core.input => device.hotkey}/src/main/java/mimis/device/jintellitype/CommandButton.java (100%)
 rename java/{core.input => device.hotkey}/src/main/java/mimis/device/jintellitype/Hotkey.java (100%)
 rename java/{core.input => device.hotkey}/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java (100%)
 rename java/{core.input => device.hotkey}/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java (100%)
 rename java/{core.input => device.hotkey}/src/main/java/mimis/device/jintellitype/Modifier.java (100%)

diff --git a/java/application.itunes/build.gradle b/java/application.itunes/build.gradle
index b2702fd..e6f8c2a 100644
--- a/java/application.itunes/build.gradle
+++ b/java/application.itunes/build.gradle
@@ -1,3 +1,5 @@
 dependencies {
 	compile project(':core.mimis')
+
+	compile 'com.github.boukefalos:jlibitunes:0.3'
 }
\ No newline at end of file
diff --git a/java/core.input/build.gradle b/java/core.input/build.gradle
index dae9b81..f2854b6 100644
--- a/java/core.input/build.gradle
+++ b/java/core.input/build.gradle
@@ -1,3 +1,5 @@
 dependencies {
 	compile project(':core.windows')
+
+	compile 'com.github.boukefalos:jlibxinput:1.0'
 }
\ No newline at end of file
diff --git a/java/core.mimis/build.gradle b/java/core.mimis/build.gradle
index 1eb0fe6..1b80626 100644
--- a/java/core.mimis/build.gradle
+++ b/java/core.mimis/build.gradle
@@ -1,12 +1,4 @@
 dependencies {
 	compile project(':core.worker')
-
-	compile 'com.github.boukefalos:jlibmimis:0.1'
-	compile 'com.github.boukefalos:jlibxinput:1.0'
-	compile 'com.github.boukefalos:jlibitunes:0.3'
-	compile 'com.github.boukefalos:jlibintellitype:1.3.9'
-
-	compile 'org.slf4j:slf4j-log4j12:1.7.7'	
-	compile 'org.picocontainer:picocontainer:2.15'
-	compile 'junit:junit:4.12'	
+	compile project(':core.routing')
 }
\ No newline at end of file
diff --git a/java/core.windows/build.gradle b/java/core.windows/build.gradle
index b2702fd..d857a8a 100644
--- a/java/core.windows/build.gradle
+++ b/java/core.windows/build.gradle
@@ -1,3 +1,6 @@
 dependencies {
 	compile project(':core.mimis')
+	
+	
+	compile 'com.github.boukefalos:jlibmimis:0.1'
 }
\ No newline at end of file
diff --git a/java/device.hotkey/build.gradle b/java/device.hotkey/build.gradle
index b2702fd..1e4838c 100644
--- a/java/device.hotkey/build.gradle
+++ b/java/device.hotkey/build.gradle
@@ -1,3 +1,5 @@
 dependencies {
 	compile project(':core.mimis')
+
+	compile 'com.github.boukefalos:jlibintellitype:1.3.9'
 }
\ No newline at end of file
diff --git a/java/core.input/src/main/java/mimis/device/jintellitype/CommandButton.java b/java/device.hotkey/src/main/java/mimis/device/jintellitype/CommandButton.java
similarity index 100%
rename from java/core.input/src/main/java/mimis/device/jintellitype/CommandButton.java
rename to java/device.hotkey/src/main/java/mimis/device/jintellitype/CommandButton.java
diff --git a/java/core.input/src/main/java/mimis/device/jintellitype/Hotkey.java b/java/device.hotkey/src/main/java/mimis/device/jintellitype/Hotkey.java
similarity index 100%
rename from java/core.input/src/main/java/mimis/device/jintellitype/Hotkey.java
rename to java/device.hotkey/src/main/java/mimis/device/jintellitype/Hotkey.java
diff --git a/java/core.input/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java b/java/device.hotkey/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java
similarity index 100%
rename from java/core.input/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java
rename to java/device.hotkey/src/main/java/mimis/device/jintellitype/JIntellitypeDevice.java
diff --git a/java/core.input/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java b/java/device.hotkey/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java
similarity index 100%
rename from java/core.input/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java
rename to java/device.hotkey/src/main/java/mimis/device/jintellitype/JIntellitypeTaskMapCycle.java
diff --git a/java/core.input/src/main/java/mimis/device/jintellitype/Modifier.java b/java/device.hotkey/src/main/java/mimis/device/jintellitype/Modifier.java
similarity index 100%
rename from java/core.input/src/main/java/mimis/device/jintellitype/Modifier.java
rename to java/device.hotkey/src/main/java/mimis/device/jintellitype/Modifier.java
diff --git a/java/settings.gradle b/java/settings.gradle
index 93eca8d..c3e495e 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -16,6 +16,7 @@ include ':core.windows'
 include ':core.worker'
 include ':core.mimis'
 include ':device.extreme3d'
+include ':device.hotkey'
 include ':device.lirc'
 include ':device.network'
 include ':device.rumblepad'