Skip to content

Commit

Permalink
fix: missing analytics due to react-native-adjust upgrade (#6376)
Browse files Browse the repository at this point in the history
### Description

This PR reverts #6002 

Context:
https://valora-app.slack.com/archives/C02DY3RK79T/p1734435610915569?thread_ts=1734368442.953539&cid=C02DY3RK79T

### Test plan

I can see my iOS events on Mixpanel.

### Related issues

n/a

### Backwards compatibility

Y

### Network scalability

If a new NetworkId and/or Network are added in the future, the changes
in this PR will:

- [ ] Continue to work without code changes, OR trigger a compilation
error (guaranteeing we find it when a new network is added)

---------

Co-authored-by: Alex Bakoushin <[email protected]>
  • Loading branch information
kathaypacific and bakoushin authored Dec 17, 2024
1 parent 2b6c916 commit 3479fc8
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 46 deletions.
2 changes: 0 additions & 2 deletions ios/MobileStack.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,13 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-MobileStack/Pods-MobileStack-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/AdjustSignature/AdjustSigSdk.framework/AdjustSigSdk",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/PersonaInquirySDK2/Persona2.framework/Persona2",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AdjustSigSdk.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Persona2.framework",
Expand Down
18 changes: 7 additions & 11 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ PODS:
- JWTDecode (= 3.1.0)
- React-Core
- SimpleKeychain (= 1.1.0)
- Adjust (5.0.1):
- Adjust/Adjust (= 5.0.1)
- Adjust/Adjust (5.0.1):
- AdjustSignature (~> 3.18)
- AdjustSignature (3.20.2)
- Adjust (4.38.2):
- Adjust/Core (= 4.38.2)
- Adjust/Core (4.38.2)
- Auth0 (2.7.2):
- JWTDecode (~> 3.1)
- SimpleKeychain (~> 1.1)
Expand Down Expand Up @@ -563,8 +561,8 @@ PODS:
- React-jsinspector (0.72.15)
- React-logger (0.72.15):
- glog
- react-native-adjust (5.0.3):
- Adjust (= 5.0.1)
- react-native-adjust (4.38.1):
- Adjust (= 4.38.2)
- React-Core
- react-native-camera (4.2.1):
- React-Core
Expand Down Expand Up @@ -966,7 +964,6 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- Adjust
- AdjustSignature
- Auth0
- CleverTap-iOS-SDK
- CocoaAsyncSocket
Expand Down Expand Up @@ -1201,8 +1198,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
A0Auth0: 3e5033500f199020186a42c49020ecd508a72b27
Adjust: f27daaa40d0df5550b89dd428cd8545d812e1f6d
AdjustSignature: f42d8c64cda8361ff5b5a31e4536d82076be4306
Adjust: 5a0f813fe079212bed61404d1f635cc330068b4a
Auth0: 28cb24cb19ebd51f0b07751f16d83b59f4019532
boost: 7dcd2de282d72e344012f7d6564d024930a6a440
BVLinearGradient: cb006ba232a1f3e4f341bb62c42d1098c284da70
Expand Down Expand Up @@ -1268,7 +1264,7 @@ SPEC CHECKSUMS:
React-jsiexecutor: 137efedd74aece84909335af73554e91dfe24165
React-jsinspector: b86a8abae760c28d69366bbc1d991561e51341ed
React-logger: 8c0f8173197ad28ac3212c18f8141690209dfe52
react-native-adjust: a7a05b08bf363c6befeee946b3aa6540b6fc9fae
react-native-adjust: a3d3fd6edd8d4a7ef707ebc45deaecab1ffb2afc
react-native-camera: 079d80421f0572d6b4e836908114d614d0adb553
react-native-compat: 03e54a7e1a09f56471b0af199867b4edf13de7ca
react-native-config: ea75335a7cca1d3326de1da384227e580a7c082e
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"react-async-hook": "^4.0.0",
"react-i18next": "^15.2.0",
"react-native": "0.72.15",
"react-native-adjust": "^5.0.3",
"react-native-adjust": "^4.38.1",
"react-native-android-open-settings": "^1.3.0",
"react-native-auth0": "^3.2.1",
"react-native-camera": "^4.2.1",
Expand Down
1 change: 1 addition & 0 deletions renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,6 @@
ignoreDeps: [
'lottie-react-native', // TODO (act-1187): handle 6.x breaking changes and upgrade
'react-native-shake', // https://github.com/Doko-Demo-Doa/react-native-shake/issues/62
'react-native-adjust', // TODO: remove once this issue is resolved https://github.com/segmentio/analytics-react-native/issues/1036
],
}
39 changes: 7 additions & 32 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12533,10 +12533,10 @@ react-is@^18.0.0, react-is@^18.2.0:
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==

react-native-adjust@^5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/react-native-adjust/-/react-native-adjust-5.0.3.tgz#1f60ccb198d52d251619ec01543475b9635f5367"
integrity sha512-P+/Sx961Plc9AtlRWL4TbP+Gi4Hwsyw7COnehlyl4f/cktAdtydrl7Q8mBtC41JQvLoXam3YZaNXNsmcXGkwoA==
react-native-adjust@^4.38.1:
version "4.38.1"
resolved "https://registry.yarnpkg.com/react-native-adjust/-/react-native-adjust-4.38.1.tgz#93ae5959a624715b5b3d0c48faf8b6c66b75575d"
integrity sha512-+FZU0DMPJ9GUcZZNHuhqd2OVQGmfDA+x/HeehFFjshGN+IdJ2hWGaLuMi2uAB2LScLQiBo4GKNLf3NyXb3La3A==

react-native-android-open-settings@^1.3.0:
version "1.3.0"
Expand Down Expand Up @@ -14091,7 +14091,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand All @@ -14108,15 +14108,6 @@ string-width@^2.0.0, string-width@^2.1.1:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^5.0.1, string-width@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794"
Expand Down Expand Up @@ -14195,14 +14186,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -15769,7 +15753,7 @@ windows-release@^3.1.0:
dependencies:
execa "^1.0.0"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -15787,15 +15771,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down

0 comments on commit 3479fc8

Please sign in to comment.