Skip to content

Commit 654c75c

Browse files
krystofwoldrichkrystofwoldrich
committed
Merge branch 'main' into v6
2 parents a623ec3 + 46b60ab commit 654c75c

File tree

7 files changed

+81
-43
lines changed

7 files changed

+81
-43
lines changed

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@
22

33
## Unreleased
44

5+
### Fixes
6+
7+
- Upload source maps for all splits on Android (not only the last found) ([#4125](https://github.com/getsentry/sentry-react-native/pull/4125))
8+
59
### Dependencies
610

11+
- Bump CLI from v2.36.6 to v2.37.0 ([#4153](https://github.com/getsentry/sentry-react-native/pull/4153))
12+
- [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2370)
13+
- [diff](https://github.com/getsentry/sentry-cli/compare/2.36.6...2.37.0)
714
- Bump JavaScript SDK from v8.30.0 to v8.33.1` ([#4154](https://github.com/getsentry/sentry-react-native/pull/4154))
815
- [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#8331)
916
- [diff](https://github.com/getsentry/sentry-javascript/compare/v8.30.0...8.33.1)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"set-version-samples": "lerna run set-version"
1515
},
1616
"devDependencies": {
17-
"@sentry/cli": "2.36.6",
17+
"@sentry/cli": "2.37.0",
1818
"downlevel-dts": "^0.11.0",
1919
"lerna": "^8.1.8",
2020
"npm-run-all2": "^6.2.2",

‎packages/core/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"dependencies": {
6868
"@sentry/babel-plugin-component-annotate": "2.20.1",
6969
"@sentry/browser": "8.33.1",
70-
"@sentry/cli": "2.36.6",
70+
"@sentry/cli": "2.37.0",
7171
"@sentry/core": "8.33.1",
7272
"@sentry/react": "8.33.1",
7373
"@sentry/types": "8.33.1",

‎packages/core/sentry.gradle‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,16 @@ gradle.projectsEvaluated {
6565
def currentVariants = extractCurrentVariants(bundleTask, releases)
6666
if (currentVariants == null) return
6767

68-
def variant = null
69-
def releaseName = null
70-
def versionCode = null
7168
def previousCliTask = null
7269
def applicationVariant = null
7370

7471
def nameCleanup = "${bundleTask.name}_SentryUploadCleanUp"
7572
def nameModulesCleanup = "${bundleTask.name}_SentryCollectModulesCleanUp"
7673
// Upload the source map several times if necessary: once for each release and versionCode.
7774
currentVariants.each { key, currentVariant ->
78-
variant = currentVariant[0]
79-
releaseName = currentVariant[1]
80-
versionCode = currentVariant[2]
75+
def variant = currentVariant[0]
76+
def releaseName = currentVariant[1]
77+
def versionCode = currentVariant[2]
8178
applicationVariant = currentVariant[3]
8279

8380
try {

‎samples/react-native/android/app/build.gradle‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,39 @@ android {
145145
keyPassword 'android'
146146
}
147147
}
148+
149+
if (System.getenv('SENTRY_SAMPLE_ENABLE_ABI_SPLIT') == 'true') {
150+
splits {
151+
abi {
152+
enable true
153+
reset()
154+
include 'x86', 'arm64-v8a'
155+
universalApk true
156+
}
157+
}
158+
project.ext.versionCodes = ['armeabi': 1, 'armeabi-v7a': 2, 'arm64-v8a': 3, 'mips': 5, 'mips64': 6, 'x86': 8, 'x86_64': 9]
159+
android.applicationVariants.all { variant ->
160+
variant.outputs.each { output ->
161+
output.versionCodeOverride =
162+
project.ext.versionCodes.get(output.getFilter(
163+
com.android.build.OutputFile.ABI), 0) * 10000000 + android.defaultConfig.versionCode
164+
}
165+
}
166+
}
167+
168+
if (System.getenv('SENTRY_SAMPLE_ENABLE_FLAVORS') == 'true') {
169+
flavorDimensions "version"
170+
productFlavors {
171+
regular {
172+
dimension "version"
173+
}
174+
demo {
175+
dimension "version"
176+
applicationIdSuffix "demo"
177+
}
178+
}
179+
}
180+
148181
buildTypes {
149182
debug {
150183
signingConfig signingConfigs.debug

‎samples/react-native/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"clean-ios": "cd ios; rm -rf Podfile.lock Pods build; cd ..",
1818
"clean-watchman": "watchman watch-del-all",
1919
"set-build-number": "npx react-native-version --skip-tag --never-amend --set-build",
20-
"set-version": "npx react-native-version --skip-tag --never-amend"
20+
"set-version": "npx react-native-version --skip-tag --never-amend",
21+
"build-android-release-splits-flavors": "export SENTRY_SAMPLE_ENABLE_ABI_SPLIT=true; export SENTRY_SAMPLE_ENABLE_FLAVORS=true; cd android; ./gradlew assembleRelease; cd .."
2122
},
2223
"dependencies": {
2324
"@react-navigation/bottom-tabs": "^6.5.12",

‎yarn.lock‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5806,66 +5806,66 @@ __metadata:
58065806
languageName: node
58075807
linkType: hard
58085808

5809-
"@sentry/cli-darwin@npm:2.36.6":
5810-
version: 2.36.6
5811-
resolution: "@sentry/cli-darwin@npm:2.36.6"
5809+
"@sentry/cli-darwin@npm:2.37.0":
5810+
version: 2.37.0
5811+
resolution: "@sentry/cli-darwin@npm:2.37.0"
58125812
conditions: os=darwin
58135813
languageName: node
58145814
linkType: hard
58155815

5816-
"@sentry/cli-linux-arm64@npm:2.36.6":
5817-
version: 2.36.6
5818-
resolution: "@sentry/cli-linux-arm64@npm:2.36.6"
5816+
"@sentry/cli-linux-arm64@npm:2.37.0":
5817+
version: 2.37.0
5818+
resolution: "@sentry/cli-linux-arm64@npm:2.37.0"
58195819
conditions: (os=linux | os=freebsd) & cpu=arm64
58205820
languageName: node
58215821
linkType: hard
58225822

5823-
"@sentry/cli-linux-arm@npm:2.36.6":
5824-
version: 2.36.6
5825-
resolution: "@sentry/cli-linux-arm@npm:2.36.6"
5823+
"@sentry/cli-linux-arm@npm:2.37.0":
5824+
version: 2.37.0
5825+
resolution: "@sentry/cli-linux-arm@npm:2.37.0"
58265826
conditions: (os=linux | os=freebsd) & cpu=arm
58275827
languageName: node
58285828
linkType: hard
58295829

5830-
"@sentry/cli-linux-i686@npm:2.36.6":
5831-
version: 2.36.6
5832-
resolution: "@sentry/cli-linux-i686@npm:2.36.6"
5830+
"@sentry/cli-linux-i686@npm:2.37.0":
5831+
version: 2.37.0
5832+
resolution: "@sentry/cli-linux-i686@npm:2.37.0"
58335833
conditions: (os=linux | os=freebsd) & (cpu=x86 | cpu=ia32)
58345834
languageName: node
58355835
linkType: hard
58365836

5837-
"@sentry/cli-linux-x64@npm:2.36.6":
5838-
version: 2.36.6
5839-
resolution: "@sentry/cli-linux-x64@npm:2.36.6"
5837+
"@sentry/cli-linux-x64@npm:2.37.0":
5838+
version: 2.37.0
5839+
resolution: "@sentry/cli-linux-x64@npm:2.37.0"
58405840
conditions: (os=linux | os=freebsd) & cpu=x64
58415841
languageName: node
58425842
linkType: hard
58435843

5844-
"@sentry/cli-win32-i686@npm:2.36.6":
5845-
version: 2.36.6
5846-
resolution: "@sentry/cli-win32-i686@npm:2.36.6"
5844+
"@sentry/cli-win32-i686@npm:2.37.0":
5845+
version: 2.37.0
5846+
resolution: "@sentry/cli-win32-i686@npm:2.37.0"
58475847
conditions: os=win32 & (cpu=x86 | cpu=ia32)
58485848
languageName: node
58495849
linkType: hard
58505850

5851-
"@sentry/cli-win32-x64@npm:2.36.6":
5852-
version: 2.36.6
5853-
resolution: "@sentry/cli-win32-x64@npm:2.36.6"
5851+
"@sentry/cli-win32-x64@npm:2.37.0":
5852+
version: 2.37.0
5853+
resolution: "@sentry/cli-win32-x64@npm:2.37.0"
58545854
conditions: os=win32 & cpu=x64
58555855
languageName: node
58565856
linkType: hard
58575857

5858-
"@sentry/cli@npm:2.36.6":
5859-
version: 2.36.6
5860-
resolution: "@sentry/cli@npm:2.36.6"
5858+
"@sentry/cli@npm:2.37.0":
5859+
version: 2.37.0
5860+
resolution: "@sentry/cli@npm:2.37.0"
58615861
dependencies:
5862-
"@sentry/cli-darwin": 2.36.6
5863-
"@sentry/cli-linux-arm": 2.36.6
5864-
"@sentry/cli-linux-arm64": 2.36.6
5865-
"@sentry/cli-linux-i686": 2.36.6
5866-
"@sentry/cli-linux-x64": 2.36.6
5867-
"@sentry/cli-win32-i686": 2.36.6
5868-
"@sentry/cli-win32-x64": 2.36.6
5862+
"@sentry/cli-darwin": 2.37.0
5863+
"@sentry/cli-linux-arm": 2.37.0
5864+
"@sentry/cli-linux-arm64": 2.37.0
5865+
"@sentry/cli-linux-i686": 2.37.0
5866+
"@sentry/cli-linux-x64": 2.37.0
5867+
"@sentry/cli-win32-i686": 2.37.0
5868+
"@sentry/cli-win32-x64": 2.37.0
58695869
https-proxy-agent: ^5.0.0
58705870
node-fetch: ^2.6.7
58715871
progress: ^2.0.3
@@ -5888,7 +5888,7 @@ __metadata:
58885888
optional: true
58895889
bin:
58905890
sentry-cli: bin/sentry-cli
5891-
checksum: d1848fab01be38233f72603ee363bbff808d2c39b4bd59ae418d8a8c8bbce0ad0ced5e7cd3146aa5c74aa79ed1a914bb5dec384aaf94b1f944d363c6c35e4675
5891+
checksum: 92e88688b5148e5abed2cc253290008da89029c5816d7f1bdb5fbed035305c0bcfb5f49e4976ff8ced5fbb876d28e655eef838d32c7a388d3582654ff67d65e0
58925892
languageName: node
58935893
linkType: hard
58945894

@@ -5965,7 +5965,7 @@ __metadata:
59655965
"@sentry-internal/typescript": 8.33.1
59665966
"@sentry/babel-plugin-component-annotate": 2.20.1
59675967
"@sentry/browser": 8.33.1
5968-
"@sentry/cli": 2.36.6
5968+
"@sentry/cli": 2.37.0
59695969
"@sentry/core": 8.33.1
59705970
"@sentry/react": 8.33.1
59715971
"@sentry/types": 8.33.1
@@ -23284,7 +23284,7 @@ __metadata:
2328423284
version: 0.0.0-use.local
2328523285
resolution: "sentry-react-native@workspace:."
2328623286
dependencies:
23287-
"@sentry/cli": 2.36.6
23287+
"@sentry/cli": 2.37.0
2328823288
downlevel-dts: ^0.11.0
2328923289
lerna: ^8.1.8
2329023290
npm-run-all2: ^6.2.2

0 commit comments

Comments
 (0)