am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""

* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
  Revert "Upgraded Guava to unmodified v14.0.1"

1 files changed, 30 insertions, 0 deletions

diff --git a/guava/src/com/google/common/collect/GenericMapMaker.java b/guava/src/com/google/common/collect/GenericMapMaker.java
index 0b0a290..8c5bbeb 100644
--- a/guava/src/com/google/common/collect/GenericMapMaker.java
+++ b/guava/src/com/google/common/collect/GenericMapMaker.java
@@ -62,6 +62,12 @@ public abstract class GenericMapMaker<K0, V0> {
   abstract GenericMapMaker<K0, V0> keyEquivalence(Equivalence<Object> equivalence);
 
   /**
+   * See {@link MapMaker#valueEquivalence}.
+   */
+  @GwtIncompatible("To be supported")
+  abstract GenericMapMaker<K0, V0> valueEquivalence(Equivalence<Object> equivalence);
+
+  /**
    * See {@link MapMaker#initialCapacity}.
    */
   public abstract GenericMapMaker<K0, V0> initialCapacity(int initialCapacity);
@@ -72,6 +78,11 @@ public abstract class GenericMapMaker<K0, V0> {
   abstract GenericMapMaker<K0, V0> maximumSize(int maximumSize);
 
   /**
+   * See {@link MapMaker#strongKeys}.
+   */
+  abstract GenericMapMaker<K0, V0> strongKeys();
+
+  /**
    * See {@link MapMaker#concurrencyLevel}.
    */
   public abstract GenericMapMaker<K0, V0> concurrencyLevel(int concurrencyLevel);
@@ -83,6 +94,18 @@ public abstract class GenericMapMaker<K0, V0> {
   public abstract GenericMapMaker<K0, V0> weakKeys();
 
   /**
+   * See {@link MapMaker#strongValues}.
+   */
+  abstract GenericMapMaker<K0, V0> strongValues();
+
+  /**
+   * See {@link MapMaker#softKeys}.
+   */
+  @Deprecated
+  @GwtIncompatible("java.lang.ref.SoftReference")
+  public abstract GenericMapMaker<K0, V0> softKeys();
+
+  /**
    * See {@link MapMaker#weakValues}.
    */
   @GwtIncompatible("java.lang.ref.WeakReference")
@@ -95,6 +118,13 @@ public abstract class GenericMapMaker<K0, V0> {
   public abstract GenericMapMaker<K0, V0> softValues();
 
   /**
+   * See {@link MapMaker#expiration}.
+   */
+  @Deprecated
+  public
+  abstract GenericMapMaker<K0, V0> expiration(long duration, TimeUnit unit);
+
+  /**
    * See {@link MapMaker#expireAfterWrite}.
    */
   abstract GenericMapMaker<K0, V0> expireAfterWrite(long duration, TimeUnit unit);