From 10bfb32abbc682b975090a5389e180c053863443 Mon Sep 17 00:00:00 2001 From: Tom Van Laerhoven Date: Fri, 25 Oct 2024 16:24:44 +0200 Subject: [PATCH] Add stable connectors --- e2e/ios/Podfile.lock | 173 ++++++------------ .../project.pbxproj | 36 ++-- e2e/package-lock.json | 77 +++++++- e2e/package.json | 3 + e2e/src/tests/Connector.spec.ts | 33 ++-- e2e/src/tests/index.ts | 5 +- 6 files changed, 166 insertions(+), 161 deletions(-) diff --git a/e2e/ios/Podfile.lock b/e2e/ios/Podfile.lock index da7c21038..6f25a9e54 100644 --- a/e2e/ios/Podfile.lock +++ b/e2e/ios/Podfile.lock @@ -1,13 +1,14 @@ PODS: - boost (1.84.0) + - ComScore (6.10.2): + - ComScore/Dynamic (= 6.10.2) + - ComScore/Dynamic (6.10.2) + - ConvivaSDK (4.0.51) - DoubleConversion (1.1.6) - - DSFRegex (3.3.1) - FBLazyVector (0.75.4-0) - fmt (9.1.0) - glog (0.3.5) - google-cast-sdk-dynamic-xcframework (4.8.0) - - GoogleAds-IMA-iOS-SDK (3.23.0) - - GoogleAds-IMA-tvOS-SDK (4.9.1) - hermes-engine (0.75.4-0): - hermes-engine/Pre-built (= 0.75.4-0) - hermes-engine/Pre-built (0.75.4-0) @@ -1264,7 +1265,6 @@ PODS: - React-featureflags - React-graphics - React-ImageManager - - react-native-slider/common (= 4.5.4) - React-NativeModulesApple - React-RCTFabric - React-rendererdebug @@ -1273,33 +1273,17 @@ PODS: - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - Yoga - - react-native-slider/common (4.5.4): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety + - react-native-theoplayer (8.6.0): - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - - react-native-theoplayer (8.5.0): + - THEOplayerSDK-core (~> 8.3) + - react-native-theoplayer-comscore (1.7.1): + - React-Core + - react-native-theoplayer + - THEOplayer-Connector-Comscore (~> 8.0) + - react-native-theoplayer-conviva (1.7.1): - React-Core - - THEOplayer-Connector-SideloadedSubtitle (~> 8.0) - - THEOplayer-Integration-GoogleCast (~> 8.0) - - THEOplayer-Integration-GoogleIMA (~> 8.0) - - THEOplayerSDK-core (~> 8.0) + - react-native-theoplayer + - THEOplayer-Connector-Conviva (~> 8.0) - React-nativeconfig (0.75.4-0) - React-NativeModulesApple (0.75.4-0): - glog @@ -1563,72 +1547,19 @@ PODS: - RNDeviceInfo (10.14.0): - React-Core - RNSVG (15.8.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - RNSVG/common (= 15.8.0) - - Yoga - - RNSVG/common (15.8.0): - - DoubleConversion - - glog - - hermes-engine - - RCT-Folly (= 2024.01.01.00) - - RCTRequired - - RCTTypeSafety - - React-Core - - React-debug - - React-Fabric - - React-featureflags - - React-graphics - - React-ImageManager - - React-NativeModulesApple - - React-RCTFabric - - React-rendererdebug - - React-utils - - ReactCodegen - - ReactCommon/turbomodule/bridging - - ReactCommon/turbomodule/core - - Yoga - SocketRocket (0.7.0) - - Swifter (1.5.0) - - SwiftSubtitles (0.9.1): - - DSFRegex (~> 3.3.1) - - TinyCSV (~> 0.6.1) - - THEOplayer-Connector-SideloadedSubtitle (8.3.0): - - Swifter (= 1.5.0) - - SwiftSubtitles (= 0.9.1) + - THEOplayer-Connector-Comscore (8.3.0): + - ComScore (~> 6.10.0) + - THEOplayerSDK-core (~> 8) + - THEOplayer-Connector-Conviva (8.3.0): + - ConvivaSDK (~> 4.0.30) + - THEOplayer-Connector-Utilities (>= 8.3.0, ~> 8.3) + - THEOplayerSDK-core (~> 8) + - THEOplayer-Connector-Utilities (8.3.0): + - ConvivaSDK (~> 4.0.30) - THEOplayerSDK-core (~> 8) - - THEOplayer-Integration-GoogleCast (8.3.0): - - THEOplayer-Integration-GoogleCast/Base (= 8.3.0) - - THEOplayer-Integration-GoogleCast/Dependencies (= 8.3.0) - - THEOplayer-Integration-GoogleCast/Base (8.3.0) - - THEOplayer-Integration-GoogleCast/Dependencies (8.3.0): - - google-cast-sdk-dynamic-xcframework (~> 4.8) - - THEOplayer-Integration-GoogleIMA (8.3.0): - - THEOplayer-Integration-GoogleIMA/Base (= 8.3.0) - - THEOplayer-Integration-GoogleIMA/Dependencies (= 8.3.0) - - THEOplayer-Integration-GoogleIMA/Base (8.3.0) - - THEOplayer-Integration-GoogleIMA/Dependencies (8.3.0): - - GoogleAds-IMA-iOS-SDK (~> 3.18) - - GoogleAds-IMA-tvOS-SDK (~> 4.8) - THEOplayerSDK-core (8.3.0) - - TinyCSV (0.6.1) - Yoga (0.0.0) DEPENDENCIES: @@ -1672,6 +1603,8 @@ DEPENDENCIES: - react-native-google-cast (from `https://github.com/Danesz/react-native-google-cast.git`, branch `feature/guestmode_apple_silicon`) - "react-native-slider (from `../node_modules/@react-native-community/slider`)" - react-native-theoplayer (from `../..`) + - "react-native-theoplayer-comscore (from `../node_modules/@theoplayer/react-native-analytics-comscore`)" + - "react-native-theoplayer-conviva (from `../node_modules/@theoplayer/react-native-analytics-conviva`)" - React-nativeconfig (from `../node_modules/react-native/ReactCommon`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) @@ -1704,19 +1637,15 @@ DEPENDENCIES: SPEC REPOS: trunk: - - DSFRegex + - ComScore + - ConvivaSDK - google-cast-sdk-dynamic-xcframework - - GoogleAds-IMA-iOS-SDK - - GoogleAds-IMA-tvOS-SDK - PromisesObjC - SocketRocket - - Swifter - - SwiftSubtitles - - THEOplayer-Connector-SideloadedSubtitle - - THEOplayer-Integration-GoogleCast - - THEOplayer-Integration-GoogleIMA + - THEOplayer-Connector-Comscore + - THEOplayer-Connector-Conviva + - THEOplayer-Connector-Utilities - THEOplayerSDK-core - - TinyCSV EXTERNAL SOURCES: boost: @@ -1797,6 +1726,10 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/slider" react-native-theoplayer: :path: "../.." + react-native-theoplayer-comscore: + :path: "../node_modules/@theoplayer/react-native-analytics-comscore" + react-native-theoplayer-conviva: + :path: "../node_modules/@theoplayer/react-native-analytics-conviva" React-nativeconfig: :path: "../node_modules/react-native/ReactCommon" React-NativeModulesApple: @@ -1863,14 +1796,13 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: boost: d70f09e8edc61001a5cd2131f47cca76f9b3f031 + ComScore: 3669769a26adf769adddc51ffa34e48ee51a8661 + ConvivaSDK: c5d877bf5a830a8dd0b0696c538a11fc96208ec5 DoubleConversion: 00143ab27d470b28035933623e1a3ea37e68889c - DSFRegex: 8493187c71ac199695245eb9ec98bad4f87a2f0b FBLazyVector: e06894178a2469b6da988d1d4de56aca5a3f90d1 fmt: 1568fa7b2f242362c45c42d4a15e9dd4b2e621b3 glog: 4d211b5b727f9d4542418484bf9945f28b8cb4a5 google-cast-sdk-dynamic-xcframework: d1323732742c979b2d7e5b061cbe665915981f3d - GoogleAds-IMA-iOS-SDK: ee2a68ed7a1a17c7bb81bdb1b81590b35a3fc8f3 - GoogleAds-IMA-tvOS-SDK: 85e799c35051454693492480ef7e4ae2e701a05f hermes-engine: ac68d6c3169772a7a7f9eeb25dbb5ff87930034f PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 RCT-Folly: 4728c42e04357ad445c7048e7c542b59f3ee6b4f @@ -1883,16 +1815,16 @@ SPEC CHECKSUMS: React-CoreModules: 73750929751f3f9d6acb7dc76f73d72b2ffb736e React-cxxreact: 766380b9459a5f4e1d2f9b31832e8fcff6b7be6d React-debug: 2f519ade026b776867eca46fe4581dfe9b62e5b5 - React-defaultsnativemodule: 3c82ca836910bb6a99dbbc639c0f91b4818f9551 - React-domnativemodule: 36213fd8c07ef68860448fe11c9183ff50dbcba9 + React-defaultsnativemodule: 06238b62515b2f45ccac59796e2be6f744e07cc4 + React-domnativemodule: 548687bd939068141b5982dfcee11839db38c6fc React-Fabric: ca8ae5c40e322a2682dc606a168547e202c0edda React-FabricComponents: b0331e740462e515a3cc32ed48230ccda083ae98 React-FabricImage: 722eb881d0040c622f949a2a924d5d2c7e0ae374 React-featureflags: ca676d9c7d20b0dbc5f781bac2c0b3ee16619263 - React-featureflagsnativemodule: 9cbd5999efc37297e6de63a95b98e2c61acb8799 + React-featureflagsnativemodule: 3951f061e4d16d59ffc294fdb935b0c9c52ef1e2 React-graphics: 582a67f03ec691d7e06a0601567c2131c977d985 React-hermes: f28a9afe7951bac61a9a6daa7b76c6416d3461bc - React-idlecallbacksnativemodule: a13d176c431a368890fd93860725d6335572aca5 + React-idlecallbacksnativemodule: a14afed4c635ec0f685dece2580c72719098afce React-ImageManager: 08319519439571ad007ebb5592663b8bb01e442e React-jserrorhandler: cff5ddef8ce3c67098b0c58ed9d6258d67e99f91 React-jsi: e57747fd7928672d87537a39bf1ffd031610ba3a @@ -1901,19 +1833,21 @@ SPEC CHECKSUMS: React-jsitracing: 43fe823d1df0218131e2f46355ba24e1a895cc8b React-logger: 0d08bfa620586b8dc472f58dfbd6217b0d228f2c React-Mapbuffer: d9594fa247e7866b44249d5e04a68ace76af2841 - React-microtasksnativemodule: 181b18deb571cca55d3e0e7d5cc96df79fdc9664 + React-microtasksnativemodule: a3489ca37b515f6f685ec1a86c8df364343ac578 react-native-google-cast: d7bdfd1a0eeba84afde03b9722351ec29543e74c - react-native-slider: a57ccfa24df244b0134b52f977972aab6307beb7 - react-native-theoplayer: 7a34a9ab5832fa536adcc3e733791e6a726de602 + react-native-slider: caf709802c97955d1dc369fc2ca6250f18bd58fb + react-native-theoplayer: 7104d952249a9f912458e2e9050d173b586defab + react-native-theoplayer-comscore: 8a191ac8ed445b0c36780905e3c03ade036c1afe + react-native-theoplayer-conviva: f68b57dd9158653c0643d3b1c4b8b94b314fe380 React-nativeconfig: ea22f0ab525feb865d2e0ed5d7aad156c36abe6b React-NativeModulesApple: 5efee2e69aaa7ff47f40a2918f2b48534a2e431b React-perflogger: f31660a8693c3444e1832c237ba25a13f613436e React-performancetimeline: dcd29523710add9e90a4f1166d67b78b955a21ce React-RCTActionSheet: 8c6af175df9c6714ce7a5eba1d5283c0d4b3d084 React-RCTAnimation: 7eef1a8c9f9159e73f1c6a4c1aee2161213aabc6 - React-RCTAppDelegate: 8af95415e92684e4f86032dfb043797ef518656d + React-RCTAppDelegate: 8f6d5bd90c1460195a945621ca6db446727327eb React-RCTBlob: 454a83cc3928a4e2ec9543388fc0ad191a2fcb52 - React-RCTFabric: 0c56b9d907eef7c0aa3f49143c3bc1cbe03f7846 + React-RCTFabric: f0a35f40363698cca6a4da8cc53919cb328a84d4 React-RCTImage: d84301136ae487b5db286d6367bb2c477d3a63b2 React-RCTLinking: d51889e9321851c0c1432b935495d125a2e2dbbd React-RCTNetwork: 74779cdac22264f1a5d21bb5a98c47dc94d7b2ca @@ -1932,17 +1866,14 @@ SPEC CHECKSUMS: ReactCodegen: 873a3cfea4daf5b7f86d49361cc049831a45d840 ReactCommon: a1cd388360d4e9545ab8e571ff293606c9ea6687 RNDeviceInfo: 59344c19152c4b2b32283005f9737c5c64b42fba - RNSVG: 536cd3c866c878faf72beaba166c8b02fe2b762b + RNSVG: 8b1a777d54096b8c2a0fd38fc9d5a454332bbb4d SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d - Swifter: e71dd674404923d7f03ebb03f3f222d1c570bc8e - SwiftSubtitles: c659af19d710a2946779015464c0577d07fe4666 - THEOplayer-Connector-SideloadedSubtitle: cc36449bedaaa44a21cff6156bdddc71f767d1e6 - THEOplayer-Integration-GoogleCast: e4fb3f3ae2022b079906f42ec708ce96579cb629 - THEOplayer-Integration-GoogleIMA: 7310ca6eb20628f2b774905bbead37e1d9105d24 + THEOplayer-Connector-Comscore: add7f663d556cbe803570a6d3e776d9a076a6375 + THEOplayer-Connector-Conviva: 4e7fbfa2859045926ff0dc6e0412c8e7d51b1569 + THEOplayer-Connector-Utilities: 0106ae6ea7867d32e83a94c8f4fd3f0c30b22c79 THEOplayerSDK-core: 03e55ca6dfe3f16d52fdc9e4bdc6bff150d63531 - TinyCSV: fd6228edbcf1c07466ac34b76dac5e052143eaba Yoga: 07ebe50bd234e51e5e3e07befa14a3078a0fcbbd -PODFILE CHECKSUM: f413b08b773bbfc40241bc377a26913fccbe8b92 +PODFILE CHECKSUM: 8fa89e7cef87bad14afe7d7a214557d2a7e20be3 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/e2e/ios/ReactNativeTHEOplayer.xcodeproj/project.pbxproj b/e2e/ios/ReactNativeTHEOplayer.xcodeproj/project.pbxproj index 687b560a9..1d8d79832 100644 --- a/e2e/ios/ReactNativeTHEOplayer.xcodeproj/project.pbxproj +++ b/e2e/ios/ReactNativeTHEOplayer.xcodeproj/project.pbxproj @@ -402,6 +402,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer-ReactNativeTHEOplayerTests/Pods-ReactNativeTHEOplayer-ReactNativeTHEOplayerTests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/ComScore-iOS/SCORBundle.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly-iOS/RCT-Folly_privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo-iOS/RNDeviceInfoPrivacyInfo.bundle", @@ -413,6 +414,7 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SCORBundle.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle", @@ -434,6 +436,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer-tvOS/Pods-ReactNativeTHEOplayer-tvOS-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/ComScore-tvOS/SCORBundle.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly-tvOS/RCT-Folly_privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo-tvOS/RNDeviceInfoPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core-tvOS/React-Core_privacy.bundle", @@ -444,6 +447,7 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SCORBundle.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle", @@ -464,6 +468,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer-tvOS-ReactNativeTHEOplayer-tvOSTests/Pods-ReactNativeTHEOplayer-tvOS-ReactNativeTHEOplayer-tvOSTests-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/ComScore-tvOS/SCORBundle.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly-tvOS/RCT-Folly_privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo-tvOS/RNDeviceInfoPrivacyInfo.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core-tvOS/React-Core_privacy.bundle", @@ -474,6 +479,7 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SCORBundle.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle", @@ -508,17 +514,15 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer-tvOS/Pods-ReactNativeTHEOplayer-tvOS-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayer-Integration-GoogleIMA/Base/THEOplayerGoogleIMAIntegration.framework/THEOplayerGoogleIMAIntegration", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/ComScore/Dynamic/ComScore.framework/ComScore", "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayerSDK-core/THEOplayerSDK.framework/THEOplayerSDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAds-IMA-tvOS-SDK/GoogleInteractiveMediaAds.framework/GoogleInteractiveMediaAds", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerGoogleIMAIntegration.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ComScore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleInteractiveMediaAds.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -554,18 +558,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer-ReactNativeTHEOplayerTests/Pods-ReactNativeTHEOplayer-ReactNativeTHEOplayerTests-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAds-IMA-iOS-SDK/GoogleInteractiveMediaAds.framework/GoogleInteractiveMediaAds", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayer-Integration-GoogleCast/Base/THEOplayerGoogleCastIntegration.framework/THEOplayerGoogleCastIntegration", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayer-Integration-GoogleIMA/Base/THEOplayerGoogleIMAIntegration.framework/THEOplayerGoogleIMAIntegration", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/ComScore/Dynamic/ComScore.framework/ComScore", "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayerSDK-core/THEOplayerSDK.framework/THEOplayerSDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/google-cast-sdk-dynamic-xcframework/GoogleCast.framework/GoogleCast", "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleInteractiveMediaAds.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerGoogleCastIntegration.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerGoogleIMAIntegration.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ComScore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleCast.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", @@ -582,17 +582,15 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer-tvOS-ReactNativeTHEOplayer-tvOSTests/Pods-ReactNativeTHEOplayer-tvOS-ReactNativeTHEOplayer-tvOSTests-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayer-Integration-GoogleIMA/Base/THEOplayerGoogleIMAIntegration.framework/THEOplayerGoogleIMAIntegration", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/ComScore/Dynamic/ComScore.framework/ComScore", "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayerSDK-core/THEOplayerSDK.framework/THEOplayerSDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAds-IMA-tvOS-SDK/GoogleInteractiveMediaAds.framework/GoogleInteractiveMediaAds", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerGoogleIMAIntegration.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ComScore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleInteractiveMediaAds.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -606,6 +604,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer/Pods-ReactNativeTHEOplayer-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/ComScore-iOS/SCORBundle.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly-iOS/RCT-Folly_privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/RNDeviceInfo-iOS/RNDeviceInfoPrivacyInfo.bundle", @@ -617,6 +616,7 @@ ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SCORBundle.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RNDeviceInfoPrivacyInfo.bundle", @@ -742,18 +742,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-ReactNativeTHEOplayer/Pods-ReactNativeTHEOplayer-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/GoogleAds-IMA-iOS-SDK/GoogleInteractiveMediaAds.framework/GoogleInteractiveMediaAds", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayer-Integration-GoogleCast/Base/THEOplayerGoogleCastIntegration.framework/THEOplayerGoogleCastIntegration", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayer-Integration-GoogleIMA/Base/THEOplayerGoogleIMAIntegration.framework/THEOplayerGoogleIMAIntegration", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/ComScore/Dynamic/ComScore.framework/ComScore", "${PODS_XCFRAMEWORKS_BUILD_DIR}/THEOplayerSDK-core/THEOplayerSDK.framework/THEOplayerSDK", "${PODS_XCFRAMEWORKS_BUILD_DIR}/google-cast-sdk-dynamic-xcframework/GoogleCast.framework/GoogleCast", "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleInteractiveMediaAds.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerGoogleCastIntegration.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerGoogleIMAIntegration.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ComScore.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/THEOplayerSDK.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleCast.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", diff --git a/e2e/package-lock.json b/e2e/package-lock.json index 1e1ab8f13..6e641b2ba 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -9,6 +9,9 @@ "version": "0.0.1", "dependencies": { "@react-native-community/slider": "^4.5.4", + "@theoplayer/react-native-analytics-adobe": "^1.6.0", + "@theoplayer/react-native-analytics-comscore": "^1.7.1", + "@theoplayer/react-native-analytics-conviva": "^1.7.1", "@theoplayer/react-native-ui": "^0.9.0", "react": "18.3.1", "react-dom": "18.3.1", @@ -1837,6 +1840,11 @@ "node": ">=6.9.0" } }, + "node_modules/@convivainc/conviva-js-coresdk": { + "version": "4.7.12", + "resolved": "https://registry.npmjs.org/@convivainc/conviva-js-coresdk/-/conviva-js-coresdk-4.7.12.tgz", + "integrity": "sha512-PYlGF5BYDP10Cs1KUb28FiZpuwWfoEcxoTkvFLHxP4IaW1QPTWP7d/X1nb/X9bvHkJI9PaosMmeOZI2tb3eaGQ==" + }, "node_modules/@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", @@ -3571,6 +3579,74 @@ "@sinonjs/commons": "^3.0.0" } }, + "node_modules/@theoplayer/conviva-connector-web": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@theoplayer/conviva-connector-web/-/conviva-connector-web-2.3.0.tgz", + "integrity": "sha512-u7fKuWQvGZW6qnTVPFfZwRg1nq95s06WOYO024vWrGJcE8uUGOUIsc5RN+5UX8s7HHenIbOGMdzVGl/F3NXdvw==", + "peerDependencies": { + "@convivainc/conviva-js-coresdk": "^4.7.4", + "@theoplayer/yospace-connector-web": "^2.1.2", + "theoplayer": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@theoplayer/yospace-connector-web": { + "optional": true + } + } + }, + "node_modules/@theoplayer/react-native-analytics-adobe": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@theoplayer/react-native-analytics-adobe/-/react-native-analytics-adobe-1.6.0.tgz", + "integrity": "sha512-6qzRrA4BkFeQo+s05vG4J1N5cpB+U3xcJQdxilzKmP1wwz8B57pv7GGciBlGHKNt5suUGYMvzn96od+nzkATYQ==", + "peerDependencies": { + "react": "*", + "react-native": "*", + "react-native-device-info": "^10.13.1", + "react-native-theoplayer": "^3 || ^7 || ^8", + "theoplayer": "^5 || ^6 || ^7 || ^8" + }, + "peerDependenciesMeta": { + "theoplayer": { + "optional": true + } + } + }, + "node_modules/@theoplayer/react-native-analytics-comscore": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@theoplayer/react-native-analytics-comscore/-/react-native-analytics-comscore-1.7.1.tgz", + "integrity": "sha512-D4GK/hXY+00aPOILEAv9WlfM8GOqTfh4KeO5ODKqUh8DLP0/rw9UWhMi295QP/i4R8rypbHS8a0n6zoTjeXgIQ==", + "peerDependencies": { + "react": "*", + "react-native": "*", + "react-native-theoplayer": "^3 || ^7 || ^8", + "theoplayer": "^5 || ^6 || ^7 || ^8" + }, + "peerDependenciesMeta": { + "theoplayer": { + "optional": true + } + } + }, + "node_modules/@theoplayer/react-native-analytics-conviva": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@theoplayer/react-native-analytics-conviva/-/react-native-analytics-conviva-1.7.1.tgz", + "integrity": "sha512-2R+HLCiYLMt2fCGcWB6vpsu2FQErFUGuJRNxljYELI3q54xkOu0UdX+l5SokvmclujOPyStpN8lYTpj6IOhxhQ==", + "dependencies": { + "@convivainc/conviva-js-coresdk": "^4.7.9", + "@theoplayer/conviva-connector-web": "^2.1.4" + }, + "peerDependencies": { + "react": "*", + "react-native": "*", + "react-native-theoplayer": "^3 || ^7 || ^8", + "theoplayer": "^5 || ^6 || ^7 || ^8" + }, + "peerDependenciesMeta": { + "theoplayer": { + "optional": true + } + } + }, "node_modules/@theoplayer/react-native-ui": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@theoplayer/react-native-ui/-/react-native-ui-0.9.0.tgz", @@ -13345,7 +13421,6 @@ "version": "8.3.0", "resolved": "https://registry.npmjs.org/theoplayer/-/theoplayer-8.3.0.tgz", "integrity": "sha512-KV9cpPQHVv8cvtt88lRCM+u+gXd64PlDmDq7Yqzcgkoy7RXisHqtiTdxnCO7U2zkMLNy4rM8WVnjWKZNrDbC0g==", - "optional": true, "peer": true }, "node_modules/thingies": { diff --git a/e2e/package.json b/e2e/package.json index b373ff22c..51fff2147 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -13,6 +13,9 @@ }, "dependencies": { "@react-native-community/slider": "^4.5.4", + "@theoplayer/react-native-analytics-adobe": "^1.6.0", + "@theoplayer/react-native-analytics-comscore": "^1.7.1", + "@theoplayer/react-native-analytics-conviva": "^1.7.1", "@theoplayer/react-native-ui": "^0.9.0", "react": "18.3.1", "react-dom": "18.3.1", diff --git a/e2e/src/tests/Connector.spec.ts b/e2e/src/tests/Connector.spec.ts index 1f325675f..84bebd168 100644 --- a/e2e/src/tests/Connector.spec.ts +++ b/e2e/src/tests/Connector.spec.ts @@ -3,7 +3,7 @@ import hls from '../res/hls.json'; import { ConvivaConnector } from '@theoplayer/react-native-analytics-conviva'; import { getTestPlayer } from '../components/TestableTHEOplayerView'; import { PlayerEventType, THEOplayer } from 'react-native-theoplayer'; -import { NielsenConnector } from '@theoplayer/react-native-analytics-nielsen'; +// import { NielsenConnector } from '@theoplayer/react-native-analytics-nielsen'; import { AdobeConnector } from '@theoplayer/react-native-analytics-adobe'; import { ComscoreConfiguration, ComscoreConnector, ComscoreMetadata, ComscoreUserConsent } from '@theoplayer/react-native-analytics-comscore'; import { ComscoreMediaType } from '@theoplayer/react-native-analytics-comscore/src/api/ComscoreMetadata'; @@ -69,21 +69,22 @@ export default function (spec: TestScope) { ); }); - spec.describe(`Setup Nielsen connector`, function () { - let connector: NielsenConnector; - testConnector( - spec, - (player: THEOplayer) => { - connector = new NielsenConnector(player, 'testApiString', 'testInstanceName', {}); - }, - () => { - connector.updateMetadata({ customKey: 'customValue' }); - }, - () => { - connector.destroy(); - }, - ); - }); + // TODO: iOS podspec issue for NewArch + // spec.describe(`Setup Nielsen connector`, function () { + // let connector: NielsenConnector; + // testConnector( + // spec, + // (player: THEOplayer) => { + // connector = new NielsenConnector(player, 'testApiString', 'testInstanceName', {}); + // }, + // () => { + // connector.updateMetadata({ customKey: 'customValue' }); + // }, + // () => { + // connector.destroy(); + // }, + // ); + // }); spec.describe(`Setup Adobe connector`, function () { let connector: AdobeConnector; diff --git a/e2e/src/tests/index.ts b/e2e/src/tests/index.ts index f8c955c7e..7aef5346e 100644 --- a/e2e/src/tests/index.ts +++ b/e2e/src/tests/index.ts @@ -1,6 +1,5 @@ import Basic from './Basic.spec'; import Ads from './Ads.spec'; -// import Connector from './Connector.spec'; +import Connector from './Connector.spec'; -// export default [Basic, Ads, Connector]; -export default [Basic, Ads]; +export default [Basic, Ads, Connector];