Skip to content

Commit e480590

Browse files
chore: sentry updates (#186)
1 parent 48e40b3 commit e480590

File tree

22 files changed

+438
-532
lines changed

22 files changed

+438
-532
lines changed

.github/workflows/cli-dapp.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/cli-wallet.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/release-ios-base.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ jobs:
132132
APPLE_KEY_ID: ${{ secrets.apple-key-id }}
133133
APPLE_KEY_CONTENT: ${{ secrets.apple-key-content }}
134134
APPLE_ISSUER_ID: ${{ secrets.apple-issuer-id }}
135+
BUNDLE_ID: ${{ inputs.bundle-id }}
135136
MATCH_USERNAME: ${{ secrets.match-username }}
136137
MATCH_PASSWORD: ${{ secrets.match-keychain-password }}
137138
MATCH_GIT_URL: ${{ secrets.match-git-url }}
138-
BUNDLE_ID: ${{ inputs.bundle-id }}
139-
SCHEME: ${{ inputs.scheme-name }}
140139
PODFILE_PATH: ${{ inputs.root-path }}/ios/Podfile
140+
SCHEME: ${{ inputs.scheme-name }}
141141
XCODE_PROJECT_PATH: ${{ inputs.xcode-project-path }}
142142
XCWORKSPACE_PATH: ${{ inputs.xcode-workspace-path }}

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ source "https://rubygems.org"
22

33
gem "fastlane"
44
gem "cocoapods", '1.15.2'
5-

dapps/W3MWagmi/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,5 @@ web-build/
7878
!.yarn/plugins
7979
!.yarn/releases
8080
!.yarn/sdks
81-
!.yarn/versions
81+
!.yarn/versions
82+
.env.local

dapps/W3MWagmi/android/app/build.gradle

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ android {
102102
applicationId "com.walletconnect.web3modal.rnsample"
103103
minSdkVersion rootProject.ext.minSdkVersion
104104
targetSdkVersion rootProject.ext.targetSdkVersion
105-
versionCode 86
106-
versionName "1.1-social"
105+
versionCode 87
106+
versionName "1.1"
107107
resValue "string", "build_config_package", "com.w3mwagmi"
108108
}
109109

@@ -152,7 +152,19 @@ android {
152152

153153
sentry {
154154
autoUploadProguardMapping = shouldSentryAutoUpload()
155+
156+
// Enables or disables the automatic configuration of Native Symbols
157+
// for Sentry. This executes sentry-cli automatically so
158+
// you don't need to do it manually.
159+
// Default is disabled.
155160
uploadNativeSymbols = shouldSentryAutoUpload()
161+
162+
// Enables or disables the automatic upload of the app's native source code to Sentry.
163+
// This executes sentry-cli with the --include-sources param automatically so
164+
// you don't need to do it manually.
165+
// This option has an effect only when [uploadNativeSymbols] is enabled.
166+
// Default is disabled.
167+
includeNativeSources = shouldSentryAutoUpload()
156168
}
157169

158170
dependencies {

dapps/W3MWagmi/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ buildscript {
1616
classpath("com.android.tools.build:gradle")
1717
classpath("com.facebook.react:react-native-gradle-plugin")
1818
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
19-
classpath("io.sentry:sentry-android-gradle-plugin:4.11.0")
19+
classpath("io.sentry:sentry-android-gradle-plugin:4.14.1")
2020
}
2121
}
2222

dapps/W3MWagmi/ios/Podfile.lock

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,16 +1398,32 @@ PODS:
13981398
- ReactCommon/turbomodule/bridging
13991399
- ReactCommon/turbomodule/core
14001400
- Yoga
1401-
- RNSentry (5.20.0):
1401+
- RNSentry (6.4.0):
1402+
- DoubleConversion
1403+
- glog
14021404
- hermes-engine
1405+
- RCT-Folly (= 2024.01.01.00)
1406+
- RCTRequired
1407+
- RCTTypeSafety
1408+
- React-Codegen
14031409
- React-Core
1410+
- React-debug
1411+
- React-Fabric
1412+
- React-featureflags
1413+
- React-graphics
14041414
- React-hermes
1405-
- Sentry/HybridSDK (= 8.21.0)
1415+
- React-ImageManager
1416+
- React-NativeModulesApple
1417+
- React-RCTFabric
1418+
- React-rendererdebug
1419+
- React-utils
1420+
- ReactCommon/turbomodule/bridging
1421+
- ReactCommon/turbomodule/core
1422+
- Sentry/HybridSDK (= 8.41.0)
1423+
- Yoga
14061424
- RNSVG (15.4.0):
14071425
- React-Core
1408-
- Sentry/HybridSDK (8.21.0):
1409-
- SentryPrivate (= 8.21.0)
1410-
- SentryPrivate (8.21.0)
1426+
- Sentry/HybridSDK (8.41.0)
14111427
- SocketRocket (0.7.0)
14121428
- Yoga (0.0.0)
14131429

@@ -1499,7 +1515,6 @@ SPEC REPOS:
14991515
- MMKV
15001516
- MMKVCore
15011517
- Sentry
1502-
- SentryPrivate
15031518
- SocketRocket
15041519

15051520
EXTERNAL SOURCES:
@@ -1740,10 +1755,9 @@ SPEC CHECKSUMS:
17401755
RNGestureHandler: 28078232f2868d3dcb4d4b6c8ab8691700187664
17411756
RNReanimated: f05f23988b1456a594fc4eab0ef2c46b430007ac
17421757
RNScreens: 5aeecbb09aa7285379b6e9f3c8a3c859bb16401c
1743-
RNSentry: 5381e9284aec59a546e4a7d40e33ad0839b99c1e
1758+
RNSentry: 50ec24687f6419c345ecb4be09378dcfe47ef6c5
17441759
RNSVG: cb24fb322de8c1ebf59904e7aca0447bb8dbed5a
1745-
Sentry: ebc12276bd17613a114ab359074096b6b3725203
1746-
SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe
1760+
Sentry: 54d0fe6c0df448497c8ed4cce66ccf7027e1823e
17471761
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
17481762
Yoga: 04f1db30bb810187397fa4c37dd1868a27af229c
17491763

dapps/W3MWagmi/ios/W3MWagmi.xcodeproj/project.pbxproj

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
1F1C00952B8E53EE00FC18DB /* Frameworks */,
347347
1F1C00972B8E53EE00FC18DB /* Resources */,
348348
1F1C009B2B8E53EE00FC18DB /* Bundle React Native code and images */,
349-
1F1C009C2B8E53EE00FC18DB /* Upload Debug Symbols to Sentry */,
349+
1FC753F82D0C93DE00D88337 /* Upload Debug Symbols to Sentry */,
350350
CF75C34FAD8767964D07A5AD /* [CP] Embed Pods Frameworks */,
351351
EC59DD71D9B1F9BC35C2AAD6 /* [CP] Copy Pods Resources */,
352352
);
@@ -516,13 +516,14 @@
516516
files = (
517517
);
518518
inputPaths = (
519+
"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
519520
);
520521
name = "Upload Debug Symbols to Sentry";
521522
outputPaths = (
522523
);
523524
runOnlyForDeploymentPostprocessing = 0;
524525
shellPath = /bin/sh;
525-
shellScript = "\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nif [ -f \"$WITH_ENVIRONMENT\" ]; then\n . \"$WITH_ENVIRONMENT\"\nfi\nexport SENTRY_PROPERTIES=sentry.properties\n[ \"$SENTRY_INCLUDE_NATIVE_SOURCES\" = \"true\" ] && INCLUDE_SOURCES_FLAG=\"--include-sources\" || INCLUDE_SOURCES_FLAG=\"\"\n../node_modules/@sentry/cli/bin/sentry-cli debug-files upload \"$INCLUDE_SOURCES_FLAG\" \"$DWARF_DSYM_FOLDER_PATH\"\n";
526+
shellScript = "export SENTRY_CLI_EXECUTABLE=\"../node_modules/@sentry/cli/bin/sentry-cli\"\nexport SENTRY_INCLUDE_NATIVE_SOURCES=true # Upload native iOS sources\n\n../node_modules/@sentry/react-native/scripts/sentry-xcode-debug-files.sh\n";
526527
};
527528
1F1C008F2B8E53EE00FC18DB /* Start Packager */ = {
528529
isa = PBXShellScriptBuildPhase;
@@ -576,21 +577,26 @@
576577
);
577578
runOnlyForDeploymentPostprocessing = 0;
578579
shellPath = /bin/sh;
579-
shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n# The project root by default is one level up from the ios directory\nexport PROJECT_ROOT=\"$PROJECT_DIR\"/..\n\nif [[ \"$CONFIGURATION\" = *Debug* ]]; then\n export SKIP_BUNDLING=1\nfi\nif [[ -z \"$ENTRY_FILE\" ]]; then\n # Set the entry JS file using the bundler's entry resolution.\n export ENTRY_FILE=\"$(\"$NODE_BINARY\" -e \"require('expo/scripts/resolveAppEntry')\" \"$PROJECT_ROOT\" ios relative | tail -n 1)\"\nfi\n\nif [[ -z \"$CLI_PATH\" ]]; then\n # Use Expo CLI\n export CLI_PATH=\"$(\"$NODE_BINARY\" --print \"require.resolve('@expo/cli')\")\"\nfi\nif [[ -z \"$BUNDLE_COMMAND\" ]]; then\n # Default Expo CLI command for bundling\n export BUNDLE_COMMAND=\"export:embed\"\nfi\n\n`\"$NODE_BINARY\" --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'\"`\n";
580+
shellScript = "if [[ -f \"$PODS_ROOT/../.xcode.env\" ]]; then\n source \"$PODS_ROOT/../.xcode.env\"\nfi\nif [[ -f \"$PODS_ROOT/../.xcode.env.local\" ]]; then\n source \"$PODS_ROOT/../.xcode.env.local\"\nfi\n\n# The project root by default is one level up from the ios directory\nexport PROJECT_ROOT=\"$PROJECT_DIR\"/..\n\nif [[ \"$CONFIGURATION\" = *Debug* ]]; then\n export SKIP_BUNDLING=1\nfi\nif [[ -z \"$ENTRY_FILE\" ]]; then\n # Set the entry JS file using the bundler's entry resolution.\n export ENTRY_FILE=\"$(\"$NODE_BINARY\" -e \"require('expo/scripts/resolveAppEntry')\" \"$PROJECT_ROOT\" ios relative | tail -n 1)\"\nfi\n\nif [[ -z \"$CLI_PATH\" ]]; then\n # Use Expo CLI\n export CLI_PATH=\"$(\"$NODE_BINARY\" --print \"require.resolve('@expo/cli')\")\"\nfi\nif [[ -z \"$BUNDLE_COMMAND\" ]]; then\n # Default Expo CLI command for bundling\n export BUNDLE_COMMAND=\"export:embed\"\nfi\n\nSOURCEMAP_FILE=\"$(pwd)/../main.jsbundle.map\"\n\n`\"$NODE_BINARY\" --print \"require('path').dirname(require.resolve('react-native/package.json')) + '/scripts/react-native-xcode.sh'\"`\n";
580581
};
581-
1F1C009C2B8E53EE00FC18DB /* Upload Debug Symbols to Sentry */ = {
582+
1FC753F82D0C93DE00D88337 /* Upload Debug Symbols to Sentry */ = {
582583
isa = PBXShellScriptBuildPhase;
583584
buildActionMask = 2147483647;
584585
files = (
585586
);
587+
inputFileListPaths = (
588+
);
586589
inputPaths = (
590+
"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
587591
);
588592
name = "Upload Debug Symbols to Sentry";
593+
outputFileListPaths = (
594+
);
589595
outputPaths = (
590596
);
591597
runOnlyForDeploymentPostprocessing = 0;
592598
shellPath = /bin/sh;
593-
shellScript = "\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nif [ -f \"$WITH_ENVIRONMENT\" ]; then\n . \"$WITH_ENVIRONMENT\"\nfi\nexport SENTRY_PROPERTIES=sentry.properties\n[ \"$SENTRY_INCLUDE_NATIVE_SOURCES\" = \"true\" ] && INCLUDE_SOURCES_FLAG=\"--include-sources\" || INCLUDE_SOURCES_FLAG=\"\"\n../node_modules/@sentry/cli/bin/sentry-cli debug-files upload \"$INCLUDE_SOURCES_FLAG\" \"$DWARF_DSYM_FOLDER_PATH\"\n";
599+
shellScript = "export SENTRY_CLI_EXECUTABLE=\"../node_modules/@sentry/cli/bin/sentry-cli\"\nexport SENTRY_INCLUDE_NATIVE_SOURCES=true # Upload native iOS sources\n\n../node_modules/@sentry/react-native/scripts/sentry-xcode-debug-files.sh\n";
594600
};
595601
2EE4BF3EE058FE90A7C55DDF /* [CP] Check Pods Manifest.lock */ = {
596602
isa = PBXShellScriptBuildPhase;
@@ -860,13 +866,14 @@
860866
files = (
861867
);
862868
inputPaths = (
869+
"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
863870
);
864871
name = "Upload Debug Symbols to Sentry";
865872
outputPaths = (
866873
);
867874
runOnlyForDeploymentPostprocessing = 0;
868875
shellPath = /bin/sh;
869-
shellScript = "\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nif [ -f \"$WITH_ENVIRONMENT\" ]; then\n . \"$WITH_ENVIRONMENT\"\nfi\nexport SENTRY_PROPERTIES=sentry.properties\n[ \"$SENTRY_INCLUDE_NATIVE_SOURCES\" = \"true\" ] && INCLUDE_SOURCES_FLAG=\"--include-sources\" || INCLUDE_SOURCES_FLAG=\"\"\n../node_modules/@sentry/cli/bin/sentry-cli debug-files upload \"$INCLUDE_SOURCES_FLAG\" \"$DWARF_DSYM_FOLDER_PATH\"\n";
876+
shellScript = "export SENTRY_CLI_EXECUTABLE=\"../node_modules/@sentry/cli/bin/sentry-cli\"\nexport SENTRY_INCLUDE_NATIVE_SOURCES=true # Upload native iOS sources\n\n../node_modules/@sentry/react-native/scripts/sentry-xcode-debug-files.sh\n";
870877
};
871878
FD10A7F022414F080027D42C /* Start Packager */ = {
872879
isa = PBXShellScriptBuildPhase;
@@ -1491,7 +1498,7 @@
14911498
CODE_SIGN_ENTITLEMENTS = W3MWagmi/W3MWagmi.entitlements;
14921499
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
14931500
CODE_SIGN_STYLE = Manual;
1494-
CURRENT_PROJECT_VERSION = 52;
1501+
CURRENT_PROJECT_VERSION = 114;
14951502
DEVELOPMENT_TEAM = W5R8AG9K22;
14961503
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
14971504
ENABLE_BITCODE = NO;
@@ -1611,7 +1618,7 @@
16111618
CODE_SIGN_ENTITLEMENTS = W3MWagmi/W3MWagmi.entitlements;
16121619
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
16131620
CODE_SIGN_STYLE = Manual;
1614-
CURRENT_PROJECT_VERSION = 52;
1621+
CURRENT_PROJECT_VERSION = 114;
16151622
DEVELOPMENT_TEAM = W5R8AG9K22;
16161623
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = W5R8AG9K22;
16171624
HEADER_SEARCH_PATHS = (

dapps/W3MWagmi/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"@react-navigation/bottom-tabs": "6.6.1",
2424
"@react-navigation/native": "6.1.18",
2525
"@react-navigation/native-stack": "6.10.1",
26-
"@reown/appkit-auth-wagmi-react-native": "1.0.2",
27-
"@reown/appkit-coinbase-wagmi-react-native": "1.0.2",
28-
"@reown/appkit-wagmi-react-native": "1.0.2",
29-
"@sentry/react-native": "5.20.0",
26+
"@reown/appkit-auth-wagmi-react-native": "0.0.0-feat-swaps-20241203153101",
27+
"@reown/appkit-coinbase-wagmi-react-native": "0.0.0-feat-swaps-20241203153101",
28+
"@reown/appkit-wagmi-react-native": "0.0.0-feat-swaps-20241203153101",
29+
"@sentry/react-native": "6.4.0",
3030
"@tanstack/react-query": "5.51.1",
3131
"@walletconnect/react-native-compat": "2.17.2",
3232
"expo": "51.0.20",

0 commit comments

Comments
 (0)