MCET 224 (#54)

* @W-6993575 - Updated the plugin for teh January 2020 release (MCET_224) and SDK v7.x. * Updated imports for AndroidX libraries.
salesforce-marketingcloud · Mar 4, 2020 · 3fb89c5 · 3fb89c5
1 parent 1141703
commit 3fb89c5
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 node_modules
-package-lock.json
+package-lock.json
+.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Change Log
 ==========
 
+### Version 7.0.0
+* Updated to the 7.0.x versions of the Android and iOS Marketing Cloud SDK.
+
 ### Version 6.4.0
 * Updated to the 6.4.x versions of the Android and iOS Marketing Cloud SDK.
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cordova-plugin-marketingcloudsdk",
- "version": "6.4.0",
+ "version": "7.0.0",
  "description": "A Cordova Plugin to access the native Salesforce Marketing Cloud MobilePush SDKs",
  "author": "Salesforce Marketing Cloud",
  "license": "BSD-3-Clause",

diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-plugin-marketingcloudsdk" version="6.4.0" 
+<plugin id="cordova-plugin-marketingcloudsdk" version="7.0.0" 
  xmlns="http://apache.org/cordova/ns/plugins/1.0" 
  xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -64,7 +64,7 @@
  <source url="https://github.com/CocoaPods/Specs.git"/>
  </config>
  <pods use-frameworks="true">
- <pod name="MarketingCloudSDK" spec="~> 6.4" />
+ <pod name="MarketingCloudSDK" spec="~> 7.0" />
  </pods>
  </podspec>
  <framework src="CoreLocation.framework/" /> 

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;

diff --git a/src/android/build/marketingcloudsdk.gradle b/src/android/build/marketingcloudsdk.gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
- implementation("com.salesforce.marketingcloud:marketingcloudsdk:6.4.+")
+ implementation("com.salesforce.marketingcloud:marketingcloudsdk:7.0.+")
 }
 
 ext.cdvPluginPostBuildExtras += {