Skip to content

Gradle shadow gson jar #173

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

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all 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: 3 additions & 2 deletions backtrace-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ android {
}

dependencies {
implementation 'com.google.code.gson:gson:2.12.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.squareup:tape:1.2.3'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation files('../gson/build/libs/gson-backtrace.jar')
testImplementation 'junit:junit:4.13.2'
testImplementation "org.mockito:mockito-core:5.16.0"
testImplementation 'org.json:json:20240303'
Expand All @@ -91,4 +91,5 @@ dependencies {
androidTestImplementation "org.mockito:mockito-android:5.16.0"
}

tasks.preBuild.dependsOn(':gson:shadowJar')
apply from: 'publish.gradle'
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import net.jodah.concurrentunit.Waiter;

Expand Down
2 changes: 1 addition & 1 deletion backtrace-library/src/main/cpp/crashpad
Submodule crashpad updated 364 files
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.common;

import com.google.gson.Gson;
import backtraceio.gson.Gson;

import backtraceio.library.common.serialization.BacktraceGsonBuilder;

Expand Down Expand Up @@ -31,4 +31,4 @@ public static <T> T fromJson(Gson gson, String json, Class<T> type) {
return gson.fromJson(json, type);
}

}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package backtraceio.library.common.serialization;

import com.google.gson.FieldNamingPolicy;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import backtraceio.gson.FieldNamingPolicy;
import backtraceio.gson.Gson;
import backtraceio.gson.GsonBuilder;

public class BacktraceGsonBuilder implements CustomGsonBuilder {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.common.serialization;

import com.google.gson.Gson;
import backtraceio.gson.Gson;

public interface CustomGsonBuilder {
Gson buildGson();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

/**
* Coroner API response
Expand Down Expand Up @@ -31,4 +31,4 @@ public String getRxId() {
public String getResponse() {
return response;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Context;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -331,4 +331,4 @@ private Builder setAnnotations(Map<String, Object> complexAttributes) {
return this;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import backtraceio.library.models.json.BacktraceReport;
import backtraceio.library.models.types.BacktraceResultStatus;
Expand Down Expand Up @@ -104,4 +104,4 @@ public BacktraceReport getBacktraceReport() {
public void setBacktraceReport(BacktraceReport backtraceReport) {
this.backtraceReport = backtraceReport;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package backtraceio.library.models;


import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.UUID;

Expand Down Expand Up @@ -91,4 +91,4 @@ public BacktraceStackFrame(String functionName, String sourceCodeFileName, Integ
this.sourceCode = sourceCodeUuid;
this.line = line;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Context;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.io.File;
import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -274,4 +274,4 @@ public boolean close() {
}
return false;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.json;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import backtraceio.library.models.BacktraceStackFrame;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.json;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

public class EventsMetadata {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.concurrent.ConcurrentLinkedDeque;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.HashMap;
import java.util.Map;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.concurrent.ConcurrentLinkedDeque;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.ArrayList;
import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package backtraceio.library.models.metrics;

import com.google.gson.annotations.SerializedName;
import backtraceio.gson.annotations.SerializedName;

import java.util.concurrent.ConcurrentLinkedDeque;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import com.google.common.collect.MapDifference;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import backtraceio.gson.Gson;
import backtraceio.gson.JsonElement;
import backtraceio.gson.JsonParser;
import backtraceio.gson.reflect.TypeToken;

import org.json.JSONException;
import org.json.JSONObject;
Expand Down
2 changes: 1 addition & 1 deletion example-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {
externalNativeBuild {
cmake {
path "src/main/cpp/CMakeLists.txt"
version "3.31.6"
version "3.22.1"
}
}

Expand Down
2 changes: 1 addition & 1 deletion example-app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
#-renamesourcefileattribute SourceFile

#These are needed since Proguard breaks some Backtrace libraries
-keep class com.google.gson.**.* { *; }
-keep class backtraceio.gson.**.* { *; }
-keep class backtraceio.library.**.* { *; }
1 change: 1 addition & 0 deletions gson/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
22 changes: 22 additions & 0 deletions gson/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
plugins {
id 'java'
id 'com.github.johnrengelman.shadow' version '8.1.1'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'com.google.code.gson:gson:2.12.1'
}

shadowJar {
relocate 'com.google.gson', 'backtraceio.gson'
archiveClassifier.set('backtrace')

// Exclude everything from error_prone
exclude 'com/google/errorprone/**'
}

tasks.build.dependsOn(shadowJar)
3 changes: 2 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
include ':example-app', ':backtrace-library', ':coroner-client'
include ':example-app', ':backtrace-library', ':coroner-client'
include ':gson'
Loading