@selligent-marketing-cloud/selligent-react-native 2.9.0 → 3.0.0

package/android/build.gradle

@@ -1,3 +1,8 @@
+import com.android.build.api.variant.BuildConfigField
+
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+
 buildscript {
     repositories {
         google()
@@ -5,20 +10,31 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
+def buildTypeAttr = Attribute.of("com.android.build.api.attributes.BuildTypeAttr", String)
+
+dependencies.attributesSchema {
+    // registers this attribute to the attributes schema
+    attribute(buildTypeAttr)
+}
+
+configurations {
+    implementation {
+        attributes {
+            attribute(buildTypeAttr, "release")
+        }
+    }
+}
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 32
         ndkVersion = "21.4.7075529"
         versionCode 1
         versionName "1.0"
@@ -34,7 +50,7 @@ androidComponents {
         def selligentSettings = loadSelligentSettings(variant)
         if (selligentSettings != null) {
             try {
-                variant.addBuildConfigField("SELLIGENT_SETTINGS", "\"" + selligentSettings + "\"", "Selligent settings")
+                variant.buildConfigFields.put("SELLIGENT_SETTINGS", new BuildConfigField("String", "\"" + selligentSettings + "\"", "Selligent settings"))
             } catch (MissingMethodException ignored) {
                 throw new Exception("Selligent requires Android Gradle plugin version 4.2.0 or higher.")
             }
@@ -55,40 +71,20 @@ dependencies {
     implementation 'com.facebook.react:react-native:+'
     implementation 'com.android.support:cardview-v7:27.1.1'
     implementation 'com.plotprojects:plot-android:3.13.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
+    implementation 'com.google.code.gson:gson:2.8.9'
     implementation 'com.google.firebase:firebase-messaging:21.0.0'
-    implementation 'androidx.work:work-runtime:2.4.0'
+    implementation 'androidx.work:work-runtime:2.7.1'
     implementation 'androidx.concurrent:concurrent-futures:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
 }
 
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.selligent"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-    }
-}
-
 afterEvaluate { project ->
 
     task androidJavadoc(type: Javadoc) {
         source = android.sourceSets.main.java.srcDirs
         classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
+        project.getConfigurations().getByName('implementation').setCanBeResolved(true)
+        classpath += files(project.getConfigurations().getByName('implementation').asList())
         include '**/*.java'
     }
 

package/android/src/main/java/com/selligent/ButtonBroadcastEventDataParser.java

@@ -17,7 +17,7 @@ class ButtonBroadcastEventDataParser implements BroadcastEventDataParser {
         resultingMap.putInt("type", button.type);
         resultingMap.putString("value", button.value);
         resultingMap.putString("label", button.label);
-        resultingMap.putInt("action", button.action);
+        resultingMap.putInt("action", button.action.getValue());
         if (button.data != null) {
             final WritableMap buttonData = new WritableNativeMap();
             for(String dataKey : button.data.keySet()) {

package/android/src/main/java/com/selligent/RNSelligent.java

@@ -187,7 +187,7 @@ public class RNSelligent extends ReactContextBaseJavaModule implements Lifecycle
                             buttonMap.putString("id", button.id);
                             buttonMap.putString("value", button.value);
                             buttonMap.putString("label", button.label);
-                            buttonMap.putInt("action", button.action);
+                            buttonMap.putInt("action", button.action.getValue());
                             buttonMap.putInt("type", button.type);
 
                             buttonsArray.pushMap(buttonMap);

package/android/src/main/java/com/selligent/SMSettingsFactory.java

@@ -9,7 +9,6 @@ class SMSettingsFactory {
         smSettings.WebServiceUrl = settings.getUrl();
         smSettings.ClientId = settings.getClientId();
         smSettings.PrivateKey = settings.getPrivateKey();
-        smSettings.GoogleApplicationId = settings.getGoogleApplicationId();
         smSettings.ConfigureGeolocation = settings.getConfigureLocationServices();
         smSettings.AddInAppMessageFromPushToInAppMessageList = settings.getAddInAppMessageFromPushToInAppMessageList();
         smSettings.DoNotFetchTheToken = settings.getDoNotFetchTheToken();

package/android/src/main/java/com/selligent/Settings.java

@@ -8,7 +8,6 @@ class Settings {
     private String url;
     private String clientId;
     private String privateKey;
-    private String googleApplicationId;
     private String activityName;
     private String notificationSmallIcon;
     private String notificationLargeIcon;
@@ -39,10 +38,6 @@ class Settings {
         return privateKey;
     }
 
-    public String getGoogleApplicationId() {
-        return googleApplicationId;
-    }
-
     public String getActivityName() {
         return activityName;
     }
@@ -101,9 +96,6 @@ class Settings {
         settings.url = (String) settingsHashMap.get("url");
         settings.clientId = (String) settingsHashMap.get("clientId");
         settings.privateKey = (String) settingsHashMap.get("privateKey");
-        if (settingsHashMap.containsKey("googleApplicationId")) {
-            settings.googleApplicationId = (String) settingsHashMap.get("googleApplicationId");
-        }
         if (settingsHashMap.containsKey("configureLocationServices")) {
             settings.configureLocationServices = (Boolean) settingsHashMap.get("configureLocationServices");
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@selligent-marketing-cloud/selligent-react-native",
   "title": "Selligent React Native",
-  "version": "2.9.0",
+  "version": "3.0.0",
   "description": "React Native bridge for Selligent SDK",
   "main": "index.js",
   "scripts": {
@@ -26,7 +26,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "react": "17.0.2",
-    "react-native": "^0.67.2"
+    "react": "18.1.0",
+    "react-native": "^0.70.6"
   }
 }

package/android/build/intermediates/incremental/packageDebugResources/compile-file-map.properties

@@ -1 +0,0 @@
-#Wed May 18 23:29:26 CEST 2022