react-native-mparticle 2.7.0 → 2.7.1-patch.1

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

@@ -0,0 +1,31 @@
+name: "Build and Test"
+
+on: [pull_request, push]
+
+jobs:
+    js-tests:
+      name: "JS Tests"
+      runs-on: macOS-latest
+      steps:
+      - name: "Checkout"
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@master
+      - uses: c-hive/gha-yarn-cache@v1
+
+      - name: "Install node modules"
+        run: |
+          yarn install
+          
+      - name: "Run test"
+        run: |
+          yarn test
+    android-unit-tests:
+      name: "Android Unit Tests"
+      runs-on: ubuntu-18.04
+      steps:
+          - name: "Checkout"
+            uses: actions/checkout@v2
+          
+          - name: "Run Android Unit Tests"
+            working-directory: android
+            run: ./gradlew test

package/android/.classpath

@@ -0,0 +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.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Mar 17 12:51:17 EDT 2021
+gradle.version=5.4.1

package/android/.project

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>android</name>
+	<comment>Project android created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1669992816070</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>

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

@@ -0,0 +1,13 @@
+arguments=--init-script /var/folders/g2/z0qqdq651r90nx1z1l28fpj1wbw2yx/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/g2/z0qqdq651r90nx1z1l28fpj1wbw2yx/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+auto.sync=false
+build.scans.enabled=false
+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
+jvm.arguments=
+offline.mode=false
+override.workspace.settings=true
+show.console.view=true
+show.executions.view=true

package/android/build.gradle

@@ -47,7 +47,7 @@ dependencies {
     //
     // (See https://github.com/mparticle/mparticle-android-sdk for the latest version)
     //
-    compileOnly 'com.mparticle:android-core:[5.9.3, 5.38.2]'
+    compileOnly 'com.mparticle:android-core:[5.9.3, )'
 
     //
     // And, if you want to include kits, you can do so as follows:

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

@@ -62,13 +62,18 @@ public class MParticleModule extends ReactContextBaseJavaModule {
         return "MParticle";
     }
 
+    @ReactMethod
+    public void upload() {
+        MParticle.getInstance().upload();
+    }
+
     @ReactMethod
     public void logEvent(final String name, int type, final ReadableMap attributesMap) {
         Map<String, String> attributes = ConvertStringMap(attributesMap);
         MParticle.EventType eventType = ConvertEventType(type);
 
         MPEvent event = new MPEvent.Builder(name, eventType)
-                .info(attributes)
+                .customAttributes(attributes)
                 .build();
         MParticle.getInstance().logEvent(event);
     }
@@ -510,7 +515,7 @@ public class MParticleModule extends ReactContextBaseJavaModule {
             if (map.hasKey("info")) {
                 ReadableMap customInfoMap = map.getMap("info");
                 Map<String, String> customInfo = ConvertStringMap(customInfoMap);
-                builder.info(customInfo);
+                builder.customAttributes(customInfo);
             }
 
             if (map.hasKey("customFlags")) {

package/ios/RNMParticle/RNMParticle.m

@@ -19,6 +19,11 @@ RCT_EXTERN void RCTRegisterModule(Class);
     RCTRegisterModule(self);
 }
 
+RCT_EXPORT_METHOD(upload)
+{
+    [[MParticle sharedInstance] upload];
+}
+
 RCT_EXPORT_METHOD(logEvent:(NSString *)eventName type:(NSInteger)type attributes:(NSDictionary *)attributes)
 {
     [[MParticle sharedInstance] logEvent:eventName eventType:type eventInfo:attributes];

package/ios/RNMParticle.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/RNMParticle.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/RNMParticle.xcodeproj/xcuserdata/bstalnaker.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   uuid = "39402CF6-7BAB-4033-9C4A-41AE5477C134"
+   type = "1"
+   version = "2.0">
+</Bucket>

package/ios/RNMParticle.xcodeproj/xcuserdata/bstalnaker.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>RNMParticle.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/js/index.js

@@ -84,6 +84,10 @@ const ATTAuthStatus = {
 
 // ******** Main API ********
 
+const upload = () => {
+  NativeModules.MParticle.upload()
+}
+
 const logEvent = (eventName, type = EventType.Other, attributes = null) => {
   NativeModules.MParticle.logEvent(eventName, type, attributes)
 }
@@ -660,6 +664,7 @@ const MParticle = {
   GDPRConsent,
   CCPAConsent,
 
+  upload,
   logEvent,             // Methods
   logMPEvent,
   logCommerceEvent,

package/package.json

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

package/.github/workflows/react-ci.yml

@@ -1,22 +0,0 @@
-name: Continuous Integration
-
-on:
-  pull_request:
-  push:
-
-jobs:
-  build:
-    runs-on: macOS-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: actions/setup-node@master
-    - uses: c-hive/gha-yarn-cache@v1
-
-    - name: Install node modules
-      run: |
-        yarn install
-        
-    - name: Run test
-      run: |
-        yarn test