@selligent-marketing-cloud/selligent-react-native 3.7.0 → 3.7.1

package/README.md

@@ -25,7 +25,7 @@ This module supports the following SDK and tools:
    npm install @selligent-marketing-cloud/selligent-react-native --save
    ```
 
-2. Create a `selligent.json` file (name is case sensitive) in the root of the React Native project with the following content:
+2. Create a `selligent.json` file (name is case sensitive) in the root of the React Native project (you can alternatively place it inside another folder or inside a `selligent` folder which will automatically be checked by the wrapper) with the following content:
 
    ```json
    {
@@ -170,7 +170,7 @@ This module supports the following SDK and tools:
 
 1. Copy the `node_modules/@selligent-marketing-cloud/selligent-react-native/ios` folder to the **Xcode project**. Drop it under the `Libraries` Folder. This will link the module to the iOS project.
 
-2. Drag and drop the `selligent.json` you created from the root folder to the Xcode project inside the `Copy Bundle Resources` in `Build phases` of your target:
+2. Drag and drop the `selligent.json` you created (or the full folder(s) containing it) to the Xcode project inside the `Copy Bundle Resources` in `Build phases` of your target:
 
     > Do not check the "copy if needed" option to make sure you only have to manage one selligent.json file
 
@@ -194,6 +194,8 @@ This module supports the following SDK and tools:
     //    launchOptions = [NSMutableDictionary new];
     // }
     // [launchOptions setValue:@"alternativeFileName" forKey:@"RN_SELLIGENT_JSON"];
+    // [launchOptions setValue:@"selligent/alternativeFileName" forKey:@"RN_SELLIGENT_JSON"];
+    // [launchOptions setValue:@"alternativeFolder/alternativeFileName" forKey:@"RN_SELLIGENT_JSON"];
 
     // At the end of application:didFinishLaunchingWithOptions:
     [RNSelligent configureWithLaunchOptions:launchOptions];
@@ -204,7 +206,7 @@ This module supports the following SDK and tools:
 <details open>
 <summary>With autolinking (RN 0.60 and above)</summary>
 
-1. Drag and drop the `selligent.json` you created from the root folder to the Xcode project inside the `Copy Bundle Resources` in `Build phases` of your target:
+1. Drag and drop the `selligent.json` you created (or the full folder(s) containing it) to the Xcode project inside the `Copy Bundle Resources` in `Build phases` of your target:
 
     > Do not check the "copy if needed" option to make sure you only have to manage one selligent.json file
 
@@ -222,6 +224,8 @@ This module supports the following SDK and tools:
     //    launchOptions = [NSMutableDictionary new];
     // }
     // [launchOptions setValue:@"alternativeFileName" forKey:@"RN_SELLIGENT_JSON"];
+    // [launchOptions setValue:@"selligent/alternativeFileName" forKey:@"RN_SELLIGENT_JSON"];
+    // [launchOptions setValue:@"alternativeFolder/alternativeFileName" forKey:@"RN_SELLIGENT_JSON"];
 
     // At the end of application:didFinishLaunchingWithOptions:
     [RNSelligent configureWithLaunchOptions:launchOptions];

package/android/build.gradle

@@ -79,9 +79,9 @@ def loadSelligentSettings(variant) {
     def variantFileName = "selligent.${variant.getName()}.json"
     def resultingSettings = null
 
-    File variantFile = new File("$project.rootDir/../$variantFileName")
-    File defaultFile = new File("$project.rootDir/../$defaultFileName")
-    File flavorFile = new File("$project.rootDir/../$currentFlavor/$defaultFileName")
+    File variantFile = getFile(variantFileName)
+    File defaultFile = getFile(defaultFileName)
+    File flavorFile = getFile("$currentFlavor/$defaultFileName")
 
     if (variantFile.exists()) {
         println("Reading Marigold Engage properties for variant ${variant.getName()} from $variantFile.path")
@@ -108,16 +108,31 @@ def loadSelligentSettings(variant) {
         }
     }
     else {
-        throw new InvalidUserDataException("The selligent.json file could not be found. Please make sure you provide this file in the root of this project.")
+        println("WARNING: No selligent.json file could be found for the given task. Disregard this message if the executing task is not building/executing the app.")
     }
 
     return resultingSettings
 }
 
+def getFile(filePath) {
+    File defaultFile = new File("$project.rootDir/../$filePath")
+    File unifiedLocationFile = new File("$project.rootDir/../selligent/$filePath")
+
+    if (defaultFile.exists()) {
+        println("selligent.json found in the root of the project")
+        return defaultFile
+    }
+    else if (unifiedLocationFile.exists()) {
+        println("selligent.json found in the unified `selligent` folder")   
+    }
+    
+    return unifiedLocationFile
+}
+
 def getCurrentFlavor() {
     Gradle gradle = getGradle()
     String tskReqStr = gradle.getStartParameter().getTaskRequests().toString()
-    Pattern pattern = Pattern.compile("(install|assemble)(\\w+)(Release|Debug)")
+    Pattern pattern = Pattern.compile("(install|assemble|bundle)(\\w+)(Release|Debug)")
     Matcher matcher = pattern.matcher(tskReqStr)
 
     if (matcher.find()) {

package/package.json

@@ -4,7 +4,7 @@
   },
   "name": "@selligent-marketing-cloud/selligent-react-native",
   "title": "Marigold Engage React Native",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "React Native wrapper for the Marigold Engage Android and iOS SDKs",
   "main": "index.js",
   "repository": {