Skip to content

Commit

Permalink
Upgrade guava to v11.0.2
Browse files Browse the repository at this point in the history
Bug: 6457759
Change-Id: Ie9aa2faaf572f1be8e203a447f357510136ae6b9
  • Loading branch information
Bjorn Bringert committed May 8, 2012
1 parent 5b0ce86 commit 1d580d0
Show file tree
Hide file tree
Showing 1,497 changed files with 346,863 additions and 171,402 deletions.
4 changes: 4 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Google Inc.
Colin Decker
Louis Wasserman
Maginatics
6 changes: 3 additions & 3 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

LOCAL_MODULE := guava
LOCAL_SDK_VERSION := 8
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := 9
LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
LOCAL_STATIC_JAVA_LIBRARIES := jsr305

include $(BUILD_STATIC_JAVA_LIBRARY)
Expand All @@ -28,7 +28,7 @@ $(call dist-for-goals, dist_files, $(LOCAL_BUILT_MODULE):guava.jar)
# Also build a host-side library
include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES := $(call all-java-files-under, guava/src)
LOCAL_MODULE := guavalib
LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib

Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Doug Lea
202 changes: 0 additions & 202 deletions NOTICE

This file was deleted.

46 changes: 46 additions & 0 deletions README
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
Guava: Google Core Libraries for Java
=====================================

Requires JDK 1.5 or higher.

Project page:
http://guava-libraries.googlecode.com

Report a defect or feature request here:
http://code.google.com/p/guava-libraries/issues/entry

Ask "how-to" and "why-didn't-it-work" questions at:
http://www.stackoverflow.com/questions/ask (use the "guava" tag)

For open-ended questions and discussion:
http://groups.google.com/group/guava-discuss

Subscribe to project updates in your feed reader:
http://code.google.com/feeds/p/guava-libraries/updates/basic

IMPORTANT WARNINGS
------------------

1. APIs marked with the @Beta annotation at the class or method level
are subject to change. They can be modified in any way, or even
removed, at any time. If your code is a library itself (i.e. it is
used on the CLASSPATH of users outside your own control), you should
not use beta APIs, unless you repackage them (e.g. using ProGuard).

2. Deprecated non-beta APIs will be removed eighteen months after the
release in which they are first deprecated. You must fix your
references before this time. If you don't, any manner of breakage
could result (you are not guaranteed a compilation error).

3. Serialized forms of ALL objects are subject to change. Do not
persist these and assume they can be read by a future version of the
library.

4. Our classes are not designed to protect against a malicious caller.
You should not use them for communication between trusted and
untrusted code.

5. We unit-test and benchmark the libraries using only OpenJDK 1.6 on
Linux. Some features, especially in com.google.common.io, may not work
correctly in other environments.

9 changes: 5 additions & 4 deletions README.android
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
URL: http://code.google.com/p/guava-libraries/source/checkout
Version: r11
Version: v11.0.2
License: Apache 2
Description: "Guava: Google Core Libraries for Java 1.5"

Local Modifications: Minor hacks to compile on our Mac build machines --
see src/com/google/common/collect/Immutable*.java, look for
"BEGIN/END android-changed" markers.
Local Modifications:
Commented out use of the non-public sun.misc.Unsafe
from guava/src/com/google/common/primitives/UnsignedBytes.java
Look for "BEGIN/END android-changed" markers.

Guava-libraries are a grab bag of utility libraries published by Google as
open source, including among other things the Google collections libraries.
Expand Down
29 changes: 29 additions & 0 deletions README.maven
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
These folders host the maven metadata which are used to
build release binaries for hosting in the central maven
repositories. These are not considered the "canonical"
build, but are maintained seperately by (a) volunteer(s)
with an interest in easy use of Guava by the Maven build
system.

As a convenience, these folders have been set up to
provide alternate packaging of the sub-pmodules, which
correspond to their respective java packages, with
sources symbolically linked back to the main project.
This will work to allow command-line builds on MacOS X
or other Unix platforms which support symbolic linking,
but is not known to work on Windows platforms.
(Obviously the deployed binaries in maven repostories
will work fine on any compliant JVM).

The maintainers of these metadata have used M2Eclipse
to import these projects directly into Eclipse. Please
remember that this codebase uses @Override annotations
on methods which implement an interface method, and
therefore require a JDK 1.6 (or newer 1.5 with the
appropriate fix) to support this behaviour. Executing
Maven with an appropriate JAVA_HOME env is sufficient,
and these metadata do not have toolchain restrictions
currently set up.

Christian
[email protected]
59 changes: 0 additions & 59 deletions build.xml

This file was deleted.

Loading

0 comments on commit 1d580d0

Please sign in to comment.