Dawit #1

Merged
DawitG96 merged 10 commits from dawit into master 2018-06-01 21:36:48 +02:00
4 changed files with 14 additions and 6 deletions
Showing only changes of commit 8c2d94d90a - Show all commits

10
.gitignore vendored
View File

@@ -11,7 +11,7 @@
.mtj.tmp/ .mtj.tmp/
# Package Files # # Package Files #
*.jar # *.jar // need zway lib
*.war *.war
*.ear *.ear
*.zip *.zip
@@ -22,9 +22,17 @@
hs_err_pid* hs_err_pid*
/bin/ /bin/
# Mi sono rotto di intellij e gradle
# anche se comunque per qualche ragione non funziona
# Perche' cointiunua a darmi i file di queste due cartelle??
.idea/
.idea/*.xml
.gradle/
# eclipse things # # eclipse things #
.classpath .classpath
.project .project
.settings
.gradle .gradle
/build/ /build/

View File

@@ -13,17 +13,17 @@ repositories {
dependencies { dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'junit', name: 'junit', version: '4.12'
// compile "com.sparkjava:spark-core:2.5.5" // compile "com.sparkjava:spark-core:2.5.5"
// compile "org.slf4j:slf4j-simple:1.7.21" // compile "org.slf4j:slf4j-simple:1.7.21"
compile "com.google.code.gson:gson:2.8.0" compile "com.google.code.gson:gson:2.8.0"
// compile "org.xerial:sqlite-jdbc:3.15.1" // compile "org.xerial:sqlite-jdbc:3.15.1"
compile 'org.apache.httpcomponents:httpclient:4.5.3' compile 'org.apache.httpcomponents:httpclient:4.5.3'
compile 'com.google.api-client:google-api-client:1.23.0' compile 'com.google.api-client:google-api-client:1.23.0'
compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta' compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta'
// z-way-lib and all its dependencies (from https://github.com/pathec/ZWay-library-for-Java) // z-way-lib and all its dependencies (from https://github.com/pathec/ZWay-library-for-Java)
compile files('lib/zway-lib-0.2.9-SNAPSHOT.jar') compile files('lib/zway-lib-0.2.9-SNAPSHOT.jar')
compile 'com.google.code.gson:gson:2.4' // compile 'com.google.code.gson:gson:2.4' //already up there
compile 'org.apache.commons:commons-lang3:3.4' compile 'org.apache.commons:commons-lang3:3.4'
compile 'org.eclipse.jetty:jetty-client:9.3.11.v20160721' compile 'org.eclipse.jetty:jetty-client:9.3.11.v20160721'
compile 'org.eclipse.jetty:jetty-http:9.3.11.v20160721' compile 'org.eclipse.jetty:jetty-http:9.3.11.v20160721'

Binary file not shown.

View File

@@ -56,7 +56,7 @@ public class Hue {
/*public void setAttribute(String attribute, String value){ /*public void setAttribute(String attribute, String value){
for (String light : allLights.keySet()) { for (String light : allLights.keySet()) {
String callURL = lightsURL + light + "/state"; String callURL = lightsURL + light + "/state";
String body = "{ \"+attribute+\" : "+value+" }"; String body = "{ \""+attribute+"\" : "+value+" }";
Rest.put(callURL, body, "application/json"); Rest.put(callURL, body, "application/json");
} }
}*/ }*/