From 40b25d5606f0f95d18f83a56d1a6e0bb21051be9 Mon Sep 17 00:00:00 2001 From: fractalwrench Date: Wed, 16 Jan 2019 10:21:44 +0000 Subject: [PATCH 1/4] build: update vendored GSON dependency to latest available version (ada597e) --- .../java/com/bugsnag/android/JsonScope.java | 72 ++++ .../java/com/bugsnag/android/JsonStream.java | 2 +- .../java/com/bugsnag/android/JsonWriter.java | 334 ++++++++---------- 3 files changed, 213 insertions(+), 195 deletions(-) create mode 100644 sdk/src/main/java/com/bugsnag/android/JsonScope.java diff --git a/sdk/src/main/java/com/bugsnag/android/JsonScope.java b/sdk/src/main/java/com/bugsnag/android/JsonScope.java new file mode 100644 index 0000000000..d878a9e8a1 --- /dev/null +++ b/sdk/src/main/java/com/bugsnag/android/JsonScope.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2010 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.bugsnag.android; + +/** + * Lexical scoping elements within a JSON reader or writer. + * + * @author Jesse Wilson + * @since 1.6 + */ +@SuppressWarnings("all") +final class JsonScope { + + /** + * An array with no elements requires no separators or newlines before + * it is closed. + */ + static final int EMPTY_ARRAY = 1; + + /** + * A array with at least one value requires a comma and newline before + * the next element. + */ + static final int NONEMPTY_ARRAY = 2; + + /** + * An object with no name/value pairs requires no separators or newlines + * before it is closed. + */ + static final int EMPTY_OBJECT = 3; + + /** + * An object whose most recent element is a key. The next element must + * be a value. + */ + static final int DANGLING_NAME = 4; + + /** + * An object with at least one name/value pair requires a comma and + * newline before the next element. + */ + static final int NONEMPTY_OBJECT = 5; + + /** + * No object or array has been started. + */ + static final int EMPTY_DOCUMENT = 6; + + /** + * A document with at an array or object. + */ + static final int NONEMPTY_DOCUMENT = 7; + + /** + * A document that's been closed and cannot be accessed. + */ + static final int CLOSED = 8; +} diff --git a/sdk/src/main/java/com/bugsnag/android/JsonStream.java b/sdk/src/main/java/com/bugsnag/android/JsonStream.java index 89bd103456..3ecaad0f6e 100644 --- a/sdk/src/main/java/com/bugsnag/android/JsonStream.java +++ b/sdk/src/main/java/com/bugsnag/android/JsonStream.java @@ -69,7 +69,7 @@ public void value(@NonNull File file) throws IOException { } super.flush(); - beforeValue(false); // add comma if in array + beforeValue(); // add comma if in array // Copy the file contents onto the stream Reader input = null; diff --git a/sdk/src/main/java/com/bugsnag/android/JsonWriter.java b/sdk/src/main/java/com/bugsnag/android/JsonWriter.java index 4ce3465240..c33ba4b3c2 100644 --- a/sdk/src/main/java/com/bugsnag/android/JsonWriter.java +++ b/sdk/src/main/java/com/bugsnag/android/JsonWriter.java @@ -16,38 +16,42 @@ package com.bugsnag.android; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import static com.bugsnag.android.JsonScope.DANGLING_NAME; +import static com.bugsnag.android.JsonScope.EMPTY_ARRAY; +import static com.bugsnag.android.JsonScope.EMPTY_DOCUMENT; +import static com.bugsnag.android.JsonScope.EMPTY_OBJECT; +import static com.bugsnag.android.JsonScope.NONEMPTY_ARRAY; +import static com.bugsnag.android.JsonScope.NONEMPTY_DOCUMENT; +import static com.bugsnag.android.JsonScope.NONEMPTY_OBJECT; import java.io.Closeable; +import java.io.Flushable; import java.io.IOException; import java.io.Writer; -import java.util.ArrayList; -import java.util.List; /** - * Writes a JSON (RFC 4627) + * Writes a JSON (RFC 7159) * encoded value to a stream, one token at a time. The stream includes both * literal values (strings, numbers, booleans and nulls) as well as the begin * and end delimiters of objects and arrays. - *

+ * *

Encoding JSON

* To encode your data as JSON, create a new {@code JsonWriter}. Each JSON * document must contain one top-level array or object. Call methods on the * writer as you walk the structure's contents, nesting arrays and objects as * necessary: * - *

+ * *

Example

* Suppose we'd like to encode a stream of messages such as the following: 
 {@code
  * [
@@ -73,11 +77,11 @@
  * This code encodes the above structure: 
   {@code
  *   public void writeJsonStream(OutputStream out, List messages) throws IOException {
  *     JsonWriter writer = new JsonWriter(new OutputStreamWriter(out, "UTF-8"));
- *     writer.setIndentSpaces(4);
+ *     writer.setIndent("    ");
  *     writeMessagesArray(writer, messages);
  *     writer.close();
  *   }
- * 

+ *
  *   public void writeMessagesArray(JsonWriter writer, List messages) throws IOException {
  *     writer.beginArray();
  *     for (Message message : messages) {
@@ -85,7 +89,7 @@
  *     }
  *     writer.endArray();
  *   }
- * 

+ *
  *   public void writeMessage(JsonWriter writer, Message message) throws IOException {
  *     writer.beginObject();
  *     writer.name("id").value(message.getId());
@@ -100,14 +104,14 @@
  *     writeUser(writer, message.getUser());
  *     writer.endObject();
  *   }
- * 

+ *
  *   public void writeUser(JsonWriter writer, User user) throws IOException {
  *     writer.beginObject();
  *     writer.name("name").value(user.getName());
  *     writer.name("followers_count").value(user.getFollowersCount());
  *     writer.endObject();
  *   }
- * 

+ *
  *   public void writeDoublesArray(JsonWriter writer, List doubles) throws IOException {
  *     writer.beginArray();
  *     for (Double value : doubles) {
@@ -115,7 +119,7 @@
  *     }
  *     writer.endArray();
  *   }}

- * 

+ *
  * 
Each {@code JsonWriter} may be used to write a single JSON stream.
  * Instances of this class are not thread safe. Calls that would result in a
  * malformed JSON string will fail with an {@link IllegalStateException}.
@@ -123,65 +127,11 @@
  * @author Jesse Wilson
  * @since 1.6
  */
-@SuppressWarnings({"checkstyle:AvoidEscapedUnicodeCharacters", "checkstyle:IllegalTokenText"})
-public class JsonWriter implements Closeable {
-
-    /**
-     * Lexical scoping elements within a JSON reader or writer.
-     *
-     * @author Jesse Wilson
-     * @since 1.6
-     */
-    enum JsonScope {
-
-        /**
-         * An array with no elements requires no separators or newlines before
-         * it is closed.
-         */
-        EMPTY_ARRAY,
-
-        /**
-         * A array with at least one value requires a comma and newline before
-         * the next element.
-         */
-        NONEMPTY_ARRAY,
-
-        /**
-         * An object with no name/value pairs requires no separators or newlines
-         * before it is closed.
-         */
-        EMPTY_OBJECT,
-
-        /**
-         * An object whose most recent element is a key. The next element must
-         * be a value.
-         */
-        DANGLING_NAME,
-
-        /**
-         * An object with at least one name/value pair requires a comma and
-         * newline before the next element.
-         */
-        NONEMPTY_OBJECT,
-
-        /**
-         * No object or array has been started.
-         */
-        EMPTY_DOCUMENT,
-
-        /**
-         * A document with at an array or object.
-         */
-        NONEMPTY_DOCUMENT,
-
-        /**
-         * A document that's been closed and cannot be accessed.
-         */
-        CLOSED,
-    }
+@SuppressWarnings("all")
+class JsonWriter implements Closeable, Flushable {
 
     /*
-     * From RFC 4627, "All Unicode characters may be placed within the
+     * From RFC 7159, "All Unicode characters may be placed within the
      * quotation marks except for the characters that must be escaped:
      * quotation mark, reverse solidus, and the control characters
      * (U+0000 through U+001F)."
@@ -190,10 +140,8 @@ enum JsonScope {
      * newline characters. This prevents eval() from failing with a syntax
      * error. http://code.google.com/p/google-gson/issues/detail?id=341
      */
-    @NonNull
     private static final String[] REPLACEMENT_CHARS;
     private static final String[] HTML_SAFE_REPLACEMENT_CHARS;
-
     static {
         REPLACEMENT_CHARS = new String[128];
         for (int i = 0; i <= 0x1f; i++) {
@@ -214,36 +162,30 @@ enum JsonScope {
         HTML_SAFE_REPLACEMENT_CHARS['\''] = "\\u0027";
     }
 
-    /**
-     * The output data, containing at most one top-level array or object.
-     */
-    @Nullable
+    /** The output data, containing at most one top-level array or object. */
     private final Writer out;
 
-    private final List stack = new ArrayList<>();
-
+    private int[] stack = new int[32];
+    private int stackSize = 0;
     {
-        stack.add(JsonScope.EMPTY_DOCUMENT);
+        push(EMPTY_DOCUMENT);
     }
 
     /**
      * A string containing a full set of spaces for a single level of
      * indentation, or null for no pretty printing.
      */
-    @Nullable
     private String indent;
 
     /**
      * The name/value separator; either ":" or ": ".
      */
-    @NonNull
     private String separator = ":";
 
     private boolean lenient;
 
     private boolean htmlSafe;
 
-    @Nullable
     private String deferredName;
 
     private boolean serializeNulls = true;
@@ -253,7 +195,7 @@ enum JsonScope {
      * For best performance, ensure {@link Writer} is buffered; wrapping in
      * {@link java.io.BufferedWriter BufferedWriter} if necessary.
      */
-    public JsonWriter(@Nullable Writer out) {
+    public JsonWriter(Writer out) {
         if (out == null) {
             throw new NullPointerException("out == null");
         }
@@ -268,7 +210,7 @@ public JsonWriter(@Nullable Writer out) {
      *
      * @param indent a string containing only whitespace.
      */
-    public final void setIndent(@NonNull String indent) {
+    public final void setIndent(String indent) {
         if (indent.length() == 0) {
             this.indent = null;
             this.separator = ":";
@@ -281,13 +223,13 @@ public final void setIndent(@NonNull String indent) {
     /**
      * Configure this writer to relax its syntax rules. By default, this writer
      * only emits well-formed JSON as specified by RFC 4627. Setting the writer
+     * href="http://www.ietf.org/rfc/rfc7159.txt">RFC 7159. Setting the writer
      * to lenient permits the following:
      * 

      */
     public final void setLenient(boolean lenient) {
@@ -342,10 +284,9 @@ public final boolean getSerializeNulls() {
      *
      * @return this writer.
      */
-    @NonNull
     public JsonWriter beginArray() throws IOException {
         writeDeferredName();
-        return open(JsonScope.EMPTY_ARRAY, "[");
+        return open(EMPTY_ARRAY, "[");
     }
 
     /**
@@ -353,9 +294,8 @@ public JsonWriter beginArray() throws IOException {
      *
      * @return this writer.
      */
-    @NonNull
     public JsonWriter endArray() throws IOException {
-        return close(JsonScope.EMPTY_ARRAY, JsonScope.NONEMPTY_ARRAY, "]");
+        return close(EMPTY_ARRAY, NONEMPTY_ARRAY, "]");
     }
 
     /**
@@ -364,10 +304,9 @@ public JsonWriter endArray() throws IOException {
      *
      * @return this writer.
      */
-    @NonNull
     public JsonWriter beginObject() throws IOException {
         writeDeferredName();
-        return open(JsonScope.EMPTY_OBJECT, "{");
+        return open(EMPTY_OBJECT, "{");
     }
 
     /**
@@ -375,19 +314,17 @@ public JsonWriter beginObject() throws IOException {
      *
      * @return this writer.
      */
-    @NonNull
     public JsonWriter endObject() throws IOException {
-        return close(JsonScope.EMPTY_OBJECT, JsonScope.NONEMPTY_OBJECT, "}");
+        return close(EMPTY_OBJECT, NONEMPTY_OBJECT, "}");
     }
 
     /**
      * Enters a new scope by appending any necessary whitespace and the given
      * bracket.
      */
-    @NonNull
-    private JsonWriter open(JsonScope empty, @NonNull String openBracket) throws IOException {
-        beforeValue(true);
-        stack.add(empty);
+    private JsonWriter open(int empty, String openBracket) throws IOException {
+        beforeValue();
+        push(empty);
         out.write(openBracket);
         return this;
     }
@@ -396,18 +333,17 @@ private JsonWriter open(JsonScope empty, @NonNull String openBracket) throws IOE
      * Closes the current scope by appending any necessary whitespace and the
      * given bracket.
      */
-    @NonNull
-    private JsonWriter close(JsonScope empty, JsonScope nonempty, @NonNull String closeBracket)
+    private JsonWriter close(int empty, int nonempty, String closeBracket)
         throws IOException {
-        JsonScope context = peek();
+        int context = peek();
         if (context != nonempty && context != empty) {
-            throw new IllegalStateException("Nesting problem: " + stack);
+            throw new IllegalStateException("Nesting problem.");
         }
         if (deferredName != null) {
             throw new IllegalStateException("Dangling name: " + deferredName);
         }
 
-        stack.remove(stack.size() - 1);
+        stackSize--;
         if (context == nonempty) {
             newline();
         }
@@ -415,37 +351,30 @@ private JsonWriter close(JsonScope empty, JsonScope nonempty, @NonNull String cl
         return this;
     }
 
-    /**
-     * Flushes and closes this writer and the underlying {@link Writer}.
-     *
-     * @throws IOException if the JSON document is incomplete.
-     */
-    public void close() throws IOException {
-        out.close();
-
-        int size = stack.size();
-        if (size > 1 || size == 1 && stack.get(size - 1) != JsonScope.NONEMPTY_DOCUMENT) {
-            throw new IOException("Incomplete document");
+    private void push(int newTop) {
+        if (stackSize == stack.length) {
+            int[] newStack = new int[stackSize * 2];
+            System.arraycopy(stack, 0, newStack, 0, stackSize);
+            stack = newStack;
         }
-        stack.clear();
+        stack[stackSize++] = newTop;
     }
 
     /**
      * Returns the value on the top of the stack.
      */
-    private JsonScope peek() {
-        int size = stack.size();
-        if (size == 0) {
+    private int peek() {
+        if (stackSize == 0) {
             throw new IllegalStateException("JsonWriter is closed.");
         }
-        return stack.get(size - 1);
+        return stack[stackSize - 1];
     }
 
     /**
      * Replace the value on the top of the stack with the given value.
      */
-    private void replaceTop(JsonScope topOfStack) {
-        stack.set(stack.size() - 1, topOfStack);
+    private void replaceTop(int topOfStack) {
+        stack[stackSize - 1] = topOfStack;
     }
 
     /**
@@ -454,15 +383,14 @@ private void replaceTop(JsonScope topOfStack) {
      * @param name the name of the forthcoming value. May not be null.
      * @return this writer.
      */
-    @NonNull
-    public JsonWriter name(@Nullable String name) throws IOException {
+    public JsonWriter name(String name) throws IOException {
         if (name == null) {
             throw new NullPointerException("name == null");
         }
         if (deferredName != null) {
             throw new IllegalStateException();
         }
-        if (stack.isEmpty()) {
+        if (stackSize == 0) {
             throw new IllegalStateException("JsonWriter is closed.");
         }
         deferredName = name;
@@ -478,39 +406,54 @@ private void writeDeferredName() throws IOException {
     }
 
     /**
-     * Encodes {@code null}.
+     * Encodes {@code value}.
      *
+     * @param value the literal string value, or null to encode a null literal.
      * @return this writer.
      */
-    @NonNull
-    public JsonWriter nullValue() throws IOException {
-        if (deferredName != null) {
-            if (serializeNulls) {
-                writeDeferredName();
-            } else {
-                deferredName = null;
-                return this; // skip the name and the value
-            }
+    public JsonWriter value(String value) throws IOException {
+        if (value == null) {
+            return nullValue();
         }
-        beforeValue(false);
-        out.write("null");
+        writeDeferredName();
+        beforeValue();
+        string(value);
         return this;
     }
 
     /**
-     * Encodes {@code value}.
+     * Writes {@code value} directly to the writer without quoting or
+     * escaping.
      *
      * @param value the literal string value, or null to encode a null literal.
      * @return this writer.
      */
-    @NonNull
-    public JsonWriter value(@Nullable String value) throws IOException {
+    public JsonWriter jsonValue(String value) throws IOException {
         if (value == null) {
             return nullValue();
         }
         writeDeferredName();
-        beforeValue(false);
-        string(value);
+        beforeValue();
+        out.append(value);
+        return this;
+    }
+
+    /**
+     * Encodes {@code null}.
+     *
+     * @return this writer.
+     */
+    public JsonWriter nullValue() throws IOException {
+        if (deferredName != null) {
+            if (serializeNulls) {
+                writeDeferredName();
+            } else {
+                deferredName = null;
+                return this; // skip the name and the value
+            }
+        }
+        beforeValue();
+        out.write("null");
         return this;
     }
 
@@ -519,10 +462,9 @@ public JsonWriter value(@Nullable String value) throws IOException {
      *
      * @return this writer.
      */
-    @NonNull
     public JsonWriter value(boolean value) throws IOException {
         writeDeferredName();
-        beforeValue(false);
+        beforeValue();
         out.write(value ? "true" : "false");
         return this;
     }
@@ -532,13 +474,12 @@ public JsonWriter value(boolean value) throws IOException {
      *
      * @return this writer.
      */
-    @NonNull
-    public JsonWriter value(@Nullable Boolean value) throws IOException {
+    public JsonWriter value(Boolean value) throws IOException {
         if (value == null) {
             return nullValue();
         }
         writeDeferredName();
-        beforeValue(false);
+        beforeValue();
         out.write(value ? "true" : "false");
         return this;
     }
@@ -547,16 +488,15 @@ public JsonWriter value(@Nullable Boolean value) throws IOException {
      * Encodes {@code value}.
      *
      * @param value a finite value. May not be {@link Double#isNaN() NaNs} or
-     *              {@link Double#isInfinite() infinities}.
+     *     {@link Double#isInfinite() infinities}.
      * @return this writer.
      */
-    @NonNull
     public JsonWriter value(double value) throws IOException {
-        if (Double.isNaN(value) || Double.isInfinite(value)) {
+        writeDeferredName();
+        if (!lenient && (Double.isNaN(value) || Double.isInfinite(value))) {
             throw new IllegalArgumentException("Numeric values must be finite, but was " + value);
         }
-        writeDeferredName();
-        beforeValue(false);
+        beforeValue();
         out.append(Double.toString(value));
         return this;
     }
@@ -566,10 +506,9 @@ public JsonWriter value(double value) throws IOException {
      *
      * @return this writer.
      */
-    @NonNull
     public JsonWriter value(long value) throws IOException {
         writeDeferredName();
-        beforeValue(false);
+        beforeValue();
         out.write(Long.toString(value));
         return this;
     }
@@ -578,11 +517,10 @@ public JsonWriter value(long value) throws IOException {
      * Encodes {@code value}.
      *
      * @param value a finite value. May not be {@link Double#isNaN() NaNs} or
-     *              {@link Double#isInfinite() infinities}.
+     *     {@link Double#isInfinite() infinities}.
      * @return this writer.
      */
-    @NonNull
-    public JsonWriter value(@Nullable Number value) throws IOException {
+    public JsonWriter value(Number value) throws IOException {
         if (value == null) {
             return nullValue();
         }
@@ -593,7 +531,7 @@ public JsonWriter value(@Nullable Number value) throws IOException {
             && (string.equals("-Infinity") || string.equals("Infinity") || string.equals("NaN"))) {
             throw new IllegalArgumentException("Numeric values must be finite, but was " + value);
         }
-        beforeValue(false);
+        beforeValue();
         out.append(string);
         return this;
     }
@@ -603,28 +541,43 @@ public JsonWriter value(@Nullable Number value) throws IOException {
      * and flushes that writer.
      */
     public void flush() throws IOException {
-        if (stack.isEmpty()) {
+        if (stackSize == 0) {
             throw new IllegalStateException("JsonWriter is closed.");
         }
         out.flush();
     }
 
-    private void string(@NonNull String value) throws IOException {
+    /**
+     * Flushes and closes this writer and the underlying {@link Writer}.
+     *
+     * @throws IOException if the JSON document is incomplete.
+     */
+    public void close() throws IOException {
+        out.close();
+
+        int size = stackSize;
+        if (size > 1 || size == 1 && stack[size - 1] != NONEMPTY_DOCUMENT) {
+            throw new IOException("Incomplete document");
+        }
+        stackSize = 0;
+    }
+
+    private void string(String value) throws IOException {
         String[] replacements = htmlSafe ? HTML_SAFE_REPLACEMENT_CHARS : REPLACEMENT_CHARS;
         out.write("\"");
         int last = 0;
         int length = value.length();
         for (int i = 0; i < length; i++) {
-            char charAt = value.charAt(i);
+            char c = value.charAt(i);
             String replacement;
-            if (charAt < 128) {
-                replacement = replacements[charAt];
+            if (c < 128) {
+                replacement = replacements[c];
                 if (replacement == null) {
                     continue;
                 }
-            } else if (charAt == '\u2028') {
+            } else if (c == '\u2028') {
                 replacement = "\\u2028";
-            } else if (charAt == '\u2029') {
+            } else if (c == '\u2029') {
                 replacement = "\\u2029";
             } else {
                 continue;
@@ -647,7 +600,7 @@ private void newline() throws IOException {
         }
 
         out.write("\n");
-        for (int i = 1; i < stack.size(); i++) {
+        for (int i = 1, size = stackSize; i < size; i++) {
             out.write(indent);
         }
     }
@@ -657,26 +610,23 @@ private void newline() throws IOException {
      * adjusts the stack to expect the name's value.
      */
     private void beforeName() throws IOException {
-        JsonScope context = peek();
-        if (context == JsonScope.NONEMPTY_OBJECT) { // first in object
+        int context = peek();
+        if (context == NONEMPTY_OBJECT) { // first in object
             out.write(',');
-        } else if (context != JsonScope.EMPTY_OBJECT) { // not in an object!
-            throw new IllegalStateException("Nesting problem: " + stack);
+        } else if (context != EMPTY_OBJECT) { // not in an object!
+            throw new IllegalStateException("Nesting problem.");
         }
         newline();
-        replaceTop(JsonScope.DANGLING_NAME);
+        replaceTop(DANGLING_NAME);
     }
 
     /**
      * Inserts any necessary separators and whitespace before a literal value,
      * inline array, or inline object. Also adjusts the stack to expect either a
      * closing bracket or another element.
-     *
-     * @param root true if the value is a new array or object, the two values
-     *             permitted as top-level elements.
      */
     @SuppressWarnings("fallthrough")
-    void beforeValue(boolean root) throws IOException {
+    void beforeValue() throws IOException {
         switch (peek()) {
             case NONEMPTY_DOCUMENT:
                 if (!lenient) {
@@ -685,15 +635,11 @@ void beforeValue(boolean root) throws IOException {
                 }
                 // fall-through
             case EMPTY_DOCUMENT: // first in document
-                if (!lenient && !root) {
-                    throw new IllegalStateException(
-                        "JSON must start with an array or an object.");
-                }
-                replaceTop(JsonScope.NONEMPTY_DOCUMENT);
+                replaceTop(NONEMPTY_DOCUMENT);
                 break;
 
             case EMPTY_ARRAY: // first in array
-                replaceTop(JsonScope.NONEMPTY_ARRAY);
+                replaceTop(NONEMPTY_ARRAY);
                 newline();
                 break;
 
@@ -704,11 +650,11 @@ void beforeValue(boolean root) throws IOException {
 
             case DANGLING_NAME: // value for name
                 out.append(separator);
-                replaceTop(JsonScope.NONEMPTY_OBJECT);
+                replaceTop(NONEMPTY_OBJECT);
                 break;
 
             default:
-                throw new IllegalStateException("Nesting problem: " + stack);
+                throw new IllegalStateException("Nesting problem.");
         }
     }
 }

From 759c371eb2d42d9c4f9b05fa7eba75f9f39da102 Mon Sep 17 00:00:00 2001
From: fractalwrench 
Date: Wed, 16 Jan 2019 11:36:27 +0000
Subject: [PATCH 2/4] docs: add changelog entry

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a56bb71e1e..334733d147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.X.X (TBD)
+
+* Update vendored GSON dependency to latest available version
+ [#415](https://github.com/bugsnag/bugsnag-android/pull/415)
+
 ## 4.10.0 (2019-01-07)
 
 * Improve kotlin support by allowing property access

From 36f819b292b1b57244ba39ea9ac3cc11991b37c9 Mon Sep 17 00:00:00 2001
From: fractalwrench 
Date: Thu, 17 Jan 2019 14:35:03 +0000
Subject: [PATCH 3/4] docs: document date, tag, and location where gson was
 copied

---
 sdk/src/main/java/com/bugsnag/android/JsonScope.java  | 3 +++
 sdk/src/main/java/com/bugsnag/android/JsonWriter.java | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/sdk/src/main/java/com/bugsnag/android/JsonScope.java b/sdk/src/main/java/com/bugsnag/android/JsonScope.java
index d878a9e8a1..2dc37d8a37 100644
--- a/sdk/src/main/java/com/bugsnag/android/JsonScope.java
+++ b/sdk/src/main/java/com/bugsnag/android/JsonScope.java
@@ -16,6 +16,9 @@
 
 package com.bugsnag.android;
 
+// last retrieved from gson-parent-2.8.5 on 17/01/2019
+// https://github.com/google/gson/tree/gson-parent-2.8.5/gson/src/main/java/com/google/gson/stream
+
 /**
  * Lexical scoping elements within a JSON reader or writer.
  *
diff --git a/sdk/src/main/java/com/bugsnag/android/JsonWriter.java b/sdk/src/main/java/com/bugsnag/android/JsonWriter.java
index c33ba4b3c2..b5f5b2519f 100644
--- a/sdk/src/main/java/com/bugsnag/android/JsonWriter.java
+++ b/sdk/src/main/java/com/bugsnag/android/JsonWriter.java
@@ -16,6 +16,9 @@
 
 package com.bugsnag.android;
 
+// last retrieved from gson-parent-2.8.5 on 17/01/2019
+// https://github.com/google/gson/tree/gson-parent-2.8.5/gson/src/main/java/com/google/gson/stream
+
 import static com.bugsnag.android.JsonScope.DANGLING_NAME;
 import static com.bugsnag.android.JsonScope.EMPTY_ARRAY;
 import static com.bugsnag.android.JsonScope.EMPTY_DOCUMENT;

From 061cf2ff2dba5c25b67bfb04a6a9aad92891edef Mon Sep 17 00:00:00 2001
From: fractalwrench 
Date: Tue, 22 Jan 2019 14:17:53 +0000
Subject: [PATCH 4/4] v4.11.0

---
 CHANGELOG.md                                        | 2 +-
 README.md                                           | 2 +-
 gradle.properties                                   | 2 +-
 sdk/src/main/java/com/bugsnag/android/Notifier.java | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59d8f5f499..88b0579610 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 4.X.X (TBD)
+## 4.11.0 (2019-01-22)
 
 ### Enhancements
 
diff --git a/README.md b/README.md
index af6ece3399..626e3b7b92 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Build status](https://travis-ci.org/bugsnag/bugsnag-android.svg?branch=master)](https://travis-ci.org/bugsnag/bugsnag-android)
 [![Coverage Status](https://coveralls.io/repos/github/bugsnag/bugsnag-android/badge.svg?branch=master)](https://coveralls.io/github/bugsnag/bugsnag-android?branch=master)
 
-![Method count and size](https://img.shields.io/badge/Methods%20and%20size-88%20classes%20|%20678%20methods%20|%20350%20fields%20|%20132%20KB-e91e63.svg)
+![Method count and size](https://img.shields.io/badge/Methods%20and%20size-86%20classes%20|%20688%20methods%20|%20351%20fields%20|%20128%20KB-e91e63.svg)
 
 Get comprehensive [Android crash reports](https://www.bugsnag.com/platforms/android/) to quickly debug errors.
 
diff --git a/gradle.properties b/gradle.properties
index 2a6e0cff03..876778a209 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=4.10.0
+VERSION_NAME=4.11.0
 GROUP=com.bugsnag
 POM_SCM_URL=https://github.com/bugsnag/bugsnag-android
 POM_SCM_CONNECTION=scm:git@github.com:bugsnag/bugsnag-android.git
diff --git a/sdk/src/main/java/com/bugsnag/android/Notifier.java b/sdk/src/main/java/com/bugsnag/android/Notifier.java
index 261432e1d2..2dddd6b0b5 100644
--- a/sdk/src/main/java/com/bugsnag/android/Notifier.java
+++ b/sdk/src/main/java/com/bugsnag/android/Notifier.java
@@ -10,7 +10,7 @@
 public class Notifier implements JsonStream.Streamable {
 
     private static final String NOTIFIER_NAME = "Android Bugsnag Notifier";
-    private static final String NOTIFIER_VERSION = "4.10.0";
+    private static final String NOTIFIER_VERSION = "4.11.0";
     private static final String NOTIFIER_URL = "https://bugsnag.com";
 
     @NonNull