Rebase android-json to avoid conflicts with org.json. This patch rebases android-json from org.json to c.g.g.thirdparty.json. In the future it will probably make sense to migrate to unrebased GSON. Bug: issue 8762. Change-Id: I47352cebdd8d8092dd512f2bd6b623ff8022d854
diff --git a/eclipse/dev/.classpath b/eclipse/dev/.classpath index e0d44b3..4441746 100644 --- a/eclipse/dev/.classpath +++ b/eclipse/dev/.classpath
@@ -23,9 +23,9 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/compiler-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/apache/commons/commons-collections-3.2.1.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> <classpathentry kind="output" path="bin"/>
diff --git a/eclipse/dev/codeserver/.classpath b/eclipse/dev/codeserver/.classpath index 5837833..0318d20 100644 --- a/eclipse/dev/codeserver/.classpath +++ b/eclipse/dev/codeserver/.classpath
@@ -5,8 +5,8 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/compiler-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/compiler-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
diff --git a/eclipse/user/.classpath b/eclipse/user/.classpath index 1837fd6..eaf6462 100644 --- a/eclipse/user/.classpath +++ b/eclipse/user/.classpath
@@ -37,7 +37,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android.jar" sourcepath="/GWT_TOOLS/lib/json/android-sdk-19.1/json-android-sources.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased.jar" sourcepath="/GWT_TOOLS/lib/json/android-sdk-19.1/json-android-rebased-sources.jar"/> <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA.jar" sourcepath="/GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/> <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/javax/validation/validation-api-1.0.0.GA-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/> @@ -62,7 +62,7 @@ <classpathentry kind="var" path="GWT_TOOLS/lib/testng/testng-5.14.1-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/testng/testng-5.14.1-nojunit.jar" sourcepath="/GWT_TOOLS/lib/testng/testng-5.14.1-sources.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/> - <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118/sourcemap-rebased.jar"/> + <classpathentry kind="var" path="GWT_TOOLS/lib/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdt-3.10.0.jar"/> <classpathentry kind="var" path="GWT_TOOLS/lib/eclipse/jdtCompilerAdapter-3.10.0.jar"/> <classpathentry kind="output" path="bin"/>