From 446bf92196e611f40b95757f0a7c76a30b307c3d Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Sun, 6 Feb 2022 19:10:20 +0100
Subject: [PATCH] Make some $Gson$Types members package-private again to
 prevent synthetic accessors

---
 .../java/com/google/gson/internal/$Gson$Types.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gson/src/main/java/com/google/gson/internal/$Gson$Types.java b/gson/src/main/java/com/google/gson/internal/$Gson$Types.java
index 00c49671b2..48be0204f0 100644
--- a/gson/src/main/java/com/google/gson/internal/$Gson$Types.java
+++ b/gson/src/main/java/com/google/gson/internal/$Gson$Types.java
@@ -42,7 +42,7 @@
  * @author Jesse Wilson
  */
 public final class $Gson$Types {
-  private static final Type[] EMPTY_TYPE_ARRAY = new Type[] {};
+  static final Type[] EMPTY_TYPE_ARRAY = new Type[] {};
 
   private $Gson$Types() {
     throw new UnsupportedOperationException();
@@ -228,10 +228,6 @@ public static boolean equals(Type a, Type b) {
     }
   }
 
-  private static int hashCodeOrZero(Object o) {
-    return o != null ? o.hashCode() : 0;
-  }
-
   public static String typeToString(Type type) {
     return type instanceof Class ? ((Class<?>) type).getName() : type.toString();
   }
@@ -480,7 +476,7 @@ private static Class<?> declaringClassOf(TypeVariable<?> typeVariable) {
         : null;
   }
 
-  private static void checkNotPrimitive(Type type) {
+  static void checkNotPrimitive(Type type) {
     checkArgument(!(type instanceof Class<?>) || !((Class<?>) type).isPrimitive());
   }
 
@@ -525,6 +521,10 @@ public Type getOwnerType() {
           && $Gson$Types.equals(this, (ParameterizedType) other);
     }
 
+    private static int hashCodeOrZero(Object o) {
+      return o != null ? o.hashCode() : 0;
+    }
+
     @Override public int hashCode() {
       return Arrays.hashCode(typeArguments)
           ^ rawType.hashCode()