Merge branch 'master' into develop

This commit is contained in:
Binary Wang 2020-06-16 13:55:53 +08:00
commit 2769f506c6

View File

@ -175,11 +175,10 @@
<artifactId>xstream</artifactId>
<version>1.4.11.1</version>
</dependency>
<!-- 由于guava较新的21.0版本需要jdk8故而此处采用较低版本 -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>20.0</version>
<version>29.0-android</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>