luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-03 16:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

[2.x] Switch to using shaded-gson

Browse Source 
Fixes https://github.com/sbt/sbt/issues/8334
This commit is contained in:
Eugene Yokota
2025-12-15 03:17:33 -05:00
parent 5245bf2b5e
commit 9888aae7fa
9 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
worker/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java → worker/src/main/java/org/scalasbt/shadedgson/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java
+12 -12
View File
@@ -14,19 +14,19 @@
* limitations under the License.
*/
package com.google.gson.typeadapters;
package org.scalasbt.shadedgson.com.google.gson.typeadapters;
import com.google.errorprone.annotations.CanIgnoreReturnValue;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonPrimitive;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import org.scalasbt.shadedgson.com.google.errorprone.annotations.CanIgnoreReturnValue;
import org.scalasbt.shadedgson.com.google.gson.Gson;
import org.scalasbt.shadedgson.com.google.gson.JsonElement;
import org.scalasbt.shadedgson.com.google.gson.JsonObject;
import org.scalasbt.shadedgson.com.google.gson.JsonParseException;
import org.scalasbt.shadedgson.com.google.gson.JsonPrimitive;
import org.scalasbt.shadedgson.com.google.gson.TypeAdapter;
import org.scalasbt.shadedgson.com.google.gson.TypeAdapterFactory;
import org.scalasbt.shadedgson.com.google.gson.reflect.TypeToken;
import org.scalasbt.shadedgson.com.google.gson.stream.JsonReader;
import org.scalasbt.shadedgson.com.google.gson.stream.JsonWriter;
import java.io.IOException;
import java.util.LinkedHashMap;
import java.util.Map;
worker/src/main/java/sbt/internal/worker1/ForkTestMain.java
+1 -1
View File
@@ -8,7 +8,7 @@
package sbt.internal.worker1;
import com.google.gson.Gson;
import org.scalasbt.shadedgson.com.google.gson.Gson;
import sbt.testing.*;
worker/src/main/java/sbt/internal/worker1/ThrowableAdapterFactory.java
+6 -6
View File
@@ -8,12 +8,12 @@
package sbt.internal.worker1;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter;
import org.scalasbt.shadedgson.com.google.gson.Gson;
import org.scalasbt.shadedgson.com.google.gson.TypeAdapter;
import org.scalasbt.shadedgson.com.google.gson.TypeAdapterFactory;
import org.scalasbt.shadedgson.com.google.gson.reflect.TypeToken;
import org.scalasbt.shadedgson.com.google.gson.stream.JsonReader;
import org.scalasbt.shadedgson.com.google.gson.stream.JsonWriter;
import java.io.IOException;
import java.util.ArrayList;
worker/src/main/java/sbt/internal/worker1/WorkerMain.java
+7 -7
View File
@@ -8,13 +8,13 @@
package sbt.internal.worker1;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import com.google.gson.typeadapters.RuntimeTypeAdapterFactory;
import org.scalasbt.shadedgson.com.google.gson.Gson;
import org.scalasbt.shadedgson.com.google.gson.GsonBuilder;
import org.scalasbt.shadedgson.com.google.gson.JsonElement;
import org.scalasbt.shadedgson.com.google.gson.JsonObject;
import org.scalasbt.shadedgson.com.google.gson.JsonParser;
import org.scalasbt.shadedgson.com.google.gson.JsonPrimitive;
import org.scalasbt.shadedgson.com.google.gson.typeadapters.RuntimeTypeAdapterFactory;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.IOException;