Merge pull request #52 from MarketingCloudSdk/androidx_fixes

Updated imports for AndroidX libraries.
salesforce-marketingcloud · Feb 24, 2020 · 12cd71c · 12cd71c
2 parents aebda4a + 6bd0eff
commit 12cd71c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 node_modules
-package-lock.json
+package-lock.json
+.*
diff --git a/src/android/MCCordovaPlugin.java b/src/android/MCCordovaPlugin.java
@@ -28,8 +28,8 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.salesforce.marketingcloud.MCLogListener;

diff --git a/src/android/MCInitProvider.java b/src/android/MCInitProvider.java
@@ -30,8 +30,8 @@
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import com.salesforce.marketingcloud.InitializationStatus;
 import com.salesforce.marketingcloud.MCLogListener;
 import com.salesforce.marketingcloud.MarketingCloudConfig;

diff --git a/src/android/MCSdkConfig.java b/src/android/MCSdkConfig.java
@@ -28,7 +28,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 import com.google.firebase.FirebaseApp;
 import com.salesforce.marketingcloud.MarketingCloudConfig;

diff --git a/src/android/MCSdkListener.java b/src/android/MCSdkListener.java
@@ -2,8 +2,8 @@
 
 import android.app.PendingIntent;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.salesforce.marketingcloud.UrlHandler;