Fix CI

Author: BrandonStalnaker

.trunk/trunk.yaml

@@ -8,7 +8,8 @@ runtimes:
   enabled:
     - go@1.19.5
     - java@13.0.11
-    - node@18.12.1
+    # markdownlint 0.48+ / string-width need Node 20+ (regex v flag)
+    - node@20.18.0
     - python@3.10.8
 # This is the section where you manage your linters. (https://docs.trunk.io/check/configuration)
 lint:
@@ -40,10 +41,12 @@ lint:
     - actionlint@1.6.9
     - checkov@3.2.507
     - dotenv-linter@3.3.0
-    - eslint@10.0.2
+    # ESLint 9+ defaults to flat config only; this repo uses .eslintrc.js (ESLint 8 style).
+    - eslint@8.57.1
     - git-diff-check
     - ktlint@0.43.2
-    - markdownlint@0.48.0
+    # 0.48+ pulls string-width that requires Node 20+ for regex /v; Trunk's runner uses Node 18.
+    - markdownlint@0.39.0
     - mparticle-api-key-check
     - osv-scanner@1.3.6
     - oxipng@7.0.0

ExpoTestApp/App.tsx

@@ -221,25 +221,25 @@ export default function App() {
 
   const handleRoktShoppableAds = () => {
     const attributes = {
-      country: "US",
-      shippingstate: "NY",
-      shippingzipcode: "10001",
-      firstname: "Jenny",
-      stripeApplePayAvailable: "true",
-      last4digits: "4444",
-      shippingaddress1: "123 Main St",
-      colormode: "LIGHT",
-      billingzipcode: "07762",
-      paymenttype: "ApplePay",
-      shippingcountry: "US",
-      sandbox: "true",
-      shippingaddress2: "Apt 4B",
-      confirmationref: "ORD-12345",
-      shippingcity: "New York",
-      newToApplePay: "false",
-      applePayCapabilities: "true",
-      lastname: "Smith",
-      email: "jenny.smith@example.com"
+      country: 'US',
+      shippingstate: 'NY',
+      shippingzipcode: '10001',
+      firstname: 'Jenny',
+      stripeApplePayAvailable: 'true',
+      last4digits: '4444',
+      shippingaddress1: '123 Main St',
+      colormode: 'LIGHT',
+      billingzipcode: '07762',
+      paymenttype: 'ApplePay',
+      shippingcountry: 'US',
+      sandbox: 'true',
+      shippingaddress2: 'Apt 4B',
+      confirmationref: 'ORD-12345',
+      shippingcity: 'New York',
+      newToApplePay: 'false',
+      applePayCapabilities: 'true',
+      lastname: 'Smith',
+      email: 'jenny.smith@example.com',
     };
 
     const config = MParticle.Rokt.createRoktConfig('system');

ExpoTestApp/README.md

@@ -106,8 +106,12 @@ Example (same pattern as `ExpoTestApp/App.tsx`):
 const config = MParticle.Rokt.createRoktConfig('system');
 
 MParticle.Rokt.selectShoppableAds('YOUR_PLACEMENT_ID', attributes, config)
-  .then(() => { /* success */ })
-  .catch((error) => { /* handle */ });
+  .then(() => {
+    /* success */
+  })
+  .catch(error => {
+    /* handle */
+  });
 ```
 
 Listen for `RoktCallback` and `RoktEvents` on `RoktEventManager` to observe load/unload and Shoppable Ads–related events emitted by the native bridge.
@@ -277,16 +281,16 @@ dependencies {
 
 ## Plugin Configuration Options
 
-| Option | Type | Description |
-|--------|------|-------------|
-| `iosApiKey` | string | mParticle iOS API key |
-| `iosApiSecret` | string | mParticle iOS API secret |
-| `androidApiKey` | string | mParticle Android API key |
-| `androidApiSecret` | string | mParticle Android API secret |
-| `logLevel` | string | Log level: `none`, `error`, `warning`, `debug`, `verbose` |
-| `environment` | string | Environment: `development`, `production`, `autoDetect` |
-| `useEmptyIdentifyRequest` | boolean | Initialize with empty identify request (default: true) |
-| `dataPlanId` | string | Data plan ID for validation |
-| `dataPlanVersion` | number | Data plan version |
-| `iosKits` | string[] | iOS kit pod names (e.g., `["mParticle-Rokt"]`) |
-| `androidKits` | string[] | Android kit dependencies (e.g., `["android-rokt-kit"]`) |
+| Option                    | Type     | Description                                               |
+| ------------------------- | -------- | --------------------------------------------------------- |
+| `iosApiKey`               | string   | mParticle iOS API key                                     |
+| `iosApiSecret`            | string   | mParticle iOS API secret                                  |
+| `androidApiKey`           | string   | mParticle Android API key                                 |
+| `androidApiSecret`        | string   | mParticle Android API secret                              |
+| `logLevel`                | string   | Log level: `none`, `error`, `warning`, `debug`, `verbose` |
+| `environment`             | string   | Environment: `development`, `production`, `autoDetect`    |
+| `useEmptyIdentifyRequest` | boolean  | Initialize with empty identify request (default: true)    |
+| `dataPlanId`              | string   | Data plan ID for validation                               |
+| `dataPlanVersion`         | number   | Data plan version                                         |
+| `iosKits`                 | string[] | iOS kit pod names (e.g., `["mParticle-Rokt"]`)            |
+| `androidKits`             | string[] | Android kit dependencies (e.g., `["android-rokt-kit"]`)   |

android/src/oldarch/java/com/mparticle/react/NativeMPRoktSpec.kt

@@ -21,6 +21,12 @@ abstract class NativeMPRoktSpec(
         fontFilesMap: ReadableMap?,
     )
 
+    abstract fun selectShoppableAds(
+        identifier: String,
+        attributes: ReadableMap?,
+        roktConfig: ReadableMap?,
+    )
+
     abstract fun purchaseFinalized(
         placementId: String,
         catalogItemId: String,

package.json

@@ -37,7 +37,7 @@
   "dependencies": {},
   "peerDependencies": {
     "react": ">= 16.0.0-alpha.12",
-    "react-native": ">= 0.45.0",
+    "react-native": ">= 0.76.0",
     "@expo/config-plugins": ">=7.0.0"
   },
   "peerDependenciesMeta": {

plugin/src/withMParticleIOS.ts

@@ -338,7 +338,12 @@ function addMParticleToObjcAppDelegate(
  * These are dependencies of mParticle kits that must also be dynamic frameworks
  */
 const KIT_TRANSITIVE_DEPENDENCIES: Record<string, string[]> = {
-  'mParticle-Rokt': ['Rokt-Widget', 'RoktContracts', 'RoktUXHelper', 'DcuiSchema'],
+  'mParticle-Rokt': [
+    'Rokt-Widget',
+    'RoktContracts',
+    'RoktUXHelper',
+    'DcuiSchema',
+  ],
   // Add other kit dependencies here as needed
   // "mParticle-Amplitude": [],
   // "mParticle-Braze": [],
@@ -348,7 +353,11 @@ const KIT_TRANSITIVE_DEPENDENCIES: Record<string, string[]> = {
  * Get all pods that need dynamic framework linking
  */
 function getDynamicFrameworkPods(iosKits?: string[]): string[] {
-  const pods = ['mParticle-Apple-SDK', 'mParticle-Apple-SDK-ObjC', 'mParticle-Apple-SDK-Swift'];
+  const pods = [
+    'mParticle-Apple-SDK',
+    'mParticle-Apple-SDK-ObjC',
+    'mParticle-Apple-SDK-Swift',
+  ];
 
   if (iosKits) {
     for (const kit of iosKits) {

sample/ios/Podfile

@@ -5,12 +5,13 @@ require Pod::Executable.execute_command('node', ['-p',
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 
-platform :ios, min_ios_version_supported
+# react-native-mparticle.podspec requires iOS 15.6+; RN's min_ios_version_supported is still 15.1.
+platform :ios, '15.6'
 prepare_react_native_project!
 
 pre_install do |installer|
   installer.pod_targets.each do |pod|
-    if pod.name == 'mParticle-Apple-SDK' || pod.name == 'mParticle-Rokt' || pod.name == 'Rokt-Widget'
+    if pod.name == 'mParticle-Apple-SDK' || pod.name == 'mParticle-Apple-SDK-ObjC' || pod.name == 'mParticle-Apple-SDK-Swift' || pod.name == 'mParticle-Rokt' || pod.name == 'Rokt-Widget' || pod.name == 'RoktContracts' || pod.name == 'RoktUXHelper' || pod.name == 'DcuiSchema'
       def pod.build_type;
         Pod::BuildType.new(:linkage => :dynamic, :packaging => :framework)
       end