Merge PRs #1423 by @msteiger and #1436 by @flo - library updates

develop
Rasmus Praestholm 2014-12-11 00:12:14 -05:00
commit e9b06d99d0
6 changed files with 1096 additions and 1197 deletions

View File

@ -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'

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Protocol Buffers - Google's data interchange format
Copyright 2008 Google Inc.
http://code.google.com/p/protobuf/
https://developers.google.com/protocol-buffers/
This package contains a precompiled Win32 binary version of the protocol buffer
compiler (protoc). This binary is intended for Windows users who want to
@ -12,4 +12,4 @@ the C++ compiler used.
You will still need to download the source code package in order to obtain the
Java or Python runtime libraries. Get it from:
http://code.google.com/p/protobuf/downloads/
https://github.com/google/protobuf/releases/