react-native-mparticle 2.7.8 → 2.7.10

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].
@@ -37,8 +31,12 @@ $ react-native link
 2. **Install the SDK** using CocoaPods:
 
 ```bash
-$ # Update your Podfile to depend on 'mParticle-Apple-SDK' version 7.2.0 or later
-$ pod install
+$ # Update your Podfile to be ready to use dynamically linked frameworks by commenting out the following line
+$ # :flipper_configuration => flipper_config,
+```
+Then run the following command
+```
+$ USE_FRAMEWORKS=dynamic bundle exec pod install
 ```
 
 The mParticle SDK is initialized by calling the `startWithOptions` method within the `application:didFinishLaunchingWithOptions:` delegate call.
@@ -83,21 +81,16 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions lau
 
 #### Objective-C Example
 
-For apps supporting iOS 8 and above, Apple recommends using the import syntax for **modules** or **semantic import**. However, if you prefer the traditional CocoaPods and static libraries delivery mechanism, that is fully supported as well.
-
-If you are using mParticle as a framework, your import statement will be as follows:
-
-```objective-c
-@import mParticle_Apple_SDK;                // Apple recommended syntax, but requires "Enable Modules (C and Objective-C)" in pbxproj
-#import <mParticle_Apple_SDK/mParticle.h>   // Works when modules are not enabled
-
-```
-
-Otherwise, for CocoaPods without `use_frameworks!`, you can use either of these statements:
+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:
@@ -130,6 +123,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
 
@@ -254,14 +253,6 @@ MParticle.Identity.getUserIdentities((userIdentities) => {
 var request = new MParticle.IdentityRequest()
 ```
 
-**Set** a user Alias to be ran anytime the user’s identity changes
-```js
-request.onUserAlias = (previousUser, newUser) => {
-    console.debug(previousUser.userID);
-    console.debug(newUser.userID);
-};
-```
-
 **Setting** user identities:
 
 ```js

package/android/.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-19/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/adoptopenjdk-11.jdk/Contents/Home
+java.home=/Users/bstalnaker/Library/Java/JavaVirtualMachines/openjdk-19.0.2/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=19
+org.eclipse.jdt.core.compiler.compliance=19
+org.eclipse.jdt.core.compiler.source=19

package/android/build.gradle

@@ -4,13 +4,13 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
 plugins {
-    id "org.sonarqube" version "3.5.0.2730"
-    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
+    id "org.sonarqube" version "4.4.1.3373"
+    id "org.jlleitschuh.gradle.ktlint" version "11.6.1"
 }
 
 sonarqube {
@@ -72,13 +72,13 @@ dependencies {
     //   compile 'com.mparticle:android-example-kit:REPLACEME'
     //
 
-    testImplementation 'org.mockito:mockito-core:4.11.0'
-    androidTestImplementation 'org.mockito:mockito-android:4.11.0'
-    testImplementation 'androidx.annotation:annotation:1.5.0'
+    testImplementation 'org.mockito:mockito-core:5.8.0'
+    androidTestImplementation 'org.mockito:mockito-android:5.8.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.49.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);
@@ -835,6 +845,10 @@ public class MParticleModule extends ReactContextBaseJavaModule {
                 return MParticle.EventType.UserPreference;
             case 7:
                 return MParticle.EventType.Social;
+            case 8:
+                return MParticle.EventType.Other;
+            case 9:
+                return MParticle.EventType.Media;
             default:
                 return MParticle.EventType.Other;
         }

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

@@ -12,7 +12,8 @@ const EventType = {
   UserContent: 5,
   UserPreference: 6,
   Social: 7,
-  Other: 8
+  Other: 8,
+  Media: 9
 }
 
 const UserAttributeType = {
@@ -157,6 +158,10 @@ const getSession = (completion) => {
   NativeModules.MParticle.getSession(completion)
 }
 
+const setLocation = (latitude, longitude) => {
+  NativeModules.MParticle.setLocation(latitude, longitude)
+}
+
 // ******** Identity ********
 class User {
   constructor (userId) {
@@ -685,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.8",
+  "version": "2.7.10",
   "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