react-native-acoustic-connect-beta 16.0.0 → 16.0.1

package/Example/nativebase-v3-kitchensink/package.json

@@ -15,6 +15,7 @@
         "react": "18.2.0",
         "react-dom": "18.1.0",
         "react-native": "0.72.6",
+        "react-native-acoustic-connect-beta": "^16.0.0",
         "react-native-gesture-handler": "~2.8.0",
         "react-native-keyboard-aware-scroll-view": "^0.9.5",
         "react-native-reanimated": "~2.17.0",
@@ -24,8 +25,7 @@
         "react-native-web": "~0.18.9",
         "shelljs": "^0.8.5",
         "styled-components": "^5.3.0",
-        "styled-system": "^5.1.5",
-        "react-native-acoustic-connect-beta": "file:node_modules/react-native-acoustic-connect-beta/"
+        "styled-system": "^5.1.5"
     },
     "devDependencies": {
         "@babel/core": "^7.20.0",

package/Example/nativebase-v3-kitchensink/yarn.lock

@@ -11262,9 +11262,10 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
-"react-native-acoustic-connect-beta@link:node_modules/react-native-acoustic-connect-beta":
-  version "0.0.0"
-  uid ""
+react-native-acoustic-connect-beta@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/react-native-acoustic-connect-beta/-/react-native-acoustic-connect-beta-16.0.0.tgz#b804528df67bbe20f7a1ecd3ba552d32d6889529"
+  integrity sha512-a4UJz535TAiTKXazbWffex6uO+AcRJj6TyuXQ+yfA3aJkFloZPUyOVIR406dhAHtPOvIcAp8oqKepP2mEZPQng==
 
 react-native-gesture-handler@~2.8.0:
   version "2.8.0"

package/ios/Podfile

@@ -24,8 +24,27 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 platform :ios, '13.0'
-use_frameworks!
-pod 'AcousticConnectReactNativeDebug'
+
+target 'RNCxa' do
+  use_frameworks! :linkage => :static
+  config = use_native_modules!
+
+  use_react_native!(
+    :path => config[:reactNativePath],
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :hermes_enabled => false
+  )
+
+  # Enables Flipper.
+  #
+  # Note that if you have use_frameworks! enabled, Flipper will not work and
+  # you should disable the next line.
+  # use_flipper!()
+
+  # post_install do |installer|
+  #   react_native_post_install(installer)
+  # end
+end
 
 target 'RNCxaStandaloneDebug' do
   config = use_native_modules!

package/ios/RNCxa.m

@@ -23,6 +23,9 @@
 #import <EOCore/EOCore.h>
 #import <EOCore/EOApplicationHelper.h>
 #import <ConnectReactNative/ConnectBridgingHeader.h>
+#import <TealeafReactNative/TLFPublicDefinitions.h>
+#import <ConnectReactNative/ConnectApplicationHelper.h>
+#import <ConnectReactNative/ConnectCustomEvent.h>
 #import <CoreLocation/CoreLocation.h>
 #import <Foundation/Foundation.h>
 
@@ -30,8 +33,8 @@
 + (void)load {
     [[EOApplicationHelper sharedInstance] setConfigItem:kConfigurableItemSetGestureDetector value:@"false" forModuleName:@"Connect"];
     [[EOApplicationHelper sharedInstance] setConfigItem:kConfigurableItemLogViewLayoutOnScreenTransition value:@"false" forModuleName:@"Connect"];
-    [[TLFApplicationHelper sharedInstance] enableConnectFramework];
-    [[TLFApplicationHelper sharedInstance] isReactNative:YES];
+    [[ConnectApplicationHelper sharedInstance] enableFramework];
+    [[ConnectApplicationHelper sharedInstance] isReactNative:YES];
 }
 @end
 
@@ -161,7 +164,7 @@ RCT_EXPORT_METHOD(getNumberItemForKey:(NSString *)key forModuleName:(NSString *)
  */
 RCT_EXPORT_METHOD(logCustomEvent:(NSString *)eventName values:(NSDictionary *)values level:(nonnull NSNumber*)level resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logEvent:eventName values:values level:[self getLogLevel:level]]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logEvent:eventName values:values level:[self getLogLevel:level]]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -175,7 +178,7 @@ RCT_EXPORT_METHOD(logCustomEvent:(NSString *)eventName values:(NSDictionary *)va
 RCT_EXPORT_METHOD(logExceptionEvent:(NSString *)message stack:(NSString *)stackInfo unhandled:(BOOL)unhandled resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     NSDictionary *exceptionDict = @{ @"type": @"React Plugin", @"message": message, @"stacktrace": stackInfo};
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logNSExceptionEvent:nil dataDictionary:exceptionDict isUnhandled:unhandled]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logNSExceptionEvent:nil dataDictionary:exceptionDict isUnhandled:unhandled]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -187,7 +190,7 @@ RCT_EXPORT_METHOD(logExceptionEvent:(NSString *)message stack:(NSString *)stackI
 RCT_EXPORT_METHOD(logLocation:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
     CLLocation *location = nil;
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logLocation:location]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logLocation:location]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -200,7 +203,7 @@ RCT_EXPORT_METHOD(logLocation:(RCTPromiseResolveBlock)resolve
  */
 RCT_EXPORT_METHOD(logLocationWithLatitudeLongitude:(double)lat longitude:(double)lng level:(nonnull NSNumber*)level resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logLocationUpdateEventWithLatitude:lat longitude:lng level:[self getLogLevel:level]]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logLocationUpdateEventWithLatitude:lat longitude:lng level:[self getLogLevel:level]]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -230,7 +233,7 @@ RCT_EXPORT_METHOD(logClickEvent:(nonnull NSNumber *)target controlId:(NSString *
             return;
         }
         
-        id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logClickEvent:view controlId:controlId data:nil]];
+        id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logClickEvent:view controlId:controlId data:nil]];
         [self updateResult:result resolver:resolve rejecter:reject];
     }];
 }
@@ -266,7 +269,7 @@ RCT_EXPORT_METHOD(logTextChangeEvent:(nonnull NSNumber *)target controlId:(NSStr
             data = @{@"text":text};
         }
         
-        id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logTextChangeEvent:view data:data]];
+        id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logTextChangeEvent:view data:data]];
         [self updateResult:result resolver:resolve rejecter:reject];
     }];
 }
@@ -279,7 +282,7 @@ RCT_EXPORT_METHOD(logTextChangeEvent:(nonnull NSNumber *)target controlId:(NSStr
  */
 RCT_EXPORT_METHOD(setCurrentScreenName:(NSString*)logicalPageName resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     dispatch_async(dispatch_get_main_queue(), ^{
-        id result = [NSNumber numberWithBool:[[TLFApplicationHelper sharedInstance] resumeConnect:logicalPageName]];
+        id result = [NSNumber numberWithBool:[[ConnectApplicationHelper sharedInstance] resume:logicalPageName]];
         [self updateResult:result resolver:resolve rejecter:reject];
     });
 }
@@ -291,7 +294,7 @@ RCT_EXPORT_METHOD(setCurrentScreenName:(NSString*)logicalPageName resolver:(RCTP
  @return Boolean value will return whether it was able to log the screenview event.
  */
 RCT_EXPORT_METHOD(logScreenViewPageName:(NSString*)logicalPageName resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logScreenViewPageName:logicalPageName]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logScreenViewPageName:logicalPageName]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -303,7 +306,7 @@ RCT_EXPORT_METHOD(logScreenViewPageName:(NSString*)logicalPageName resolver:(RCT
  */
 RCT_EXPORT_METHOD(logScreenViewContextLoad:(NSString*)logicalPageName referrer:(NSString*)referrer resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     NSString *cllasss = logicalPageName == nil ? @"ReactNative" : [NSString stringWithFormat:@"ReactNative_%@", logicalPageName];
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logScreenViewContext:logicalPageName withClass:cllasss  applicationContext:TLFScreenViewTypeLoad referrer:referrer]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logScreenViewContext:logicalPageName withClass:cllasss  applicationContext:ConnectScreenViewTypeLoad referrer:referrer]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -315,7 +318,7 @@ RCT_EXPORT_METHOD(logScreenViewContextLoad:(NSString*)logicalPageName referrer:(
  */
 RCT_EXPORT_METHOD(logScreenViewContextUnload:(NSString*)logicalPageName referrer:(NSString*)referrer resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
     NSString *cllasss = logicalPageName == nil ? @"ReactNative" : [NSString stringWithFormat:@"ReactNative_%@", logicalPageName];
-    id result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logScreenViewContext:logicalPageName withClass:cllasss applicationContext:TLFScreenViewTypeUnload referrer:referrer]];
+    id result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logScreenViewContext:logicalPageName withClass:cllasss applicationContext:ConnectScreenViewTypeUnload referrer:referrer]];
     [self updateResult:result resolver:resolve rejecter:reject];
 }
 
@@ -330,7 +333,7 @@ RCT_EXPORT_METHOD(logScreenLayout:(NSString*)name andDelay:(nonnull NSNumber *)d
     dispatch_async(dispatch_get_main_queue(), ^{
         RCTLogInfo(@"logScreenLayout Name:%@ with Delay:%@", name, delay);
         UIViewController *uv = nil;
-        UIViewController *topController = [UIApplication sharedApplication].keyWindow.rootViewController;
+        UIViewController *topController = EOApplicationHelper.sharedInstance.getUIWindow.rootViewController;
         while (topController.presentedViewController) {
             topController = topController.presentedViewController;
         }
@@ -340,9 +343,9 @@ RCT_EXPORT_METHOD(logScreenLayout:(NSString*)name andDelay:(nonnull NSNumber *)d
         
         id result;
         if (delay.floatValue <= 0) {
-            result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logScreenLayoutWithViewController:uv andName:name]];
+            result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logScreenLayoutWithViewController:uv andName:name]];
         } else {
-            result = [NSNumber numberWithBool:[[TLFCustomEvent sharedInstance] logScreenLayoutWithViewController:uv andDelay:0.5 andName:name]];
+            result = [NSNumber numberWithBool:[[ConnectCustomEvent sharedInstance] logScreenLayoutWithViewController:uv andDelay:0.5 andName:name]];
         }
         
         [self updateResult:result resolver:resolve rejecter:reject];
@@ -365,14 +368,14 @@ RCT_EXPORT_METHOD(logScreenLayout:(NSString*)name andDelay:(nonnull NSNumber *)d
     }
 }
 
-- (kTLFMonitoringLevelType)getLogLevel:(nonnull NSNumber*)level {
-    kTLFMonitoringLevelType monitorLevel = kTLFMonitoringLevelIgnore;
-    if (level.intValue == kTLFMonitoringLevelIgnore) {
-        monitorLevel = kTLFMonitoringLevelIgnore;
-    } else if (level.intValue == kTLFMonitoringLevelCellularAndWiFi) {
-        monitorLevel = kTLFMonitoringLevelCellularAndWiFi;
-    } else if (level.intValue >= kTLFMonitoringLevelWiFi) {
-        monitorLevel = kTLFMonitoringLevelWiFi;
+- (kConnectMonitoringLevelType)getLogLevel:(nonnull NSNumber*)level {
+    kConnectMonitoringLevelType monitorLevel = kConnectMonitoringLevelIgnore;
+    if (level.intValue == kConnectMonitoringLevelIgnore) {
+        monitorLevel = kConnectMonitoringLevelIgnore;
+    } else if (level.intValue == kConnectMonitoringLevelCellularAndWiFi) {
+        monitorLevel = kConnectMonitoringLevelCellularAndWiFi;
+    } else if (level.intValue >= kConnectMonitoringLevelWiFi) {
+        monitorLevel = kConnectMonitoringLevelWiFi;
     }
     return monitorLevel;
 }

package/ios/RNCxa.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -40,6 +40,9 @@
 		1F1DBFC13B423A5FAF766883 /* Pods-RNCxaStandaloneDebug.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNCxaStandaloneDebug.release.xcconfig"; path = "Target Support Files/Pods-RNCxaStandaloneDebug/Pods-RNCxaStandaloneDebug.release.xcconfig"; sourceTree = "<group>"; };
 		28FC99E09142DF847BA8A297 /* Pods_RNCxaStandaloneDebug.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RNCxaStandaloneDebug.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		66B925272050590C00DFC51F /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		6D7AF8B82CD2C79400C39C63 /* ConnectReactNative.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = ConnectReactNative.xcframework; path = ../../../ios/Pods/ConnectReactNativeDebug/SDKs/iOS/DebugConnectReactNative/ConnectReactNative.xcframework; sourceTree = "<group>"; };
+		6D7AF8BB2CD2CB1B00C39C63 /* EOCore.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:QXQ67VKX2B:Acoustic, L.P."; lastKnownFileType = wrapper.xcframework; name = EOCore.xcframework; path = ../../../ios/Pods/EOCoreDebug/SDKs/iOS/Debug/EOCore.xcframework; sourceTree = "<group>"; };
+		6D7AF8BD2CD2CB2C00C39C63 /* TealeafReactNative.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:QXQ67VKX2B:Acoustic, L.P."; lastKnownFileType = wrapper.xcframework; name = TealeafReactNative.xcframework; path = ../../../ios/Pods/TealeafReactNativeDebug/SDKs/iOS/DebugTealeafReactNative/TealeafReactNative.xcframework; sourceTree = "<group>"; };
 		9927869C26A0CE1900356A5F /* libRNCxaStandaloneDebug.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNCxaStandaloneDebug.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		99312E5E20EC64C40060FE60 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		99312E6020EC64CD0060FE60 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -94,6 +97,9 @@
 		66B924C8204F8AA200DFC51F /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				6D7AF8BD2CD2CB2C00C39C63 /* TealeafReactNative.xcframework */,
+				6D7AF8BB2CD2CB1B00C39C63 /* EOCore.xcframework */,
+				6D7AF8B82CD2C79400C39C63 /* ConnectReactNative.xcframework */,
 				99312E6420EC64DB0060FE60 /* UIKit.framework */,
 				99312E6220EC64D40060FE60 /* CoreGraphics.framework */,
 				99312E6020EC64CD0060FE60 /* CoreLocation.framework */,
@@ -354,6 +360,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = NO;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				ENABLE_TESTABILITY = NO;
+				EXCLUDED_ARCHS = arm64;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_INPUT_FILETYPE = automatic;
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
@@ -362,7 +369,6 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
-					"${SRCROOT}/../../../ios/Pods/Headers/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
@@ -391,6 +397,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = NO;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = NO;
 				ENABLE_TESTABILITY = NO;
+				EXCLUDED_ARCHS = arm64;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_INPUT_FILETYPE = automatic;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
@@ -399,7 +406,6 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
-					"${SRCROOT}/../../../ios/Pods/Headers/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
@@ -442,7 +448,6 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(SRCROOT)/../../../ios/Pods/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
@@ -487,9 +492,6 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../../../React/**",
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(SRCROOT)/../../../ios/Pods/**",
-					"\"$(SRCROOT)/../node_modules/react-native/React\"/**",
-					"\"$(SRCROOT)/../node_modules/react-native/Libraries\"/**",
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited)";

package/package.json

@@ -38,5 +38,5 @@
         "verifyConnectSetup": "node scripts/verifyConnectSetup.js $INIT_CWD"
     },
     "summary": "react-native ios android tealeaf connect cxa wxca er enhanced-replay",
-    "version": "16.0.0"
+    "version": "16.0.1"
 }

package/react-native-acoustic-connect-beta.podspec

@@ -14,7 +14,7 @@ puts "repository:#{repository}"
 puts "useRelease:#{useRelease}"
 puts "dependencyName:#{dependencyName}"
 puts "dependencyVersion:#{dependencyVersion}"
-puts "tlDependency:#{dependencyName}#{dependencyVersion}"
+puts "connectDependency:#{dependencyName}#{dependencyVersion}"
 puts "***************************************************************"
 
 Pod::Spec.new do |s|
@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.summary        = package["summary"]
   s.license        = package["license"]
   s.authors        = package["author"]
-  s.platforms      = { :ios => "12.0" }
+  s.platforms      = { :ios => "13.0" }
   
   s.source         = { :git => repository, :tag => s.version }
   s.preserve_paths = 'README.md', 'package.json', '*.js'