remove v3.6.2 deprecated BundleUtils methods

Author: frett

gto-support-db/src/main/java/org/ccci/gto/android/common/db/support/v4/content/DaoCursorLoader.java

@@ -4,18 +4,18 @@
 import android.database.Cursor;
 import android.os.Bundle;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+
 import org.ccci.gto.android.common.db.AbstractDao;
 import org.ccci.gto.android.common.db.Expression;
 import org.ccci.gto.android.common.db.Expression.Field;
 import org.ccci.gto.android.common.db.Join;
 import org.ccci.gto.android.common.db.Query;
 import org.ccci.gto.android.common.db.Table;
 import org.ccci.gto.android.common.support.v4.content.SimpleCursorLoader;
-import org.ccci.gto.android.common.util.os.BundleUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.WorkerThread;
+import org.ccci.gto.android.common.util.os.BundleKt;
 
 import static org.ccci.gto.android.common.db.AbstractDao.ARG_DISTINCT;
 import static org.ccci.gto.android.common.db.AbstractDao.ARG_JOINS;
@@ -54,7 +54,7 @@ public DaoCursorLoader(@NonNull final Context context, @NonNull final AbstractDa
         mFrom = from;
         if (args != null) {
             setDistinct(args.getBoolean(ARG_DISTINCT, false));
-            setJoins(BundleUtils.getParcelableArray(args, ARG_JOINS, Join.class));
+            setJoins(BundleKt.getParcelableArray(args, ARG_JOINS, Join.class));
             setProjection(args.getStringArray(ARG_PROJECTION));
             setWhere(args.getParcelable(ARG_WHERE));
             setSortOrder(args.getString(ARG_ORDER_BY));

gto-support-util/src/main/java/org/ccci/gto/android/common/util/os/BundleUtils.kt

@@ -3,7 +3,6 @@
 package org.ccci.gto.android.common.util.os
 
 import android.os.Bundle
-import android.os.Parcelable
 import java.util.Locale
 import org.ccci.gto.android.common.compat.util.LocaleCompat
 import org.jetbrains.annotations.Contract
@@ -62,19 +61,3 @@ fun Bundle.getLocaleArray(key: String?) =
         ?.map { it?.let { LocaleCompat.forLanguageTag(it) } }?.toTypedArray()
 
 // endregion Locales
-
-// region Parcelables
-@Deprecated(
-    "Since v3.6.2, this was moved to the BundleKt package for java usage",
-    ReplaceWith("getParcelableArray(key, clazz)")
-)
-@JvmName("getParcelableArray")
-fun <T : Parcelable> deprecatedGetParcelableArray(bundle: Bundle, key: String?, clazz: Class<T>) =
-    bundle.getParcelableArray(key, clazz)
-
-@Deprecated(
-    "Since v3.6.2, renamed to getTypedParcelableArray() for Kotlin 1.4 update",
-    ReplaceWith("getTypedParcelableArray<T>(key)")
-)
-inline fun <reified T : Parcelable> Bundle.getParcelableArray(key: String?) = getTypedParcelableArray<T>(key)
-// endregion Parcelables

gto-support-util/src/test/java/org/ccci/gto/android/common/util/os/BundleUtilsTest.kt

@@ -1,10 +1,8 @@
 package org.ccci.gto.android.common.util.os
 
-import android.graphics.Point
 import android.os.Bundle
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import java.util.Locale
-import org.junit.Assert.assertArrayEquals
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
 import org.junit.Test
@@ -72,32 +70,4 @@ class BundleUtilsTest {
         assertEquals(Locale.FRENCH, bundle.getLocale(KEY2))
         assertNull(bundle.getLocale(KEY3))
     }
-
-    @Test
-    fun verifyGetParcelableArray() {
-        val points = arrayOf(Point(0, 0), null, Point(1, 1))
-        val bundle = Bundle().apply {
-            putParcelableArray(KEY1, points)
-            putParcelableArray(KEY2, null)
-        }
-
-        val resp = deprecatedGetParcelableArray(bundle, KEY1, Point::class.java)!!
-        assertEquals(points.javaClass, resp.javaClass)
-        assertArrayEquals(points, resp)
-        assertNull(deprecatedGetParcelableArray(bundle, KEY2, Point::class.java))
-    }
-
-    @Test
-    fun verifyGetParcelableArrayReified() {
-        val points = arrayOf(Point(0, 0), null, Point(1, 1))
-        val bundle = Bundle().apply {
-            putParcelableArray(KEY1, points)
-            putParcelableArray(KEY2, null)
-        }
-
-        val resp = bundle.getParcelableArray<Point>(KEY1)!!
-        assertEquals(points.javaClass, resp.javaClass)
-        assertArrayEquals(points, resp)
-        assertNull(bundle.getParcelableArray<Point>(KEY2))
-    }
 }