From 821b557541e934e1e04d25399dd6fd35734843ec Mon Sep 17 00:00:00 2001 From: gdeluna-branch Date: Tue, 29 Oct 2024 21:13:19 -0700 Subject: [PATCH 1/3] update deps --- ChangeLog.md | 4 ++++ branch-sdk-automation-testbed/package.json | 3 ++- package.json | 2 +- react-native-branch.podspec | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 894545f55..19f5a80a6 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,7 @@ +2024-10-29 Version 6.4.0 + - Update iOS SDK to 3.6.5 + - Update Android SDK to 5.13.0 + 2024-09-26 Version 6.3.0 - Update iOS SDK to 3.6.3 - Update Android SDK to 5.12.4 diff --git a/branch-sdk-automation-testbed/package.json b/branch-sdk-automation-testbed/package.json index 6eb41ce7f..69c27204d 100644 --- a/branch-sdk-automation-testbed/package.json +++ b/branch-sdk-automation-testbed/package.json @@ -20,7 +20,7 @@ "@types/react-native-push-notification": "^8.1.1", "react": "18.0.0", "react-native": "0.69.1", - "react-native-branch": "6.3.0", + "react-native-branch": "6.4.0-alpha.0", "react-native-dropdown-picker": "^5.4.2", "react-native-json-tree": "^1.3.0", "react-native-keyboard-aware-scroll-view": "^0.9.5", @@ -35,6 +35,7 @@ "devDependencies": { "@babel/core": "^7.12.9", "@babel/runtime": "^7.12.5", + "@react-native-community/cli": "latest", "@react-native-community/eslint-config": "^2.0.0", "@tsconfig/react-native": "^2.0.0", "@types/jest": "^26.0.23", diff --git a/package.json b/package.json index 3af28e9f6..76775b35a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-branch", - "version": "6.3.0", + "version": "6.4.0-alpha.0", "description": "Branch Metrics React Native SDK", "main": "src/index.js", "types": "src/index.d.ts", diff --git a/react-native-branch.podspec b/react-native-branch.podspec index c327d32f3..670a8572b 100644 --- a/react-native-branch.podspec +++ b/react-native-branch.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.source_files = [ "ios/*.h", "ios/*.m"] s.compiler_flags = %[-DRNBRANCH_VERSION=@\\"#{s.version}\\"] s.header_dir = 'RNBranch' # also sets generated module name - s.dependency 'BranchSDK', '3.6.3' + s.dependency 'BranchSDK', '3.6.5' s.dependency 'React-Core' # to ensure the correct build order # Swift/Objective-C compatibility From 79703d6d530baee2282fc29f0ec6483b875d090c Mon Sep 17 00:00:00 2001 From: nsingh-branch Date: Wed, 30 Oct 2024 15:00:29 -0700 Subject: [PATCH 2/3] Update to fix testbed --- .gitignore | 3 ++- branchreactnativetestbed/android/settings.gradle | 2 +- branchreactnativetestbed/ios/Podfile.lock | 10 +++++----- branchreactnativetestbed/package-lock.json | 14 +++++++------- branchreactnativetestbed/package.json | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 7197df281..eb8b72cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -54,4 +54,5 @@ Pods Gemfile.lock # yarn lock file, use `yarn import` to generate from package-lock.json -yarn.lock \ No newline at end of file +yarn.lock +branchreactnativetestbed/ios/.ruby-version diff --git a/branchreactnativetestbed/android/settings.gradle b/branchreactnativetestbed/android/settings.gradle index 82f5565b4..7098e4b2c 100644 --- a/branchreactnativetestbed/android/settings.gradle +++ b/branchreactnativetestbed/android/settings.gradle @@ -1,4 +1,4 @@ rootProject.name = 'branchreactnativetestbed' apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':app' -includeBuild('../node_modules/react-native-gradle-plugin') +includeBuild('../node_modules/@react-native/gradle-plugin') \ No newline at end of file diff --git a/branchreactnativetestbed/ios/Podfile.lock b/branchreactnativetestbed/ios/Podfile.lock index 2c13ec0a7..08afbc498 100644 --- a/branchreactnativetestbed/ios/Podfile.lock +++ b/branchreactnativetestbed/ios/Podfile.lock @@ -1,6 +1,6 @@ PODS: - boost (1.76.0) - - BranchSDK (3.4.4) + - BranchSDK (3.6.5) - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - FBLazyVector (0.72.5) @@ -376,8 +376,8 @@ PODS: - React-jsinspector (0.72.5) - React-logger (0.72.5): - glog - - react-native-branch (6.2.2-alpha.0): - - BranchSDK (= 3.4.4) + - react-native-branch (6.4.0-alpha.0): + - BranchSDK (= 3.6.5) - React-Core - React-NativeModulesApple (0.72.5): - hermes-engine @@ -663,7 +663,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 - BranchSDK: 28bec34fb99c53ab8e86b7bf69cc55a4505fe0b3 + BranchSDK: ef7d89062afb08b20f65d5b1633b215ee77ab77f CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 FBLazyVector: 71803c074f6325f10b5ec891c443b6bbabef0ca7 @@ -696,7 +696,7 @@ SPEC CHECKSUMS: React-jsiexecutor: ff70a72027dea5cc7d71cfcc6fad7f599f63987a React-jsinspector: aef73cbd43b70675f572214d10fa438c89bf11ba React-logger: 2e4aee3e11b3ec4fa6cfd8004610bbb3b8d6cca4 - react-native-branch: 58dfd22e9b6ae19fb062e41c610d30a1501c3651 + react-native-branch: f98a76ca204f8b0e7fbcba8cb80802ac1a762efd React-NativeModulesApple: 797bc6078d566eef3fb3f74127e6e1d2e945a15f React-perflogger: cd8886513f68e1c135a1e79d20575c6489641597 React-RCTActionSheet: 726d2615ca62a77ce3e2c13d87f65379cdc73498 diff --git a/branchreactnativetestbed/package-lock.json b/branchreactnativetestbed/package-lock.json index 1dfebaac9..d09ca70ff 100644 --- a/branchreactnativetestbed/package-lock.json +++ b/branchreactnativetestbed/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "react": "18.2.0", "react-native": "0.72.5", - "react-native-branch": "6.2.2-alpha.0" + "react-native-branch": "6.4.0-alpha.0" }, "devDependencies": { "@babel/core": "^7.20.0", @@ -11359,9 +11359,9 @@ } }, "node_modules/react-native-branch": { - "version": "6.2.2-alpha.0", - "resolved": "https://registry.npmjs.org/react-native-branch/-/react-native-branch-6.2.2-alpha.0.tgz", - "integrity": "sha512-trr9IvxZXaoaZhvh0FBYZeQNwy1kH9wLivNW2dX5askCtLQ7WgcXqYfU86rTGkdOJPUuPU1CQCawrtUKWgsxew==", + "version": "6.4.0-alpha.0", + "resolved": "https://registry.npmjs.org/react-native-branch/-/react-native-branch-6.4.0-alpha.0.tgz", + "integrity": "sha512-2prsXPNxMOzHLRAkUMEAKm2kH7sF2PusMycnSdK2ex6wdTxBsq5C8kRCkJjX+nKKwXtJRcSjyZRWoKiv5HHyQA==", "peerDependencies": { "react-native": ">= 0.60" } @@ -21210,9 +21210,9 @@ } }, "react-native-branch": { - "version": "6.2.2-alpha.0", - "resolved": "https://registry.npmjs.org/react-native-branch/-/react-native-branch-6.2.2-alpha.0.tgz", - "integrity": "sha512-trr9IvxZXaoaZhvh0FBYZeQNwy1kH9wLivNW2dX5askCtLQ7WgcXqYfU86rTGkdOJPUuPU1CQCawrtUKWgsxew==", + "version": "6.4.0-alpha.0", + "resolved": "https://registry.npmjs.org/react-native-branch/-/react-native-branch-6.4.0-alpha.0.tgz", + "integrity": "sha512-2prsXPNxMOzHLRAkUMEAKm2kH7sF2PusMycnSdK2ex6wdTxBsq5C8kRCkJjX+nKKwXtJRcSjyZRWoKiv5HHyQA==", "requires": {} }, "react-refresh": { diff --git a/branchreactnativetestbed/package.json b/branchreactnativetestbed/package.json index 06728f603..c2afc80ad 100644 --- a/branchreactnativetestbed/package.json +++ b/branchreactnativetestbed/package.json @@ -12,7 +12,7 @@ "dependencies": { "react": "18.2.0", "react-native": "0.72.5", - "react-native-branch": "6.3.0" + "react-native-branch": "6.4.0-alpha.0" }, "devDependencies": { "@babel/core": "^7.20.0", From 1895a4c1df76c41e5cd7557028097f0f166cdb7d Mon Sep 17 00:00:00 2001 From: gdeluna-branch Date: Wed, 30 Oct 2024 15:39:01 -0700 Subject: [PATCH 3/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 76775b35a..cb0557669 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-branch", - "version": "6.4.0-alpha.0", + "version": "6.4.0", "description": "Branch Metrics React Native SDK", "main": "src/index.js", "types": "src/index.d.ts",