Skip to content

Commit 0674d70

Browse files
roninopfroninopf
committed
Merge branch 'master' into MOB-2359-update-sample-app-sdk
2 parents 42a96b7 + ab4b69f commit 0674d70

File tree

13 files changed

+1692
-1474
lines changed

13 files changed

+1692
-1474
lines changed

‎Iterable-React-Native-SDK.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ Pod::Spec.new do |s|
2424

2525
s.swift_version = '5.2'
2626

27-
s.dependency 'Iterable-iOS-SDK', '~> 6.2.15'
27+
s.dependency 'Iterable-iOS-SDK', '~> 6.2.16'
2828
s.dependency 'React'
2929
end

‎SampleApp/typescript/ios/SampleApp.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
);
336336
inputPaths = (
337337
"${PODS_ROOT}/Target Support Files/Pods-SampleApp/Pods-SampleApp-resources.sh",
338-
"${PODS_CONFIGURATION_BUILD_DIR}/Iterable-iOS-SDK/Iterable-iOS-SDK.bundle",
338+
"${PODS_CONFIGURATION_BUILD_DIR}/Iterable-iOS-SDK/Resources.bundle",
339339
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
340340
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
341341
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
@@ -355,7 +355,7 @@
355355
);
356356
name = "[CP] Copy Pods Resources";
357357
outputPaths = (
358-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Iterable-iOS-SDK.bundle",
358+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Resources.bundle",
359359
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
360360
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
361361
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",

‎SampleApp/typescript/yarn.lock‎

Lines changed: 613 additions & 553 deletions
Large diffs are not rendered by default.

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ def getModuleVersion() {
2222

2323
dependencies {
2424
implementation 'com.facebook.react:react-native:+'
25-
api 'com.iterable:iterableapi:3.2.8'
25+
api 'com.iterable:iterableapi:3.2.9'
2626
}

‎integration-testing/ios/Podfile‎

Lines changed: 12 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,17 @@
1-
ENV['SWIFT_VERSION'] = '5'
2-
platform :ios, '10.0'
31
require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
2+
require_relative '../node_modules/react-native/scripts/react_native_pods'
43

5-
target 'example' do
6-
# Pods for SampleApp
7-
pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
8-
pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
9-
pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
10-
pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
11-
pod 'React', :path => '../node_modules/react-native/'
12-
pod 'React-Core', :path => '../node_modules/react-native/'
13-
pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
14-
pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
15-
pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
16-
pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
17-
pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
18-
pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
19-
pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
20-
pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
21-
pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
22-
pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
23-
pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
24-
pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
25-
26-
pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
27-
pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
28-
pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
29-
pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
30-
pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon"
31-
pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
32-
pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
33-
34-
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
35-
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
36-
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
4+
platform :ios, '10.0'
375

38-
use_native_modules!
6+
target 'example' do
7+
config = use_native_modules!
8+
use_react_native!(:path => config["reactNativePath"])
399
end
4010

11+
post_install do |installer|
12+
installer.pods_project.targets.each do |target|
13+
target.build_configurations.each do |config|
14+
config.build_settings['ENABLE_TESTABILITY'] = 'YES'
15+
end
16+
end
17+
end

‎integration-testing/ios/eeUITests/UITestsHelper.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ extension XCUIElement {
106106
}
107107
}
108108

109-
let uiElementWaitTimeout = 20.0
109+
let uiElementWaitTimeout = 120.0
110110

111111
protocol IterableUITestsProtocol: AnyObject {
112112
var app: XCUIApplication! { get }

‎integration-testing/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
"e2e:android-release": "npm run build:android-release && npm run test:android-release"
1111
},
1212
"dependencies": {
13-
"@iterable/react-native-sdk": "^1.0.15",
13+
"@iterable/react-native-sdk": "^1.0.18",
1414
"@react-native-community/masked-view": "^0.1.10",
1515
"@react-navigation/bottom-tabs": "^5.4.5",
1616
"@react-navigation/native": "^5.4.0",
1717
"@react-navigation/stack": "^5.3.7",
1818
"react": "^16.13.1",
19-
"react-native": "^0.62.2",
19+
"react-native": "^0.63",
2020
"react-native-elements": "^1.2.7",
2121
"react-native-gesture-handler": "^1.6.1",
2222
"react-native-ionicons": "^5.0.0-rc",

0 commit comments

Comments
 (0)