From 60e6ed912d52716f46a1ba71923ef203c4248857 Mon Sep 17 00:00:00 2001
From: Jesse Wilson <jesse@swank.ca>
Date: Wed, 3 Aug 2011 00:25:10 +0000
Subject: [PATCH] Promote MiniGson to gson.internal.bind

---
 .../java/com/google/gson/internal/bind}/ArrayTypeAdapter.java | 2 +-
 .../com/google/gson/internal/bind}/CollectionTypeAdapter.java | 2 +-
 .../main/java/com/google/gson/internal/bind}/MiniGson.java    | 2 +-
 .../com/google/gson/internal/bind}/ReflectiveTypeAdapter.java | 2 +-
 .../gson/internal/bind}/StringToValueMapTypeAdapter.java      | 2 +-
 .../main/java/com/google/gson/internal/bind}/TypeAdapter.java | 2 +-
 .../java/com/google/gson/internal/bind}/TypeAdapters.java     | 2 +-
 .../java/com/google/gson/internal/bind}/MiniGsonTest.java     | 4 +++-
 8 files changed, 10 insertions(+), 8 deletions(-)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/ArrayTypeAdapter.java (98%)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/CollectionTypeAdapter.java (98%)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/MiniGson.java (99%)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/ReflectiveTypeAdapter.java (99%)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/StringToValueMapTypeAdapter.java (98%)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/TypeAdapter.java (97%)
 rename {extras/src/main/java/com/google/gson/mini => gson/src/main/java/com/google/gson/internal/bind}/TypeAdapters.java (99%)
 rename {extras/src/test/java/com/google/gson/mini => gson/src/test/java/com/google/gson/internal/bind}/MiniGsonTest.java (98%)

diff --git a/extras/src/main/java/com/google/gson/mini/ArrayTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
similarity index 98%
rename from extras/src/main/java/com/google/gson/mini/ArrayTypeAdapter.java
rename to gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
index 13fe79b0..2376d948 100644
--- a/extras/src/main/java/com/google/gson/mini/ArrayTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.internal.$Gson$Types;
 import com.google.gson.reflect.TypeToken;
diff --git a/extras/src/main/java/com/google/gson/mini/CollectionTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapter.java
similarity index 98%
rename from extras/src/main/java/com/google/gson/mini/CollectionTypeAdapter.java
rename to gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapter.java
index 048667b9..a7c43cf7 100644
--- a/extras/src/main/java/com/google/gson/mini/CollectionTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/CollectionTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.internal.$Gson$Types;
 import com.google.gson.reflect.TypeToken;
diff --git a/extras/src/main/java/com/google/gson/mini/MiniGson.java b/gson/src/main/java/com/google/gson/internal/bind/MiniGson.java
similarity index 99%
rename from extras/src/main/java/com/google/gson/mini/MiniGson.java
rename to gson/src/main/java/com/google/gson/internal/bind/MiniGson.java
index d22cf1a6..69b48b5c 100644
--- a/extras/src/main/java/com/google/gson/mini/MiniGson.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/MiniGson.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
diff --git a/extras/src/main/java/com/google/gson/mini/ReflectiveTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapter.java
similarity index 99%
rename from extras/src/main/java/com/google/gson/mini/ReflectiveTypeAdapter.java
rename to gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapter.java
index 621aa436..353ff975 100644
--- a/extras/src/main/java/com/google/gson/mini/ReflectiveTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.internal.$Gson$Types;
 import com.google.gson.reflect.TypeToken;
diff --git a/extras/src/main/java/com/google/gson/mini/StringToValueMapTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/StringToValueMapTypeAdapter.java
similarity index 98%
rename from extras/src/main/java/com/google/gson/mini/StringToValueMapTypeAdapter.java
rename to gson/src/main/java/com/google/gson/internal/bind/StringToValueMapTypeAdapter.java
index ac55419d..3a3d6f6a 100644
--- a/extras/src/main/java/com/google/gson/mini/StringToValueMapTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/StringToValueMapTypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.internal.$Gson$Types;
 import com.google.gson.reflect.TypeToken;
diff --git a/extras/src/main/java/com/google/gson/mini/TypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/TypeAdapter.java
similarity index 97%
rename from extras/src/main/java/com/google/gson/mini/TypeAdapter.java
rename to gson/src/main/java/com/google/gson/internal/bind/TypeAdapter.java
index 8daaedb2..49eb92b4 100644
--- a/extras/src/main/java/com/google/gson/mini/TypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/TypeAdapter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
diff --git a/extras/src/main/java/com/google/gson/mini/TypeAdapters.java b/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
similarity index 99%
rename from extras/src/main/java/com/google/gson/mini/TypeAdapters.java
rename to gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
index 5c5b3985..4bfd71cc 100644
--- a/extras/src/main/java/com/google/gson/mini/TypeAdapters.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
diff --git a/extras/src/test/java/com/google/gson/mini/MiniGsonTest.java b/gson/src/test/java/com/google/gson/internal/bind/MiniGsonTest.java
similarity index 98%
rename from extras/src/test/java/com/google/gson/mini/MiniGsonTest.java
rename to gson/src/test/java/com/google/gson/internal/bind/MiniGsonTest.java
index ccc2ba22..0bdb3eff 100644
--- a/extras/src/test/java/com/google/gson/mini/MiniGsonTest.java
+++ b/gson/src/test/java/com/google/gson/internal/bind/MiniGsonTest.java
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.gson.mini;
+package com.google.gson.internal.bind;
 
+import com.google.gson.internal.bind.MiniGson;
+import com.google.gson.internal.bind.TypeAdapter;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;