FENCE-2649: Add vendored xcframework

.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
   ios:
     macos:
       xcode: "16.4.0"
-    resource_class: m2pro.large
+    resource_class: m4pro.large
     working_directory: ~/react-native-radar/example
     steps:
       - attach_workspace:

.gitignore

@@ -37,3 +37,7 @@ junit.xml
 lib/
 
 .vscode/
+
+# Do NOT ignore these - they're vendored dependencies
+# !ios/RadarSDK.xcframework
+# !ios/RadarSDKMotion.xcframework

Radar.podspec

@@ -13,10 +13,10 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/radarlabs/react-native-radar.git/react-native-radar.git", :tag => "#{s.version}" }
 
-  s.source_files = "ios/**/*.{h,m,mm,cpp}"
-  s.private_header_files = "ios/**/*.h"
+  s.source_files = "ios/*.{h,m,mm,cpp}"
+  s.private_header_files = "ios/*.h"
 
-  s.dependency "RadarSDK", "3.25.0"
+  s.vendored_frameworks = "ios/RadarSDK.xcframework"
 
  install_modules_dependencies(s)
 end

RadarMotion.podspec

@@ -0,0 +1,23 @@
+require "json"
+
+package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+
+Pod::Spec.new do |s|
+  s.name         = "RadarMotion"
+  s.version      = package["version"]
+  s.summary      = "RadarSDKMotion extension for react-native-radar"
+  s.homepage     = "https://github.com/radarlabs/react-native-radar"
+  s.license      = package["license"]
+  s.authors      = "radarlabs"
+
+  s.platforms    = { :ios => min_ios_version_supported }
+  s.source       = { :git => "https://github.com/radarlabs/react-native-radar.git", :tag => "#{s.version}" }
+
+  s.source_files = "ios/RadarMotionStub.swift"
+
+  s.vendored_frameworks = "ios/RadarSDKMotion.xcframework"
+
+  s.dependency "Radar", "#{s.version}"
+
+  install_modules_dependencies(s)
+end

example/App.tsx

@@ -28,7 +28,7 @@ import { Settings as RNSettings } from 'react-native';
 // }
 
 
-Radar.initialize("prj_test_pk_", true);
+Radar.initialize("prj_test_pk_7b46891aa0a8278b5acc6bbc9f227aa5c3319483", true);
 const stringify = (obj: any) => JSON.stringify(obj, null, 2);
 declare global {
   var __turboModuleProxy: any;

example/app.json

@@ -6,7 +6,7 @@
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
-    "newArchEnabled": true,
+    "newArchEnabled": false,
     "splash": {
       "image": "./assets/splash.png",
       "resizeMode": "contain",
@@ -22,7 +22,8 @@
       "infoPlist": {
         "NSLocationWhenInUseUsageDescription": "This app needs location.",
         "NSLocationAlwaysAndWhenInUseUsageDescription": "This app needs location."
-      }
+      },
+      "appleTeamId": "96GHH65B9D"
     },
     "android": {
       "adaptiveIcon": {

ios/RNRadar.h

@@ -5,7 +5,6 @@
 #endif
 
 #import <RadarSDK/RadarSDK.h>
-#import <RadarSDK/RadarSettings.h>
 #import <React/RCTBridgeModule.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED

ios/RNRadar.mm

@@ -3,6 +3,8 @@
 #import <CoreLocation/CoreLocation.h>
 #import <React/RCTConvert.h>
 
+static NSString *_publishableKey = nil;
+
 @implementation RNRadar {
     CLLocationManager *locationManager;
     RCTPromiseResolveBlock permissionsRequestResolver;
@@ -185,6 +187,7 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token {
 }
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
+    _publishableKey = publishableKey; 
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
     [[NSUserDefaults standardUserDefaults] setObject:@"3.24.0" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
@@ -259,11 +262,11 @@ - (void)didUpdateToken:(RadarVerifiedLocationToken *)token {
 }
 
 RCT_EXPORT_METHOD(getHost:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    resolve([RadarSettings host]);
+    resolve(@"https://api.radar.io");
 }
 
 RCT_EXPORT_METHOD(getPublishableKey:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
-    resolve([RadarSettings publishableKey]);
+    resolve(_publishableKey);
 }
 
 RCT_EXPORT_METHOD(getPermissionsStatus:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {

ios/RadarMotionStub.swift

@@ -0,0 +1,3 @@
+// Stub file for RadarMotion podspec
+// The actual RadarSDKMotion framework is vendored as an xcframework
+import Foundation

ios/RadarSDK.xcframework/Info.plist

@@ -0,0 +1,48 @@
+<?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>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>BinaryPath</key>
+			<string>RadarSDK.framework/RadarSDK</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>RadarSDK.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+		<dict>
+			<key>BinaryPath</key>
+			<string>RadarSDK.framework/RadarSDK</string>
+			<key>DebugSymbolsPath</key>
+			<string>dSYMs</string>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>RadarSDK.framework</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>

ios/RadarSDK.xcframework/ios-arm64/dSYMs/RadarSDK.framework.dSYM/Contents/Info.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>CFBundleDevelopmentRegion</key>
+		<string>English</string>
+		<key>CFBundleIdentifier</key>
+		<string>com.apple.xcode.dsym.io.radar.sdk</string>
+		<key>CFBundleInfoDictionaryVersion</key>
+		<string>6.0</string>
+		<key>CFBundlePackageType</key>
+		<string>dSYM</string>
+		<key>CFBundleSignature</key>
+		<string>????</string>
+		<key>CFBundleShortVersionString</key>
+		<string>3.25.2</string>
+		<key>CFBundleVersion</key>
+		<string>1</string>
+	</dict>
+</plist>