luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[2.x] Switch to using shaded-gson 

Fixes https://github.com/sbt/sbt/issues/8334
This commit is contained in:
Eugene Yokota 2025-12-15 02:37:04 -05:00
parent 5245bf2b5e
commit 9888aae7fa
9 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sbt
View File

@ -433,6 +433,10 @@ lazy val workerProj = (project in file("worker"))
// run / fork := false,
Test / fork := true,
mimaSettings,
mimaBinaryIssueFilters ++= Vector(
exclude[MissingClassProblem]("com.google.gson.typeadapters.RuntimeTypeAdapterFactory"),
exclude[IncompatibleResultTypeProblem]("sbt.internal.worker1.WorkerMain.mkGson"),
),
)
.configure(addSbtIOForTest)

2
main-actions/src/main/scala/sbt/ForkTests.scala
View File

@ -8,7 +8,7 @@
package sbt
import com.google.gson.{ JsonObject, JsonParser, JsonSyntaxException }
import org.scalasbt.shadedgson.com.google.gson.{ JsonObject, JsonParser, JsonSyntaxException }
import testing.{ Logger as _, Task as _, * }
import java.io.*
import java.util.ArrayList

2
main-actions/src/main/scala/sbt/internal/WorkerExchange.scala
View File

@ -9,7 +9,7 @@
package sbt
package internal
import com.google.gson.Gson
import org.scalasbt.shadedgson.com.google.gson.Gson
import java.io.*
import sbt.io.IO
import sbt.internal.worker1.*

2
project/Dependencies.scala
View File

@ -90,7 +90,7 @@ object Dependencies {
val templateResolverApi = "org.scala-sbt" % "template-resolver" % "0.1"
val remoteapis =
"com.eed3si9n.remoteapis.shaded" % "shaded-remoteapis-java" % "2.3.0-M1-52317e00d8d4c37fa778c628485d220fb68a8d08"
val gson = "com.google.code.gson" % "gson" % "2.13.1"
val gson = "org.scala-sbt.gson" % "shaded-gson" % "2.13.1"
val scalaCompiler = "org.scala-lang" %% "scala3-compiler" % scala3
val scala3Library = "org.scala-lang" %% "scala3-library" % scala3

2
sbt-app/src/sbt-test/dependency-management/update-sbt-classifiers/build.sbt
View File

@ -33,7 +33,6 @@ lazy val root = (project in file("."))
"com.eed3si9n:sjson-new-scalajson_3",
"com.github.ben-manes.caffeine:caffeine",
"com.github.mwiede:jsch",
"com.google.code.gson:gson",
"com.google.errorprone:error_prone_annotations",
"com.lmax:disruptor",
"com.swoval:file-tree-views",
@ -77,6 +76,7 @@ lazy val root = (project in file("."))
"org.scala-sbt:zinc-core_3",
"org.scala-sbt:zinc-persist_3",
"org.scala-sbt:zinc_3",
"org.scala-sbt.gson:shaded-gson",
"org.slf4j:slf4j-api",
)
def assertCollectionsEqual(message: String, expected: Seq[String], actual: Seq[String]): Unit =

24
worker/src/main/java/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java → worker/src/main/java/org/scalasbt/shadedgson/com/google/gson/typeadapters/RuntimeTypeAdapterFactory.java
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;

2
worker/src/main/java/sbt/internal/worker1/ForkTestMain.java
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.*;

12
worker/src/main/java/sbt/internal/worker1/ThrowableAdapterFactory.java
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;

14
worker/src/main/java/sbt/internal/worker1/WorkerMain.java
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;