- changed org.json to org.cloudinary.json due to Android optimization issues .

- removed dependency on SimpleJSON from tablib

Author: Daniel Cohen

cloudinary-android-test/pom.xml

@@ -15,6 +15,12 @@
   <name>Cloudinary Android Test Project</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.cloudinary</groupId>
+      <artifactId>cloudinary-android</artifactId>
+      <type>jar</type>
+      <version>1.1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android</artifactId>
@@ -27,18 +33,7 @@
       <version>2.3.1</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.cloudinary</groupId>
-      <artifactId>cloudinary</artifactId>
-      <type>jar</type>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.cloudinary</groupId>
-      <artifactId>cloudinary-android</artifactId>
-      <type>jar</type>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

cloudinary-android-test/src/main/java/com/cloudinary/test/UploaderTest.java

@@ -8,8 +8,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
+import org.cloudinary.json.JSONArray;
+import org.cloudinary.json.JSONObject;
 
 import android.test.InstrumentationTestCase;
 import android.util.Log;
@@ -23,6 +23,7 @@
 
 public class UploaderTest extends InstrumentationTestCase {
 
+	
 	private Cloudinary cloudinary;
 	private static boolean first = true;
 

cloudinary-android/pom.xml

@@ -18,6 +18,11 @@
   <name>Cloudinary Android Library</name>
 
   <dependencies>
+    <dependency>
+      <groupId>com.cloudinary</groupId>
+      <artifactId>cloudinary-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android</artifactId>
@@ -30,11 +35,6 @@
       <version>2.3.1</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.cloudinary</groupId>
-      <artifactId>cloudinary</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
 
   <build>

cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

@@ -8,8 +8,8 @@
 import java.util.Collection;
 import java.util.Map;
 
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.cloudinary.json.JSONException;
+import org.cloudinary.json.JSONObject;
 
 import com.cloudinary.strategies.AbstractUploaderStrategy;
 import com.cloudinary.utils.ObjectUtils;

cloudinary-core/pom.xml

@@ -7,7 +7,7 @@
         <version>1.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>cloudinary</artifactId>
+    <artifactId>cloudinary-core</artifactId>
     <packaging>jar</packaging>
 
 </project>

cloudinary-core/src/main/java/com/cloudinary/Uploader.java

@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.json.JSONObject;
+import org.cloudinary.json.JSONObject;
 
 import com.cloudinary.strategies.AbstractUploaderStrategy;
 import com.cloudinary.utils.ObjectUtils;

cloudinary-core/src/main/java/com/cloudinary/utils/ObjectUtils.java

@@ -9,9 +9,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.cloudinary.json.JSONArray;
+import org.cloudinary.json.JSONException;
+import org.cloudinary.json.JSONObject;
+
 
 public class ObjectUtils {