diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-12-20 13:28:04 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-12-20 14:06:44 -0800 |
| commit | c8f1308fe45f4e5a8dd98cec8234bc63f419f12b (patch) | |
| tree | eb5030bfad01322efdee448940b1ec207da16e78 /eclipse | |
| parent | d346a8954c2b9af42dbb615c03894fefc9606445 (diff) | |
| download | sdk-c8f1308fe45f4e5a8dd98cec8234bc63f419f12b.zip sdk-c8f1308fe45f4e5a8dd98cec8234bc63f419f12b.tar.gz sdk-c8f1308fe45f4e5a8dd98cec8234bc63f419f12b.tar.bz2 | |
Update from Guava 13.0.1 to Guava 15
Change-Id: I6ee2ff4aabe6ae4f20627385ecefc6b7bac40489
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/.classpath | 2 | ||||
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath index a81e5b5..b5eb7e1 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-13.0.1.jar"/> + <classpathentry exported="true" kind="lib" path="libs/guava-15.0.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/kxml2-2.3.0.jar"/> 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 0cc6348..6d80a9c 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-13.0.1.jar, + libs/guava-15.0.jar, libs/httpclient-4.1.1.jar, libs/httpcore-4.1.jar, libs/httpmime-4.1.jar, diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh index 80eaa54..b20b692 100755 --- a/eclipse/scripts/create_all_symlinks.sh +++ b/eclipse/scripts/create_all_symlinks.sh @@ -134,7 +134,7 @@ BASE_PLUGIN_LIBS="base:common swt:sdkstats base:sdklib base:dvlib base:layoutlib BASE_PLUGIN_PREBUILTS="\ prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar \ prebuilts/tools/common/m2/repository/org/apache/commons/commons-compress/1.0/commons-compress-1.0.jar \ - prebuilts/tools/common/m2/repository/com/google/guava/guava/13.0.1/guava-13.0.1.jar \ + prebuilts/tools/common/m2/repository/com/google/guava/guava/15.0/guava-15.0.jar \ prebuilts/tools/common/m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar \ prebuilts/tools/common/m2/repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar \ prebuilts/tools/common/m2/repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar \ |