diff options
author | Nick Anthony <nickanthony@google.com> | 2019-05-09 17:35:38 -0400 |
---|---|---|
committer | Nick Anthony <nickanthony@google.com> | 2019-05-10 18:31:50 +0000 |
commit | f3a4f49fd296f7a1a4e3502daa0c899c47f2ff04 (patch) | |
tree | 77c038d18aadbb55b1b266a6706acc3f905bd7a5 /collection | |
parent | 3bbe8f40d2b36dd2cebc2908e8d713d2789947ef (diff) | |
download | support-f3a4f49fd296f7a1a4e3502daa0c899c47f2ff04.tar.gz |
Move collection to 1.2.0-alpha01 and pin all current usages to
1.1.0-rc01
Pinned all current usages using the bash command:
find . -name "build.gradle" | xargs grep -rl "project(\":collection\")" | xargs sed -i "s/project(\":collection\")/\"androidx.collection:collection:1.1.0-rc01\"/g"
1.1.0-rc01 will be released from androidx-collection-release from here
on out
Test: ./gradlew buildOnServer
Change-Id: Ie506d454a70f4df186111363c6981a223cc0140e
Diffstat (limited to 'collection')
-rw-r--r-- | collection/api/1.2.0-alpha01.txt | 183 | ||||
-rw-r--r-- | collection/api/restricted_1.2.0-alpha01.txt | 1 | ||||
-rw-r--r-- | collection/ktx/api/1.2.0-alpha01.txt | 52 | ||||
-rw-r--r-- | collection/ktx/api/restricted_1.2.0-alpha01.txt | 1 | ||||
-rw-r--r-- | collection/ktx/build.gradle | 2 |
5 files changed, 238 insertions, 1 deletions
diff --git a/collection/api/1.2.0-alpha01.txt b/collection/api/1.2.0-alpha01.txt new file mode 100644 index 00000000000..179d17f8d74 --- /dev/null +++ b/collection/api/1.2.0-alpha01.txt @@ -0,0 +1,183 @@ +// Signature format: 3.0 +package androidx.collection { + + public class ArrayMap<K, V> extends androidx.collection.SimpleArrayMap<K,V> implements java.util.Map<K,V> { + ctor public ArrayMap(); + ctor public ArrayMap(int); + ctor public ArrayMap(androidx.collection.SimpleArrayMap!); + method public boolean containsAll(java.util.Collection<?>); + method public java.util.Set<java.util.Map.Entry<K,V>>! entrySet(); + method public java.util.Set<K>! keySet(); + method public void putAll(java.util.Map<? extends K,? extends V>!); + method public boolean removeAll(java.util.Collection<?>); + method public boolean retainAll(java.util.Collection<?>); + method public java.util.Collection<V>! values(); + } + + public final class ArraySet<E> implements java.util.Collection<E> java.util.Set<E> { + ctor public ArraySet(); + ctor public ArraySet(int); + ctor public ArraySet(androidx.collection.ArraySet<E>?); + ctor public ArraySet(java.util.Collection<E>?); + method public boolean add(E?); + method public void addAll(androidx.collection.ArraySet<? extends E>); + method public boolean addAll(java.util.Collection<? extends E>); + method public void clear(); + method public boolean contains(Object?); + method public boolean containsAll(java.util.Collection<?>); + method public void ensureCapacity(int); + method public int indexOf(Object?); + method public boolean isEmpty(); + method public java.util.Iterator<E>! iterator(); + method public boolean remove(Object?); + method public boolean removeAll(androidx.collection.ArraySet<? extends E>); + method public boolean removeAll(java.util.Collection<?>); + method public E! removeAt(int); + method public boolean retainAll(java.util.Collection<?>); + method public int size(); + method public Object[] toArray(); + method public <T> T[] toArray(T[]); + method public E? valueAt(int); + } + + public final class CircularArray<E> { + ctor public CircularArray(); + ctor public CircularArray(int); + method public void addFirst(E!); + method public void addLast(E!); + method public void clear(); + method public E! get(int); + method public E! getFirst(); + method public E! getLast(); + method public boolean isEmpty(); + method public E! popFirst(); + method public E! popLast(); + method public void removeFromEnd(int); + method public void removeFromStart(int); + method public int size(); + } + + public final class CircularIntArray { + ctor public CircularIntArray(); + ctor public CircularIntArray(int); + method public void addFirst(int); + method public void addLast(int); + method public void clear(); + method public int get(int); + method public int getFirst(); + method public int getLast(); + method public boolean isEmpty(); + method public int popFirst(); + method public int popLast(); + method public void removeFromEnd(int); + method public void removeFromStart(int); + method public int size(); + } + + public class LongSparseArray<E> implements java.lang.Cloneable { + ctor public LongSparseArray(); + ctor public LongSparseArray(int); + method public void append(long, E!); + method public void clear(); + method public androidx.collection.LongSparseArray<E>! clone(); + method public boolean containsKey(long); + method public boolean containsValue(E!); + method @Deprecated public void delete(long); + method public E? get(long); + method public E! get(long, E!); + method public int indexOfKey(long); + method public int indexOfValue(E!); + method public boolean isEmpty(); + method public long keyAt(int); + method public void put(long, E!); + method public void putAll(androidx.collection.LongSparseArray<? extends E>); + method public E? putIfAbsent(long, E!); + method public void remove(long); + method public boolean remove(long, Object!); + method public void removeAt(int); + method public E? replace(long, E!); + method public boolean replace(long, E!, E!); + method public void setValueAt(int, E!); + method public int size(); + method public E! valueAt(int); + } + + public class LruCache<K, V> { + ctor public LruCache(int); + method protected V? create(K); + method public final int createCount(); + method protected void entryRemoved(boolean, K, V, V?); + method public final void evictAll(); + method public final int evictionCount(); + method public final V? get(K); + method public final int hitCount(); + method public final int maxSize(); + method public final int missCount(); + method public final V? put(K, V); + method public final int putCount(); + method public final V? remove(K); + method public void resize(int); + method public final int size(); + method protected int sizeOf(K, V); + method public final java.util.Map<K,V>! snapshot(); + method public final String toString(); + method public void trimToSize(int); + } + + public class SimpleArrayMap<K, V> { + ctor public SimpleArrayMap(); + ctor public SimpleArrayMap(int); + ctor public SimpleArrayMap(androidx.collection.SimpleArrayMap<K,V>!); + method public void clear(); + method public boolean containsKey(Object?); + method public boolean containsValue(Object!); + method public void ensureCapacity(int); + method public V? get(Object!); + method public V! getOrDefault(Object!, V!); + method public int indexOfKey(Object?); + method public boolean isEmpty(); + method public K! keyAt(int); + method public V? put(K!, V!); + method public void putAll(androidx.collection.SimpleArrayMap<? extends K,? extends V>); + method public V? putIfAbsent(K!, V!); + method public V? remove(Object!); + method public boolean remove(Object!, Object!); + method public V! removeAt(int); + method public V? replace(K!, V!); + method public boolean replace(K!, V!, V!); + method public V! setValueAt(int, V!); + method public int size(); + method public V! valueAt(int); + } + + public class SparseArrayCompat<E> implements java.lang.Cloneable { + ctor public SparseArrayCompat(); + ctor public SparseArrayCompat(int); + method public void append(int, E!); + method public void clear(); + method public androidx.collection.SparseArrayCompat<E>! clone(); + method public boolean containsKey(int); + method public boolean containsValue(E!); + method @Deprecated public void delete(int); + method public E? get(int); + method public E! get(int, E!); + method public int indexOfKey(int); + method public int indexOfValue(E!); + method public boolean isEmpty(); + method public int keyAt(int); + method public void put(int, E!); + method public void putAll(androidx.collection.SparseArrayCompat<? extends E>); + method public E? putIfAbsent(int, E!); + method public void remove(int); + method public boolean remove(int, Object!); + method public void removeAt(int); + method public void removeAtRange(int, int); + method public E? replace(int, E!); + method public boolean replace(int, E!, E!); + method public void setValueAt(int, E!); + method public int size(); + method public E! valueAt(int); + } + +} + diff --git a/collection/api/restricted_1.2.0-alpha01.txt b/collection/api/restricted_1.2.0-alpha01.txt new file mode 100644 index 00000000000..da4f6cc18fe --- /dev/null +++ b/collection/api/restricted_1.2.0-alpha01.txt @@ -0,0 +1 @@ +// Signature format: 3.0 diff --git a/collection/ktx/api/1.2.0-alpha01.txt b/collection/ktx/api/1.2.0-alpha01.txt new file mode 100644 index 00000000000..3fe6a362480 --- /dev/null +++ b/collection/ktx/api/1.2.0-alpha01.txt @@ -0,0 +1,52 @@ +// Signature format: 3.0 +package androidx.collection { + + public final class ArrayMapKt { + ctor public ArrayMapKt(); + method public static inline <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf(); + method public static <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf(kotlin.Pair<? extends K,? extends V>... pairs); + } + + public final class ArraySetKt { + ctor public ArraySetKt(); + method public static inline <T> androidx.collection.ArraySet<T> arraySetOf(); + method public static <T> androidx.collection.ArraySet<T> arraySetOf(T... values); + } + + public final class LongSparseArrayKt { + ctor public LongSparseArrayKt(); + method public static inline operator <T> boolean contains(androidx.collection.LongSparseArray<T>, long key); + method public static inline <T> void forEach(androidx.collection.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action); + method public static inline <T> T! getOrDefault(androidx.collection.LongSparseArray<T>, long key, T! defaultValue); + method public static inline <T> T! getOrElse(androidx.collection.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue); + method public static inline <T> int getSize(androidx.collection.LongSparseArray<T>); + method public static inline <T> boolean isNotEmpty(androidx.collection.LongSparseArray<T>); + method public static <T> kotlin.collections.LongIterator keyIterator(androidx.collection.LongSparseArray<T>); + method public static operator <T> androidx.collection.LongSparseArray<T> plus(androidx.collection.LongSparseArray<T>, androidx.collection.LongSparseArray<T> other); + method @Deprecated public static <T> boolean remove(androidx.collection.LongSparseArray<T>, long key, T! value); + method public static inline operator <T> void set(androidx.collection.LongSparseArray<T>, long key, T! value); + method public static <T> java.util.Iterator<T> valueIterator(androidx.collection.LongSparseArray<T>); + } + + public final class LruCacheKt { + ctor public LruCacheKt(); + method public static inline <K, V> androidx.collection.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ -> }); + } + + public final class SparseArrayKt { + ctor public SparseArrayKt(); + method public static inline operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key); + method public static inline <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action); + method public static inline <T> T! getOrDefault(androidx.collection.SparseArrayCompat<T>, int key, T! defaultValue); + method public static inline <T> T! getOrElse(androidx.collection.SparseArrayCompat<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue); + method public static inline <T> int getSize(androidx.collection.SparseArrayCompat<T>); + method public static inline <T> boolean isNotEmpty(androidx.collection.SparseArrayCompat<T>); + method public static <T> kotlin.collections.IntIterator keyIterator(androidx.collection.SparseArrayCompat<T>); + method public static operator <T> androidx.collection.SparseArrayCompat<T> plus(androidx.collection.SparseArrayCompat<T>, androidx.collection.SparseArrayCompat<T> other); + method @Deprecated public static <T> boolean remove(androidx.collection.SparseArrayCompat<T>, int key, T! value); + method public static inline operator <T> void set(androidx.collection.SparseArrayCompat<T>, int key, T! value); + method public static <T> java.util.Iterator<T> valueIterator(androidx.collection.SparseArrayCompat<T>); + } + +} + diff --git a/collection/ktx/api/restricted_1.2.0-alpha01.txt b/collection/ktx/api/restricted_1.2.0-alpha01.txt new file mode 100644 index 00000000000..da4f6cc18fe --- /dev/null +++ b/collection/ktx/api/restricted_1.2.0-alpha01.txt @@ -0,0 +1 @@ +// Signature format: 3.0 diff --git a/collection/ktx/build.gradle b/collection/ktx/build.gradle index e813c94c10b..3b51b3d7505 100644 --- a/collection/ktx/build.gradle +++ b/collection/ktx/build.gradle @@ -24,7 +24,7 @@ plugins { } dependencies { - compile(project(":collection")) + compile("androidx.collection:collection:1.1.0-rc01") compile(KOTLIN_STDLIB) testCompile(JUNIT) testCompile(TRUTH) |