Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vendored GSON dependency to latest available version #415

Merged
merged 3 commits into from
Jan 18, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
72 changes: 72 additions & 0 deletions sdk/src/main/java/com/bugsnag/android/JsonScope.java
Original file line number Diff line number Diff line change
@@ -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;
}
2 changes: 1 addition & 1 deletion sdk/src/main/java/com/bugsnag/android/JsonStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
bengourley marked this conversation as resolved.
Show resolved Hide resolved

// Copy the file contents onto the stream
Reader input = null;
Expand Down
Loading