diff options
| author |  Vitaly Takmazov | 2016-06-30 15:26:33 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-06-30 15:26:33 +0300 |
| commit | e0c013d084abff8316c2ae3c57263b64794d5b6d (patch) | |
| tree | 28a87521f46b7b2a1bb8652a9706be16f114b84c | |
| parent | 5fc121e7dc0c5c61dda58f4e4a73d7e43848e1e4 (diff) | |
| parent | 7babecb107b183713a5fde33cae95e6bec726142 (diff) | |
merge tgb
| -rw-r--r-- | build.gradle | 2 | ||||
| m--------- | deps/com.juick.server | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index 9ab3bce3..5a62cfd2 100644 --- a/build.gradle +++ b/build.gradle @@ -56,9 +56,9 @@ dependencies { compile 'javax.inject:javax.inject:1' compile 'com.github.pengrad:java-telegram-bot-api:2.1.1' compile 'com.neovisionaries:nv-websocket-client:1.27' - runtime 'mysql:mysql-connector-java:5.1.39' testCompile 'ch.vorburger.mariaDB4j:mariaDB4j:2.1.3' testCompile 'org.slf4j:slf4j-jdk14:1.7.13' + providedRuntime 'mysql:mysql-connector-java:5.1.39' testCompile 'junit:junit:4.12' } compileJava.options.encoding = 'UTF-8' diff --git a/deps/com.juick.server b/deps/com.juick.server -Subproject 9d182aa45b5e2428ba684973837a8d035c0d50a +Subproject 1ce6bc55817129159b1cda5076d039e9c3bc850 |