Merge pull request #37 from GoSuji/websocket

OGS interaction
vapour101 · Oct 1, 2017 · 756e3ee · 756e3ee
2 parents 232f177 + 991a572
commit 756e3ee
Show file tree

Hide file tree

Showing 85 changed files with 2,751 additions and 1,241 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,6 @@ build/
 out/
 
 #Local Settings
-.idea/workspace.xml*
-.idea/dictionaries
+.idea/
+*.iml
 .gradle/
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/GPL3.xml b/.idea/copyright/GPL3.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml
diff --git a/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_0_18.xml b/.idea/libraries/Gradle__com_google_errorprone_error_prone_annotations_2_0_18.xml
diff --git a/.idea/libraries/Gradle__com_google_guava_guava_23_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_23_0.xml
diff --git a/.idea/libraries/Gradle__com_google_j2objc_j2objc_annotations_1_1.xml b/.idea/libraries/Gradle__com_google_j2objc_j2objc_annotations_1_1.xml
diff --git a/.idea/libraries/Gradle__junit_junit_4_12.xml b/.idea/libraries/Gradle__junit_junit_4_12.xml
diff --git a/.idea/libraries/Gradle__org_codehaus_mojo_animal_sniffer_annotations_1_14.xml b/.idea/libraries/Gradle__org_codehaus_mojo_animal_sniffer_annotations_1_14.xml
diff --git a/.idea/libraries/Gradle__org_dockfx_DockFX_0_1_12.xml b/.idea/libraries/Gradle__org_dockfx_DockFX_0_1_12.xml
diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml
diff --git a/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_10.xml b/.idea/libraries/Gradle__org_slf4j_slf4j_api_1_7_10.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/org.suji.iml b/.idea/modules/org.suji.iml
diff --git a/.idea/modules/org.suji_main.iml b/.idea/modules/org.suji_main.iml
diff --git a/.idea/modules/org.suji_test.iml b/.idea/modules/org.suji_test.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/build.gradle b/build.gradle
@@ -22,9 +22,15 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testRuntime 'org.slf4j:slf4j-api:1.7.10'
-    compile 'com.google.guava:guava:23.0'
-    compile 'org.dockfx:DockFX:0.1.12'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.+'
+    testRuntime group: 'org.slf4j', name: 'slf4j-api', version: '1.7.10'
+    compile group: 'com.google.guava', name: 'guava', version: '23.0'
+    compile group: 'org.dockfx', name: 'DockFX', version: '0.1.12'
+    compile group: 'io.socket', name: 'socket.io-client', version: '1.0.0'
+    compile group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '2.26'
+    compile group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '2.26'
+    compile group: 'org.glassfish.jersey.inject', name: 'jersey-hk2', version: '2.26'
+    compile group: 'org.glassfish.jersey.connectors', name: 'jersey-apache-connector', version: '2.26'
 }
 
 jfx {