diff options
author | Tor Norbye <tnorbye@google.com> | 2012-08-28 20:18:21 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2012-08-29 11:18:20 -0700 |
commit | c2ee341ce56dbee2e1484e04dfe7383656d97d48 (patch) | |
tree | 15e224f778f3bd61fc68700eb0d71dbf65db2508 | |
parent | 04f2ae310a999cfde1e998dc067486132093964b (diff) | |
download | sdk-c2ee341ce56dbee2e1484e04dfe7383656d97d48.zip sdk-c2ee341ce56dbee2e1484e04dfe7383656d97d48.tar.gz sdk-c2ee341ce56dbee2e1484e04dfe7383656d97d48.tar.bz2 |
Update Guava from 10.0.1 to 13.0.1
Change-Id: Ia51e3e2280c3d360496550df50a540571b9b7582
-rw-r--r-- | assetstudio/.classpath | 2 | ||||
-rw-r--r-- | build/tools.atree | 2 | ||||
-rw-r--r-- | common/tests/.classpath | 2 | ||||
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/.classpath | 4 | ||||
-rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF | 2 | ||||
-rwxr-xr-x | eclipse/scripts/create_all_symlinks.sh | 2 | ||||
-rw-r--r-- | layoutlib_api/tests/.classpath | 2 | ||||
-rw-r--r-- | lint/cli/.classpath | 2 | ||||
-rw-r--r-- | lint/cli/etc/manifest.txt | 2 | ||||
-rw-r--r-- | lint/libs/lint_api/.classpath | 2 | ||||
-rw-r--r-- | lint/libs/lint_checks/.classpath | 2 | ||||
-rw-r--r-- | lint/libs/lint_checks/tests/.classpath | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/assetstudio/.classpath b/assetstudio/.classpath index e8cb8e6..d10330f 100644 --- a/assetstudio/.classpath +++ b/assetstudio/.classpath @@ -4,7 +4,7 @@ <classpathentry kind="src" path="tests/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/build/tools.atree b/build/tools.atree index 8f4cc1d..f466d70 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -144,7 +144,7 @@ framework/swing-worker-1.1.jar tools/lib/swing-wo prebuilts/tools/common/asm-tools/asm-4.0.jar tools/lib/asm-4.0.jar prebuilts/tools/common/asm-tools/asm-tree-4.0.jar tools/lib/asm-tree-4.0.jar prebuilts/tools/common/asm-tools/asm-analysis-4.0.jar tools/lib/asm-analysis-4.0.jar -prebuilts/tools/common/guava-tools/guava-10.0.1.jar tools/lib/guava-10.0.1.jar +prebuilts/tools/common/guava-tools/guava-13.0.1.jar tools/lib/guava-13.0.1.jar prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar tools/lib/lombok-ast-0.2.jar # Proguard diff --git a/common/tests/.classpath b/common/tests/.classpath index 15b6472..cda1977 100644 --- a/common/tests/.classpath +++ b/common/tests/.classpath @@ -4,6 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath index 91072d5..767eff0 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath +++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath @@ -5,7 +5,7 @@ <classpathentry exported="true" kind="lib" path="libs/commons-codec-1.4.jar"/> <classpathentry exported="true" kind="lib" path="libs/commons-compress-1.0.jar"/> <classpathentry exported="true" kind="lib" path="libs/commons-logging-1.1.1.jar"/> - <classpathentry exported="true" kind="lib" path="libs/guava-10.0.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/guava-13.0.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/httpclient-4.1.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/httpcore-4.1.jar"/> <classpathentry exported="true" kind="lib" path="libs/httpmime-4.1.1.jar"/> @@ -17,6 +17,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> - <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry exported="true" kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 9472625..6e116dd 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Bundle-ClassPath: ., libs/commons-codec-1.4.jar, libs/commons-compress-1.0.jar, libs/commons-logging-1.1.1.jar, - libs/guava-10.0.1.jar, + libs/guava-13.0.1.jar, libs/httpclient-4.1.1.jar, libs/httpcore-4.1.jar, libs/httpmime-4.1.1.jar, diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh index 395cf78..89abd53 100755 --- a/eclipse/scripts/create_all_symlinks.sh +++ b/eclipse/scripts/create_all_symlinks.sh @@ -112,7 +112,7 @@ BASE_PLUGIN_LIBS="common sdkstats sdklib dvlib layoutlib_api ide_common" BASE_PLUGIN_PREBUILTS="\ prebuilts/misc/common/kxml2/kxml2-2.3.0.jar \ prebuilts/tools/common/commons-compress/commons-compress-1.0.jar \ - prebuilts/tools/common/guava-tools/guava-10.0.1.jar \ + prebuilts/tools/common/guava-tools/guava-13.0.1.jar \ prebuilts/tools/common/http-client/commons-logging-1.1.1.jar \ prebuilts/tools/common/http-client/commons-codec-1.4.jar \ prebuilts/tools/common/http-client/httpclient-4.1.1.jar \ diff --git a/layoutlib_api/tests/.classpath b/layoutlib_api/tests/.classpath index 15b6472..cda1977 100644 --- a/layoutlib_api/tests/.classpath +++ b/layoutlib_api/tests/.classpath @@ -4,6 +4,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/lint/cli/.classpath b/lint/cli/.classpath index fd221d0..d26b12a 100644 --- a/lint/cli/.classpath +++ b/lint/cli/.classpath @@ -8,7 +8,7 @@ <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-analysis-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/> <classpathentry kind="output" path="bin"/> diff --git a/lint/cli/etc/manifest.txt b/lint/cli/etc/manifest.txt index f9c95db..ff04772 100644 --- a/lint/cli/etc/manifest.txt +++ b/lint/cli/etc/manifest.txt @@ -1,2 +1,2 @@ Main-Class: com.android.tools.lint.Main -Class-Path: common.jar layout_lib.jar lint_api.jar lint_checks.jar asm-4.0.jar asm-tree-4.0.jar asm-analysis-4.0.jar guava-10.0.1.jar lombok-ast-0.2.jar sdklib.jar +Class-Path: common.jar layout_lib.jar lint_api.jar lint_checks.jar asm-4.0.jar asm-tree-4.0.jar asm-analysis-4.0.jar guava-13.0.1.jar lombok-ast-0.2.jar sdklib.jar diff --git a/lint/libs/lint_api/.classpath b/lint/libs/lint_api/.classpath index 39495cc..0381385 100644 --- a/lint/libs/lint_api/.classpath +++ b/lint/libs/lint_api/.classpath @@ -5,7 +5,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/common"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry combineaccessrules="false" kind="src" path="/SdkLib"/> diff --git a/lint/libs/lint_checks/.classpath b/lint/libs/lint_checks/.classpath index 4a48734..a8ae948 100644 --- a/lint/libs/lint_checks/.classpath +++ b/lint/libs/lint_checks/.classpath @@ -6,7 +6,7 @@ <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-analysis-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> diff --git a/lint/libs/lint_checks/tests/.classpath b/lint/libs/lint_checks/tests/.classpath index 752dafd..2c94b75 100644 --- a/lint/libs/lint_checks/tests/.classpath +++ b/lint/libs/lint_checks/tests/.classpath @@ -9,7 +9,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/lint-cli"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/asm-tools/asm-tree-4.0.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/asm-tools/src.zip"/> - <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-10.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> + <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/guava-tools/guava-13.0.1.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/guava-tools/src.zip"/> <classpathentry kind="var" path="ANDROID_SRC/prebuilts/tools/common/lombok-ast/lombok-ast-0.2.jar" sourcepath="/ANDROID_SRC/prebuilts/tools/common/lombok-ast/src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/layoutlib_api"/> <classpathentry combineaccessrules="false" kind="src" path="/common"/> |