fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #160 from square/jwilson.0502_okio180

Browse Source 
Upgrade to Okio 1.8.0.
This commit is contained in:
Jake Wharton
2016-05-02 01:34:48 -04:00
parent c5a8a302dc 3477c4d743
commit c4896fdaed
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
moshi/src/main/java/com/squareup/moshi/JsonReader.java
View File

@@ -189,12 +189,8 @@ public abstract class JsonReader implements Closeable {
* parser to lenient causes it to ignore the following syntax errors: * parser to lenient causes it to ignore the following syntax errors:
* *
* <ul> * <ul>
* <li>Streams that start with the <a href="#nonexecuteprefix">non-execute
* prefix</a>, <code>")]}'\n"</code>.
* <li>Streams that include multiple top-level values. With strict parsing, * <li>Streams that include multiple top-level values. With strict parsing,
* each stream must contain exactly one top-level value. * each stream must contain exactly one top-level value.
* <li>Top-level values of any type. With strict parsing, the top-level
* value must be an object or an array.
* <li>Numbers may be {@linkplain Double#isNaN() NaNs} or {@link * <li>Numbers may be {@linkplain Double#isNaN() NaNs} or {@link
* Double#isInfinite() infinities}. * Double#isInfinite() infinities}.
* <li>End of line comments starting with {@code //} or {@code #} and * <li>End of line comments starting with {@code //} or {@code #} and

3
moshi/src/main/java/com/squareup/moshi/Moshi.java
View File

@@ -45,7 +45,8 @@ public final class Moshi {
private final Map<Object, JsonAdapter<?>> adapterCache = new LinkedHashMap<>(); private final Map<Object, JsonAdapter<?>> adapterCache = new LinkedHashMap<>();
Moshi(Builder builder) { Moshi(Builder builder) {
List<JsonAdapter.Factory> factories = new ArrayList<>(builder.factories.size() + BUILT_IN_FACTORIES.size()); List<JsonAdapter.Factory> factories = new ArrayList<>(
builder.factories.size() + BUILT_IN_FACTORIES.size());
factories.addAll(builder.factories); factories.addAll(builder.factories);
factories.addAll(BUILT_IN_FACTORIES); factories.addAll(BUILT_IN_FACTORIES);
this.factories = Collections.unmodifiableList(factories); this.factories = Collections.unmodifiableList(factories);

2
pom.xml
View File

@@ -28,7 +28,7 @@
<java.version>1.7</java.version> <java.version>1.7</java.version>
<!-- Dependencies --> <!-- Dependencies -->
<okio.version>1.8.0-SNAPSHOT</okio.version> <okio.version>1.8.0</okio.version>
<!-- Test Dependencies --> <!-- Test Dependencies -->
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>