pluginHostSdkLib.patch

diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/androidTest/java/com/twofortyfouram/locale/sdk/host/test/fixture/PluginFixture.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/androidTest/java/com/twofortyfouram/locale/sdk/host/test/fixture/PluginFixture.java
index a074d00..7b340bc 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/androidTest/java/com/twofortyfouram/locale/sdk/host/test/fixture/PluginFixture.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/androidTest/java/com/twofortyfouram/locale/sdk/host/test/fixture/PluginFixture.java
@@ -45,11 +45,11 @@ public final class PluginFixture {
     @NonNull
     public static final PluginConfiguration DEFAULT_CONFIGURATION = PluginConfigurationFixture
             .newPluginConfiguration();
 
     @NonNull
-    public static final Plugin newDefaultPlugin() {
+    public static Plugin newDefaultPlugin() {
         return new Plugin(PluginType.CONDITION, DEFAULT_PACKAGE, DEFAULT_ACTIVITY,
                 DEFAULT_RECEIVER, DEFAULT_VERSION_CODE,
                 PluginConfigurationFixture.newPluginConfiguration());
     }
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Condition.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Condition.java
index 3484163..76e7bb2 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Condition.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Condition.java
@@ -23,13 +23,10 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.SystemClock;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
 import android.text.format.DateUtils;
 
 import com.twofortyfouram.annotation.Slow;
 import com.twofortyfouram.annotation.Slow.Speed;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
@@ -40,12 +37,15 @@ import com.twofortyfouram.spackle.AndroidSdkVersion;
 import com.twofortyfouram.spackle.ContextUtil;
 import com.twofortyfouram.spackle.ThreadUtil;
 import com.twofortyfouram.spackle.ThreadUtil.ThreadPriority;
 import com.twofortyfouram.spackle.bundle.BundleScrubber;
 
-import net.jcip.annotations.NotThreadSafe;
+import androidx.annotation.NonNull;
+import androidx.annotation.IntDef;
+import androidx.annotation.VisibleForTesting;
 import net.jcip.annotations.ThreadSafe;
+import net.jcip.annotations.NotThreadSafe;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/PluginRegistry.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/PluginRegistry.java
index abb3aa3..438b41d 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/PluginRegistry.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/PluginRegistry.java
@@ -18,25 +18,25 @@ package com.twofortyfouram.locale.sdk.host.api;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 
 import com.twofortyfouram.locale.sdk.host.internal.PluginRegistryHandler;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginType;
 import com.twofortyfouram.spackle.AndroidSdkVersion;
 import com.twofortyfouram.spackle.ContextUtil;
 import com.twofortyfouram.spackle.StrictModeCompat;
 import com.twofortyfouram.spackle.ThreadUtil;
 import com.twofortyfouram.spackle.ThreadUtil.ThreadPriority;
 
-import net.jcip.annotations.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import net.jcip.annotations.ThreadSafe;
+import net.jcip.annotations.GuardedBy;
 
 import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Setting.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Setting.java
index 955dab9..a5f114c 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Setting.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/api/Setting.java
@@ -22,11 +22,10 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
 import android.text.format.DateUtils;
 
 import com.twofortyfouram.annotation.Slow;
 import com.twofortyfouram.annotation.Slow.Speed;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
@@ -37,12 +36,13 @@ import com.twofortyfouram.spackle.AndroidSdkVersion;
 import com.twofortyfouram.spackle.ContextUtil;
 import com.twofortyfouram.spackle.ThreadUtil;
 import com.twofortyfouram.spackle.ThreadUtil.ThreadPriority;
 import com.twofortyfouram.spackle.bundle.BundleScrubber;
 
-import net.jcip.annotations.NotThreadSafe;
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
+import net.jcip.annotations.NotThreadSafe;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/BundleSerializer.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/BundleSerializer.java
index b2fcb13..244fabe 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/BundleSerializer.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/BundleSerializer.java
@@ -13,15 +13,15 @@
  * limitations under the License.
  */
 package com.twofortyfouram.locale.sdk.host.internal;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
 
 import com.twofortyfouram.log.Lumberjack;
 import com.twofortyfouram.spackle.bundle.BundleKeyComparator;
 
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/InstallLocation.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/InstallLocation.java
index d194bee..3f74411 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/InstallLocation.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/InstallLocation.java
@@ -21,19 +21,19 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.XmlResourceParser;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import net.jcip.annotations.ThreadSafe;
 
 import com.twofortyfouram.annotation.Slow;
 import com.twofortyfouram.annotation.Slow.Speed;
 import com.twofortyfouram.spackle.AndroidSdkVersion;
 
-import net.jcip.annotations.ThreadSafe;
-
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageNameComparator.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageNameComparator.java
index be09145..dcfc30d 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageNameComparator.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageNameComparator.java
@@ -15,12 +15,12 @@
  */
 
 package com.twofortyfouram.locale.sdk.host.internal;
 
 import android.content.pm.ResolveInfo;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
 import java.io.Serializable;
 import java.util.Comparator;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageResult.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageResult.java
index 4facf09..cfb8deb 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageResult.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PackageResult.java
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
 package com.twofortyfouram.locale.sdk.host.internal;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import net.jcip.annotations.ThreadSafe;
 
 import net.jcip.annotations.ThreadSafe;
 
 /**
  * A result code for methods that may or may not modify the registry
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginCharacteristics.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginCharacteristics.java
index 17852dc..9f022cf 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginCharacteristics.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginCharacteristics.java
@@ -14,16 +14,16 @@
  */
 
 package com.twofortyfouram.locale.sdk.host.internal;
 
 import android.os.Build;
-import android.support.annotation.NonNull;
 
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginType;
 import com.twofortyfouram.spackle.AndroidSdkVersion;
 
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginEditDelegate.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginEditDelegate.java
index cb54b42..212fb0f 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginEditDelegate.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginEditDelegate.java
@@ -2,22 +2,22 @@ package com.twofortyfouram.locale.sdk.host.internal;
 
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import com.twofortyfouram.assertion.BundleAssertions;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginErrorEdit;
 import com.twofortyfouram.locale.sdk.host.model.PluginInstanceData;
 import com.twofortyfouram.locale.sdk.host.ui.fragment.AbstractPluginEditFragment;
 import com.twofortyfouram.locale.sdk.host.ui.fragment.IPluginEditFragment;
 import com.twofortyfouram.log.Lumberjack;
 import com.twofortyfouram.spackle.bundle.BundleScrubber;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import net.jcip.annotations.ThreadSafe;
 
 import java.util.EnumSet;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginPackageScanner.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginPackageScanner.java
index faf5b39..5c4e142 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginPackageScanner.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginPackageScanner.java
@@ -22,13 +22,15 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import net.jcip.annotations.ThreadSafe;
 
 import com.twofortyfouram.annotation.Slow;
 import com.twofortyfouram.annotation.Slow.Speed;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginConfiguration;
@@ -36,12 +38,10 @@ import com.twofortyfouram.locale.sdk.host.model.PluginErrorRegister;
 import com.twofortyfouram.locale.sdk.host.model.PluginType;
 import com.twofortyfouram.log.Lumberjack;
 import com.twofortyfouram.spackle.AndroidSdkVersion;
 import com.twofortyfouram.spackle.PermissionCompat;
 
-import net.jcip.annotations.ThreadSafe;
-
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginRegistryHandler.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginRegistryHandler.java
index 2902017..31fe396 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginRegistryHandler.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/PluginRegistryHandler.java
@@ -22,13 +22,14 @@ import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.twofortyfouram.annotation.Slow;
 import com.twofortyfouram.annotation.Slow.Speed;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginType;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/UiConfigChangeChecker.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/UiConfigChangeChecker.java
index c7cb3b3..71cbb06 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/UiConfigChangeChecker.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/internal/UiConfigChangeChecker.java
@@ -16,13 +16,13 @@
 package com.twofortyfouram.locale.sdk.host.internal;
 
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.support.annotation.CheckResult;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.CheckResult;
 import net.jcip.annotations.NotThreadSafe;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
 
 /**
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/IPluginError.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/IPluginError.java
index f5ec902..ed97650 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/IPluginError.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/IPluginError.java
@@ -1,8 +1,8 @@
 package com.twofortyfouram.locale.sdk.host.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Common interface for plug-in errors.  An error is a problem that occurs while interacting with
  * the plug-in.
  */
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/Plugin.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/Plugin.java
index 842dc14..9ab4214 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/Plugin.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/Plugin.java
@@ -25,19 +25,19 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Size;
 
 import com.twofortyfouram.annotation.Slow;
 import com.twofortyfouram.annotation.Slow.Speed;
 import com.twofortyfouram.locale.sdk.host.R;
 import com.twofortyfouram.log.Lumberjack;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Size;
 import net.jcip.annotations.Immutable;
 
 import java.util.Locale;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotEmpty;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginConfiguration.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginConfiguration.java
index 8f6793d..e5930d0 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginConfiguration.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginConfiguration.java
@@ -15,12 +15,12 @@
 
 package com.twofortyfouram.locale.sdk.host.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 
+import androidx.annotation.NonNull;
 import net.jcip.annotations.Immutable;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorEdit.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorEdit.java
index 75aa67c..7c284b7 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorEdit.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorEdit.java
@@ -13,16 +13,15 @@
  * limitations under the License.
  */
 
 package com.twofortyfouram.locale.sdk.host.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import net.jcip.annotations.ThreadSafe;
 
 import com.twofortyfouram.locale.api.Intent;
 
-import net.jcip.annotations.ThreadSafe;
-
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
 import static com.twofortyfouram.log.Lumberjack.formatMessage;
 
 /**
  * Possible errors that may occur during the edit phase of interacting with plug-ins.
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorExecute.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorExecute.java
index 017caf1..d7af17a 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorExecute.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorExecute.java
@@ -13,12 +13,11 @@
  * limitations under the License.
  */
 
 package com.twofortyfouram.locale.sdk.host.model;
 
-import android.support.annotation.NonNull;
-
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
 
 /**
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorRegister.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorRegister.java
index 984abc6..ad8c04f 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorRegister.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginErrorRegister.java
@@ -1,12 +1,10 @@
 package com.twofortyfouram.locale.sdk.host.model;
 
-
-import android.support.annotation.NonNull;
-
 import com.twofortyfouram.locale.api.Intent;
 
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
 import static com.twofortyfouram.log.Lumberjack.formatMessage;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginInstanceData.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginInstanceData.java
index 1ed89a8..1e16acb 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginInstanceData.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginInstanceData.java
@@ -18,16 +18,16 @@ package com.twofortyfouram.locale.sdk.host.model;
 import android.annotation.SuppressLint;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
 
 import com.twofortyfouram.locale.sdk.host.internal.BundleSerializer;
 import com.twofortyfouram.spackle.AndroidSdkVersion;
 import com.twofortyfouram.spackle.bundle.BundlePrinter;
 
+import androidx.annotation.NonNull;
 import net.jcip.annotations.ThreadSafe;
 
 import java.util.Arrays;
 import java.util.Locale;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginType.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginType.java
index 9f62e2c..22e93ee 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginType.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/model/PluginType.java
@@ -13,11 +13,12 @@
  * limitations under the License.
  */
 
 package com.twofortyfouram.locale.sdk.host.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
+import net.jcip.annotations.ThreadSafe;
 
 import com.twofortyfouram.locale.api.Intent;
 
 import net.jcip.annotations.ThreadSafe;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractPluginEditFragment.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractPluginEditFragment.java
index 716d8ed..0834fea 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractPluginEditFragment.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractPluginEditFragment.java
@@ -21,20 +21,20 @@ import android.app.Activity;
 import android.app.Fragment;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import com.twofortyfouram.locale.sdk.host.internal.PluginEditDelegate;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginErrorEdit;
 import com.twofortyfouram.locale.sdk.host.model.PluginInstanceData;
 import com.twofortyfouram.log.Lumberjack;
 import com.twofortyfouram.spackle.bundle.BundleComparer;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import net.jcip.annotations.NotThreadSafe;
 
 import java.util.EnumSet;
 
 import static com.twofortyfouram.assertion.Assertions.assertNotNull;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractSupportPluginEditFragment.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractSupportPluginEditFragment.java
index 346f4c8..c4f638f 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractSupportPluginEditFragment.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/AbstractSupportPluginEditFragment.java
@@ -21,13 +21,14 @@ import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import com.twofortyfouram.locale.sdk.host.internal.PluginEditDelegate;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginErrorEdit;
 import com.twofortyfouram.locale.sdk.host.model.PluginInstanceData;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/IPluginEditFragment.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/IPluginEditFragment.java
index dfc0bea..102fde5 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/IPluginEditFragment.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/fragment/IPluginEditFragment.java
@@ -1,9 +1,9 @@
 package com.twofortyfouram.locale.sdk.host.ui.fragment;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Size;
+import androidx.annotation.NonNull;
+import androidx.annotation.Size;
 
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginErrorEdit;
 import com.twofortyfouram.locale.sdk.host.model.PluginInstanceData;
 
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/PluginRegistryLoader.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/PluginRegistryLoader.java
index 923a7ee..e7ce57a 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/PluginRegistryLoader.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/PluginRegistryLoader.java
@@ -19,21 +19,21 @@ import android.content.AsyncTaskLoader;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
 
 import com.twofortyfouram.locale.sdk.host.api.PluginRegistry;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginType;
 import com.twofortyfouram.log.Lumberjack;
 import com.twofortyfouram.spackle.ContextUtil;
 import com.twofortyfouram.spackle.bundle.BundleScrubber;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import net.jcip.annotations.NotThreadSafe;
 
 import java.util.Map;
 
 import static com.twofortyfouram.assertion.Assertions.assertIsMainThread;
diff --git a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/SupportPluginRegistryLoader.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/SupportPluginRegistryLoader.java
index 94ff2ed..f809783 100755
--- a/repos/android-plugin-host-sdk-for-locale-master/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/SupportPluginRegistryLoader.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/pluginHostSdkLib/src/main/java/com/twofortyfouram/locale/sdk/host/ui/loader/SupportPluginRegistryLoader.java
@@ -13,26 +13,26 @@
  * limitations under the License.
  */
 
 package com.twofortyfouram.locale.sdk.host.ui.loader;
 
-import android.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
 
 import com.twofortyfouram.locale.sdk.host.api.PluginRegistry;
 import com.twofortyfouram.locale.sdk.host.model.Plugin;
 import com.twofortyfouram.locale.sdk.host.model.PluginType;
 import com.twofortyfouram.log.Lumberjack;
 import com.twofortyfouram.spackle.ContextUtil;
 import com.twofortyfouram.spackle.bundle.BundleScrubber;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import net.jcip.annotations.NotThreadSafe;
 
 import java.util.Map;
 
 import static com.twofortyfouram.assertion.Assertions.assertIsMainThread;
@@ -45,11 +45,11 @@ import static com.twofortyfouram.assertion.Assertions.assertNotNull;
  * interesting configuration change occurs that could affect the display of
  * plug-ins in the UI.
  */
 @NotThreadSafe
 public final class SupportPluginRegistryLoader extends
-        android.support.v4.content.AsyncTaskLoader<Map<String, Plugin>> {
+        androidx.loader.content.AsyncTaskLoader<Map<String, Plugin>> {
 
     /**
      * Plug-in type.
      */
     @NonNull