Merge PRs MovingBlocks#1423 by @msteiger and MovingBlocks#1436 by @flo …

…- library updates
DarkWeird · Dec 11, 2014 · e9b06d9 · e9b06d9
3 parents bd249dc + 4a8aab0 + 104e9eb
commit e9b06d9
Show file tree

Hide file tree

Showing 6 changed files with 1,096 additions and 1,197 deletions.
diff --git a/engine/build.gradle b/engine/build.gradle
@@ -92,10 +92,10 @@ dependencies {
 
     // Storage and networking
     compile group: 'com.google.guava', name: 'guava', version: '18.0'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.3'
-    compile group: 'com.google.protobuf', name: 'protobuf-java', version: '2.5.0'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.3.1'
+    compile group: 'com.google.protobuf', name: 'protobuf-java', version: '2.6.1'
     compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'
-    compile group: 'io.netty', name: 'netty', version: '3.6.5.Final'
+    compile group: 'io.netty', name: 'netty', version: '3.9.5.Final'
 
     // Java magic
     compile group: 'net.java.dev.jna', name: 'jna', version: '3.5.2'