From a0f5dd0d92b7bb81359ad7c8abfff54fb0d03a9d Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Thu, 14 Jul 2016 08:51:18 +0100 Subject: [PATCH] Minor tweaks for correct building --- build.gradle | 14 ++++++++++++++ .../java/com/github/boukefalos/tm1638/Loader.java | 3 ++- src/test/java/test/TestLocal.java | 8 ++++---- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 2e732bf..b6f3c54 100644 --- a/build.gradle +++ b/build.gradle @@ -26,4 +26,18 @@ repositories { dependencies { compile 'org.msgpack:msgpack:0.6.11' compile 'com.sparetimelabs:purejavacomm:0.0.22' + compile 'org.slf4j:slf4j-log4j12:1.7.7' +} + +sourceSets { + main { + java { + srcDirs = [ 'src/main/java' ] + } + } + generated { + java { + srcDirs = [ 'build/generated/java' ] + } + } } \ No newline at end of file diff --git a/src/main/java/com/github/boukefalos/tm1638/Loader.java b/src/main/java/com/github/boukefalos/tm1638/Loader.java index 5de85aa..3b53629 100644 --- a/src/main/java/com/github/boukefalos/tm1638/Loader.java +++ b/src/main/java/com/github/boukefalos/tm1638/Loader.java @@ -5,13 +5,14 @@ import java.util.Properties; import org.picocontainer.PicoCompositionException; import tm1638.Tm1638.Message; -import base.exception.LoaderException; import com.github.boukefalos.arduino.exception.ArduinoException; import com.github.boukefalos.arduino.port.ParsingPort; import com.github.boukefalos.tm1638.implementation.Local; import com.github.boukefalos.tm1638.implementation.Remote; +import base.exception.LoaderException; + public class Loader extends com.github.boukefalos.arduino.Loader { protected static final String PROPERTIES_FILE = "TM1638.properties"; diff --git a/src/test/java/test/TestLocal.java b/src/test/java/test/TestLocal.java index 032516c..891d037 100644 --- a/src/test/java/test/TestLocal.java +++ b/src/test/java/test/TestLocal.java @@ -1,12 +1,12 @@ package test; -import base.work.Listen; - import com.github.boukefalos.arduino.port.StringPort; import com.github.boukefalos.tm1638.TM1638; import com.github.boukefalos.tm1638.implementation.Local; -public class TestLocal extends Listen { +import base.work.ReflectiveListen; + +public class TestLocal extends ReflectiveListen { public static void main(String[] args) throws Exception { TM1638 TM1638 = new Local(StringPort.getInstance()); main(TM1638); @@ -17,7 +17,7 @@ public class TestLocal extends Listen { } public static void main(TM1638 TM1638) throws Exception { - TM1638.register(new TestLocal()); + //TM1638.register(new TestLocal()); TM1638.start(); TM1638.construct(8, 9, 7);