react-native-mparticle 2.7.9 → 2.7.11

package/.github/workflows/pull-request.yml

@@ -12,7 +12,7 @@ jobs:
       runs-on: macOS-latest
       steps:
       - name: "Checkout"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: actions/setup-node@master
       - uses: c-hive/gha-yarn-cache@v2
 
@@ -29,7 +29,7 @@ jobs:
       runs-on: ubuntu-latest
       steps:
           - name: "Checkout"
-            uses: actions/checkout@v3
+            uses: actions/checkout@v4
           - name: "Run Android Unit Tests"
             working-directory: android
             run: ./gradlew test
@@ -39,7 +39,7 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         - name: "Checkout"
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: "Run Android Unit Tests"
           working-directory: android
           run: ./gradlew lint
@@ -49,7 +49,7 @@ jobs:
       runs-on: ubuntu-latest
       steps:
         - name: "Checkout"
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: "Run Android Unit Tests"
           working-directory: android
           run: ./gradlew ktlintCheck

package/README.md

@@ -16,18 +16,12 @@ React Native allows developers to use a single code base to deploy features to m
 
 # Installation
 
-1. **Download and install the mParticle React Native library** from npm:
+**Download and install the mParticle React Native library** from npm:
 
 ```bash
 $ npm install react-native-mparticle --save
 ```
 
-2. **Install the native dependencies**. You can use `rnpm` (now part of `react-native` core via `link`) to add native dependencies automatically:
-
-```bash
-$ react-native link
-```
-
 ## <a name="iOS"></a>iOS
 
 1. **Copy your mParticle key and secret** from [your app's dashboard][1].
@@ -36,11 +30,42 @@ $ react-native link
 
 2. **Install the SDK** using CocoaPods:
 
+The npm install step above will automatically include our react framework and the core iOS framework in your project. However depending on your app and its other dependecies you must integrate it in 1 of 3 ways
+
+A. Static Libraries are the React Native default but since mParticle iOS contains swift code you need to add an exception for it in the from of a pre-install command in the Podfile.
+```bash
+pre_install do |installer|
+  installer.pod_targets.each do |pod|
+    if pod.name == 'mParticle-Apple-SDK'
+      def pod.build_type;
+        Pod::BuildType.new(:linkage => :dynamic, :packaging => :framework)
+      end
+    end
+  end
+end
+```
+Then run the following command
+```
+bundle exec pod install
+```
+
+B&C. Frameworks are the default for Swift development and while it isn't preferred by React Native it is supported. Additionally you can define whether the frameworks are built staticly or dynamically. 
+
+Update your Podfile to be ready to use dynamically linked frameworks by commenting out the following line
 ```bash
-$ # Update your Podfile to depend on 'mParticle-Apple-SDK' version 7.2.0 or later
-$ pod install
+# :flipper_configuration => flipper_config,
+```
+Then run either of the following commands
+```
+$ USE_FRAMEWORKS=static bundle exec pod install
+```
+or
+```
+$ USE_FRAMEWORKS=dynamic bundle exec pod install
 ```
 
+3. Import and start the mParticle Apple SDK into Swift or Objective-C.
+
 The mParticle SDK is initialized by calling the `startWithOptions` method within the `application:didFinishLaunchingWithOptions:` delegate call.
 
 Preferably the location of the initialization method call should be one of the last statements in the `application:didFinishLaunchingWithOptions:`.
@@ -51,9 +76,6 @@ The `startWithOptions` method requires an options argument containing your key a
 
 For more help, see [the iOS set up docs](https://docs.mparticle.com/developers/sdk/ios/getting-started/#create-an-input).
 
-3. Import and start the mParticle Apple SDK into Swift or Objective-C.
-
-
 #### Swift Example
 
 ```swift
@@ -83,13 +105,16 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions lau
 
 #### Objective-C Example
 
-With recent changes in Swift support for static libraries and React Native's preference for the traditional CocoaPods and static libraries delivery mechanism, we reccomend against setting `use_frameworks!` in your Podfile.
-
-Your import statement can be either of these:
+Your import statement should be this:
 
 ```objective-c
-#import <mParticle-Apple-SDK/mParticle.h>
-#import "mParticle.h"
+#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
+    #import <mParticle_Apple_SDK/mParticle.h>
+#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
+    #import <mParticle_Apple_SDK_NoLocation/mParticle.h>
+#else
+    #import "mParticle.h"
+#endif
 ```
 
 Next, you'll need to start the SDK:
@@ -122,6 +147,12 @@ Next, you'll need to start the SDK:
 
 See [Identity](http://docs.mparticle.com/developers/sdk/ios/identity/) for more information on supplying an `MPIdentityApiRequest` object during SDK initialization.
 
+4. Remember to start Metro with:
+```bash
+$ npm start
+```
+and build your workspace from xCode.
+
 
 ## <a name="Android"></a>Android
 

package/android/build.gradle

@@ -74,11 +74,11 @@ dependencies {
 
     testImplementation 'org.mockito:mockito-core:5.8.0'
     androidTestImplementation 'org.mockito:mockito-android:5.8.0'
-    testImplementation 'androidx.annotation:annotation:1.7.0'
+    testImplementation 'androidx.annotation:annotation:1.7.1'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation files('libs/java-json.jar')
 
-    testImplementation 'com.mparticle:android-core:5.54.0'
+    testImplementation 'com.mparticle:android-core:5.55.0'
     testImplementation 'com.facebook.react:react-native:0.20.1'
 }

package/android/src/main/java/com/mparticle/react/MParticleModule.java

@@ -1,5 +1,6 @@
 package com.mparticle.react;
 
+import android.location.Location;
 import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
@@ -73,6 +74,15 @@ public class MParticleModule extends ReactContextBaseJavaModule {
         MParticle.getInstance().setUpdateInterval(uploadInterval);
     }
 
+    @ReactMethod
+    public void setLocation(double latitude, double longitude) {
+        Location newLocation = new Location(""); 
+        newLocation.setLatitude(latitude);
+        newLocation.setLongitude(longitude);
+        MParticle.getInstance().setLocation(newLocation);
+        
+    }
+
     @ReactMethod
     public void logEvent(final String name, int type, final ReadableMap attributesMap) {
         Map<String, String> attributes = ConvertStringMap(attributesMap);

package/ios/RNMParticle/RNMParticle.m

@@ -1,5 +1,11 @@
 #import "RNMParticle.h"
-#import "mParticle.h"
+#if defined(__has_include) && __has_include(<mParticle_Apple_SDK/mParticle.h>)
+    #import <mParticle_Apple_SDK/mParticle.h>
+#elif defined(__has_include) && __has_include(<mParticle_Apple_SDK_NoLocation/mParticle.h>)
+    #import <mParticle_Apple_SDK_NoLocation/mParticle.h>
+#else
+    #import "mParticle.h"
+#endif
 #import <React/RCTConvert.h>
 
 @interface MParticleUser ()
@@ -24,6 +30,12 @@ RCT_EXPORT_METHOD(upload)
     [[MParticle sharedInstance] upload];
 }
 
+RCT_EXPORT_METHOD(setLocation:(double)latitude longitude:(double)longitude)
+{
+    CLLocation *newLocation = [[CLLocation alloc] initWithLatitude:latitude longitude:longitude];
+    [MParticle sharedInstance].location = newLocation;    
+}
+
 RCT_EXPORT_METHOD(setUploadInterval:(NSInteger)uploadInterval)
 {
     [[MParticle sharedInstance] setUploadInterval:uploadInterval];

package/js/index.js

@@ -158,6 +158,10 @@ const getSession = (completion) => {
   NativeModules.MParticle.getSession(completion)
 }
 
+const setLocation = (latitude, longitude) => {
+  NativeModules.MParticle.setLocation(latitude, longitude)
+}
+
 // ******** Identity ********
 class User {
   constructor (userId) {
@@ -686,7 +690,8 @@ const MParticle = {
   isKitActive,
   getAttributions,
   logPushRegistration,
-  getSession
+  getSession,
+  setLocation
 }
 
 export default MParticle

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://www.mparticle.com",
   "license": "Apache-2.0",
   "repository": "mParticle/react-native-mparticle",
-  "version": "2.7.9",
+  "version": "2.7.11",
   "main": "js/index.js",
   "scripts": {
     "test": "./node_modules/standard/bin/cmd.js",

package/react-native-mparticle.podspec

@@ -1,5 +1,8 @@
 require 'json'
 
+new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+ios_platform = new_arch_enabled ? '11.0' : '9.0'
+
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
@@ -11,10 +14,15 @@ Pod::Spec.new do |s|
 
   s.homepage     = package['homepage']
   s.license      = package['license']
-  s.platforms = { :ios => "9.0", :tvos => "9.2" }
+  s.platforms = { :ios => ios_platform, :tvos => "9.2" }
 
   s.source       = { :git => "https://github.com/mParticle/react-native-mparticle.git", :tag => "#{s.version}" }
   s.source_files  = "ios/**/*.{h,m}"
-
-  s.dependency 'React'
-end
+  
+  if defined?(install_modules_dependencies()) != nil
+    install_modules_dependencies(s);
+  else
+    s.dependency 'React'
+  end
+    s.dependency 'mParticle-Apple-SDK', '~> 8.0'
+end