Merge branch 'android-pr-sentry' into gekidou-sentry-install

This commit is contained in:
Avinash Lingaloo
2022-10-17 09:59:19 +04:00
6 changed files with 194 additions and 134 deletions

View File

@@ -232,10 +232,10 @@ android {
}
}
debug {
storeFile file('debug.keystore')
storePassword 'android'
keyAlias 'androiddebugkey'
keyPassword 'android'
// storeFile file('debug.keystore')
// storePassword 'android'
// keyAlias 'androiddebugkey'
// keyPassword 'android'
}
}
splits {

View File

@@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=1g
org.gradle.jvmargs=-Xmx4096M -XX:MaxMetaspaceSize=1g
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
@@ -40,4 +40,4 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
# your application. You should enable this flag either if you want
# to write custom TurboModules/Fabric components OR use libraries that
# are providing them.
newArchEnabled=false
newArchEnabled=false

View File

@@ -177,7 +177,7 @@ lane :upload_file_to_s3 do |options|
extension = os_type == "android" ? "*.apk" : "*.ipa"
build_folder_path = Dir[File.expand_path('..')].first
files = []
unless options[:file].nil? || options[:file].empty?
files.push("#{build_folder_path}/#{options[:file]}")
else
@@ -194,7 +194,7 @@ lane :upload_file_to_s3 do |options|
pr_file = File.basename(files.first)
plist_file = "#{File.basename(files.first, '.*')}.plist"
else
version_number = os_type == "android" ?
version_number = os_type == "android" ?
android_get_version_name(gradle_file: './android/app/build.gradle') :
get_version_number(xcodeproj: './ios/Mattermost.xcodeproj', target: 'Mattermost')
build_number = os_type == "android" ?
@@ -207,7 +207,7 @@ lane :upload_file_to_s3 do |options|
s3_folder = is_build_pr ?
"#{ENV['AWS_FOLDER_NAME']}/#{ENV['BRANCH_TO_BUILD']}" :
"#{ENV['AWS_FOLDER_NAME']}/#{version_number}/#{build_number}"
s3 = Aws::S3::Resource.new(region: s3_region)
s3_bucket = s3.bucket(s3_bucket_name)
mutex = Mutex.new
@@ -254,7 +254,7 @@ lane :upload_file_to_s3 do |options|
:install_url => install_url
})
end
if options[:file] == 'Mattermost-simulator-x86_64.app.zip'
pretext = '#### New iOS build for VM/Simulator'
msg = "Download link: #{links.first}"
@@ -597,12 +597,12 @@ platform :android do
unless configured
configure
end
update_identifiers
replace_assets
link_sentry_android
# update_identifiers
# replace_assets
# link_sentry_android
build_android
move_apk_to_root
upload_file_to_s3({:os_type => "android"})
# move_apk_to_root
# upload_file_to_s3({:os_type => "android"})
end
desc 'Build an unsigned apk'
@@ -719,16 +719,16 @@ platform :android do
gradle_file: './android/app/build.gradle'
)
send_message_to_mattermost({
:version_number => version_number,
:build_number => build_number,
:pretext => '',
:title => 'Unsuccessful Build',
:thumb_url => 'https://lh3.ggpht.com/XL0CrI8skkxnboGct-duyg-bZ_MxJDTrjczyjdU8OP2PM1dmj7SP4jL1K8JQeMIB3AM=w300',
:msg => exception.message,
:default_payloads => [:lane],
:success => false,
})
# send_message_to_mattermost({
# :version_number => version_number,
# :build_number => build_number,
# :pretext => '',
# :title => 'Unsuccessful Build',
# :thumb_url => 'https://lh3.ggpht.com/XL0CrI8skkxnboGct-duyg-bZ_MxJDTrjczyjdU8OP2PM1dmj7SP4jL1K8JQeMIB3AM=w300',
# :msg => exception.message,
# :default_payloads => [:lane],
# :success => false,
# })
end
def build_android
@@ -741,7 +741,8 @@ platform :android do
properties: {
'separateApk' => ENV["SEPARATE_APKS"] || false,
'universalApk' => ENV["SEPARATE_APKS"] || false,
}
},
flags: "--debug",
)
end
@@ -850,14 +851,14 @@ def get_apple_api_key
f.write("\n") unless index == p8_array.length - 1
end
end
api_key = app_store_connect_api_key(
key_id: ENV['IOS_API_KEY_ID'],
issuer_id: ENV['IOS_API_ISSUER_ID'],
key_filepath: "./#{api_key_path}",
in_house: ENV['IOS_IN_HOUSE'] == 'true', # optional but may be required if using match/sigh
)
File.delete("../#{api_key_path}")
end

210
package-lock.json generated
View File

@@ -33,7 +33,7 @@
"@react-navigation/bottom-tabs": "6.3.2",
"@react-navigation/native": "6.0.11",
"@rudderstack/rudder-sdk-react-native": "1.4.1",
"@sentry/react-native": "4.3.0",
"@sentry/react-native": "4.6.0",
"@stream-io/flat-list-mvcp": "0.10.2",
"base-64": "1.0.0",
"commonmark": "npm:@mattermost/commonmark@0.30.1-0",
@@ -5276,13 +5276,13 @@
}
},
"node_modules/@sentry/browser": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.12.1.tgz",
"integrity": "sha512-pgyL65CrGFLe8sKcEG8KXAuVTE8zkAsyTlv/AuME06cSdxzO/memPK/r3BI6EM7WupIdga+V5tQUldeT1kgHNA==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.14.0.tgz",
"integrity": "sha512-AdLmqeOXvCVYgJAgMUUby+TRh+yIeZO16NPpZWQPGggXIjnhSzoN4liyXJvQ7Mhm326GboFUKjQwqpCEviQcyg==",
"dependencies": {
"@sentry/core": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/core": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"engines": {
@@ -5330,13 +5330,13 @@
}
},
"node_modules/@sentry/core": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.12.1.tgz",
"integrity": "sha512-DFHbzHFjukhlkRZ5xzfebx0IBzblW43kmfnalBBq7xEMscUvnhsYnlvL9Y20tuPZ/PrTcq4JAHbFluAvw6M0QQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.14.0.tgz",
"integrity": "sha512-Hgn7De6CiCFnz868/Lrtei+9rj7/TIwhbDe3J+NeH+2ffXYn4VI8FxrlR/p2XfIq9iCfmG80EQXDtSh+Kh7mOw==",
"dependencies": {
"@sentry/hub": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/hub": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"engines": {
@@ -5349,12 +5349,12 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/hub": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.12.1.tgz",
"integrity": "sha512-KLVnVqXf+CRmXNy9/T8K2/js7QvOQ94xtgP5KnWJbu2rl+JhxnIGiBRF51lPXFIatt7zWwB9qNdMS8lVsvLMGQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.14.0.tgz",
"integrity": "sha512-O+pxsipeiURC6Mxuivz1pX3yHlkQCI2yjP38bISxUZv1NIijHuxiDmgqrrcCJltiIfyY2+f9LAezKVCAXnPFuw==",
"dependencies": {
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"engines": {
@@ -5367,12 +5367,12 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/integrations": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.12.1.tgz",
"integrity": "sha512-35iW3WZ6rnUzjf6kWS5604xtPCtIb4gESoDKIKPKw2q7gI+qA5Ad/Q5yM50cDwoR3uOhXZ4tv3WB2/16wSGWFg==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.14.0.tgz",
"integrity": "sha512-ZZwTurYD7+9nRHS92T6ZUGuLq/AtHPb0arw0eHn7Q6u+PNkt8RpMj+fwuBntaAsabHdf1a0XZrdqAw6XJmZz0w==",
"dependencies": {
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"localforage": "^1.8.1",
"tslib": "^1.9.3"
},
@@ -5386,13 +5386,13 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/react": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.12.1.tgz",
"integrity": "sha512-CmdiRzhPpjD29GxlDJs+VIoLlQcKp1BfISQOfPUZNppWbKyRad+J5Z8tgg5MCNPHjQtcOT+0V+MsSdRNqtXg4g==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.14.0.tgz",
"integrity": "sha512-PEHqqr6o0ZfrNhFYe1lLTNY1+vV5bEuZaG0i8s+Jo4OHozh689CeH+lGZSjvFxCpaexC+FskpiGAzcXTeurpaA==",
"dependencies": {
"@sentry/browser": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/browser": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"hoist-non-react-statics": "^3.3.2",
"tslib": "^1.9.3"
},
@@ -5404,19 +5404,19 @@
}
},
"node_modules/@sentry/react-native": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/@sentry/react-native/-/react-native-4.3.0.tgz",
"integrity": "sha512-5i6QcYlebC06i8qMdgErP6MHa+tHwlx/YlQdDL5m997TTvmGSo2yBerhg4pLoN6U4nFClseyJpX0CxEzq6twMg==",
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/@sentry/react-native/-/react-native-4.6.0.tgz",
"integrity": "sha512-cCH7g3rGMXSMZJsTXpheWi9NclM3JFvPVEyNugKoeIUmtorGHU5ah/7vcnly3W/zFyEgpQXxjtT9HeeTB0nj3A==",
"dependencies": {
"@sentry/browser": "7.12.1",
"@sentry/browser": "7.14.0",
"@sentry/cli": "1.74.4",
"@sentry/core": "7.12.1",
"@sentry/hub": "7.12.1",
"@sentry/integrations": "7.12.1",
"@sentry/react": "7.12.1",
"@sentry/tracing": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/core": "7.14.0",
"@sentry/hub": "7.14.0",
"@sentry/integrations": "7.14.0",
"@sentry/react": "7.14.0",
"@sentry/tracing": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"@sentry/wizard": "1.2.17"
},
"peerDependencies": {
@@ -5430,13 +5430,13 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/tracing": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.12.1.tgz",
"integrity": "sha512-WnweIt//IqkEkJSjA8DtnIeCdItYIqJSxNQ6qK+r546/ufxRYFBck2fbmM0oKZJVg2evbwhadrBTIUzYkqNj4A==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.14.0.tgz",
"integrity": "sha512-AtSitQukvU52PsLlYZJ2g2Lhj3VMmy4EwF/OMp8UHCtbJYwTNDF5N4Co0GUwFIs8zdXkIoJD+GMKfsSX1L3NXA==",
"dependencies": {
"@sentry/hub": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/hub": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"engines": {
@@ -5449,19 +5449,19 @@
"integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
},
"node_modules/@sentry/types": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.12.1.tgz",
"integrity": "sha512-VGZs39SZgMcCGv7H0VyFy1LEFGsnFZH590JUopmz6nG63EpeYQ2xzhIoPNAiLKbyUvBEwukn+faCg3u3MGqhgQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.14.0.tgz",
"integrity": "sha512-9iFZS9Hr5hAoL+M9oUH2dY9burOaQh+CHGH66fortuTp++YDWKdbPEeKcz8hRJaUyBBn53rdxiBmAyHsrlE6KA==",
"engines": {
"node": ">=8"
}
},
"node_modules/@sentry/utils": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.12.1.tgz",
"integrity": "sha512-Dh8B13pC0u8uLM/zf+oZngyg808c6BDEO94F7H+h3IciCVVd92A0cOQwLGAEdf8srnJgpZJNAlSC8lFDhbFHzQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.14.0.tgz",
"integrity": "sha512-q9em4ZBcaUk7J1WULiltZVEcbyCE0wwAIjqRaoNmHVe4FeK++uAPo2ULZM1kQgN8syZnQ1jcfLktIKkWfnE2cg==",
"dependencies": {
"@sentry/types": "7.12.1",
"@sentry/types": "7.14.0",
"tslib": "^1.9.3"
},
"engines": {
@@ -29095,13 +29095,13 @@
}
},
"@sentry/browser": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.12.1.tgz",
"integrity": "sha512-pgyL65CrGFLe8sKcEG8KXAuVTE8zkAsyTlv/AuME06cSdxzO/memPK/r3BI6EM7WupIdga+V5tQUldeT1kgHNA==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-7.14.0.tgz",
"integrity": "sha512-AdLmqeOXvCVYgJAgMUUby+TRh+yIeZO16NPpZWQPGggXIjnhSzoN4liyXJvQ7Mhm326GboFUKjQwqpCEviQcyg==",
"requires": {
"@sentry/core": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/core": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"dependencies": {
@@ -29137,13 +29137,13 @@
}
},
"@sentry/core": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.12.1.tgz",
"integrity": "sha512-DFHbzHFjukhlkRZ5xzfebx0IBzblW43kmfnalBBq7xEMscUvnhsYnlvL9Y20tuPZ/PrTcq4JAHbFluAvw6M0QQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.14.0.tgz",
"integrity": "sha512-Hgn7De6CiCFnz868/Lrtei+9rj7/TIwhbDe3J+NeH+2ffXYn4VI8FxrlR/p2XfIq9iCfmG80EQXDtSh+Kh7mOw==",
"requires": {
"@sentry/hub": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/hub": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"dependencies": {
@@ -29155,12 +29155,12 @@
}
},
"@sentry/hub": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.12.1.tgz",
"integrity": "sha512-KLVnVqXf+CRmXNy9/T8K2/js7QvOQ94xtgP5KnWJbu2rl+JhxnIGiBRF51lPXFIatt7zWwB9qNdMS8lVsvLMGQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-7.14.0.tgz",
"integrity": "sha512-O+pxsipeiURC6Mxuivz1pX3yHlkQCI2yjP38bISxUZv1NIijHuxiDmgqrrcCJltiIfyY2+f9LAezKVCAXnPFuw==",
"requires": {
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"dependencies": {
@@ -29172,12 +29172,12 @@
}
},
"@sentry/integrations": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.12.1.tgz",
"integrity": "sha512-35iW3WZ6rnUzjf6kWS5604xtPCtIb4gESoDKIKPKw2q7gI+qA5Ad/Q5yM50cDwoR3uOhXZ4tv3WB2/16wSGWFg==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.14.0.tgz",
"integrity": "sha512-ZZwTurYD7+9nRHS92T6ZUGuLq/AtHPb0arw0eHn7Q6u+PNkt8RpMj+fwuBntaAsabHdf1a0XZrdqAw6XJmZz0w==",
"requires": {
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"localforage": "^1.8.1",
"tslib": "^1.9.3"
},
@@ -29190,13 +29190,13 @@
}
},
"@sentry/react": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.12.1.tgz",
"integrity": "sha512-CmdiRzhPpjD29GxlDJs+VIoLlQcKp1BfISQOfPUZNppWbKyRad+J5Z8tgg5MCNPHjQtcOT+0V+MsSdRNqtXg4g==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/react/-/react-7.14.0.tgz",
"integrity": "sha512-PEHqqr6o0ZfrNhFYe1lLTNY1+vV5bEuZaG0i8s+Jo4OHozh689CeH+lGZSjvFxCpaexC+FskpiGAzcXTeurpaA==",
"requires": {
"@sentry/browser": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/browser": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"hoist-non-react-statics": "^3.3.2",
"tslib": "^1.9.3"
},
@@ -29209,30 +29209,30 @@
}
},
"@sentry/react-native": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/@sentry/react-native/-/react-native-4.3.0.tgz",
"integrity": "sha512-5i6QcYlebC06i8qMdgErP6MHa+tHwlx/YlQdDL5m997TTvmGSo2yBerhg4pLoN6U4nFClseyJpX0CxEzq6twMg==",
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/@sentry/react-native/-/react-native-4.6.0.tgz",
"integrity": "sha512-cCH7g3rGMXSMZJsTXpheWi9NclM3JFvPVEyNugKoeIUmtorGHU5ah/7vcnly3W/zFyEgpQXxjtT9HeeTB0nj3A==",
"requires": {
"@sentry/browser": "7.12.1",
"@sentry/browser": "7.14.0",
"@sentry/cli": "1.74.4",
"@sentry/core": "7.12.1",
"@sentry/hub": "7.12.1",
"@sentry/integrations": "7.12.1",
"@sentry/react": "7.12.1",
"@sentry/tracing": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/core": "7.14.0",
"@sentry/hub": "7.14.0",
"@sentry/integrations": "7.14.0",
"@sentry/react": "7.14.0",
"@sentry/tracing": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"@sentry/wizard": "1.2.17"
}
},
"@sentry/tracing": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.12.1.tgz",
"integrity": "sha512-WnweIt//IqkEkJSjA8DtnIeCdItYIqJSxNQ6qK+r546/ufxRYFBck2fbmM0oKZJVg2evbwhadrBTIUzYkqNj4A==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.14.0.tgz",
"integrity": "sha512-AtSitQukvU52PsLlYZJ2g2Lhj3VMmy4EwF/OMp8UHCtbJYwTNDF5N4Co0GUwFIs8zdXkIoJD+GMKfsSX1L3NXA==",
"requires": {
"@sentry/hub": "7.12.1",
"@sentry/types": "7.12.1",
"@sentry/utils": "7.12.1",
"@sentry/hub": "7.14.0",
"@sentry/types": "7.14.0",
"@sentry/utils": "7.14.0",
"tslib": "^1.9.3"
},
"dependencies": {
@@ -29244,16 +29244,16 @@
}
},
"@sentry/types": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.12.1.tgz",
"integrity": "sha512-VGZs39SZgMcCGv7H0VyFy1LEFGsnFZH590JUopmz6nG63EpeYQ2xzhIoPNAiLKbyUvBEwukn+faCg3u3MGqhgQ=="
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.14.0.tgz",
"integrity": "sha512-9iFZS9Hr5hAoL+M9oUH2dY9burOaQh+CHGH66fortuTp++YDWKdbPEeKcz8hRJaUyBBn53rdxiBmAyHsrlE6KA=="
},
"@sentry/utils": {
"version": "7.12.1",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.12.1.tgz",
"integrity": "sha512-Dh8B13pC0u8uLM/zf+oZngyg808c6BDEO94F7H+h3IciCVVd92A0cOQwLGAEdf8srnJgpZJNAlSC8lFDhbFHzQ==",
"version": "7.14.0",
"resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.14.0.tgz",
"integrity": "sha512-q9em4ZBcaUk7J1WULiltZVEcbyCE0wwAIjqRaoNmHVe4FeK++uAPo2ULZM1kQgN8syZnQ1jcfLktIKkWfnE2cg==",
"requires": {
"@sentry/types": "7.12.1",
"@sentry/types": "7.14.0",
"tslib": "^1.9.3"
},
"dependencies": {

View File

@@ -30,7 +30,7 @@
"@react-navigation/bottom-tabs": "6.3.2",
"@react-navigation/native": "6.0.11",
"@rudderstack/rudder-sdk-react-native": "1.4.1",
"@sentry/react-native": "4.3.0",
"@sentry/react-native": "4.6.0",
"@stream-io/flat-list-mvcp": "0.10.2",
"base-64": "1.0.0",
"commonmark": "npm:@mattermost/commonmark@0.30.1-0",

View File

@@ -0,0 +1,59 @@
diff --git a/node_modules/@sentry/react-native/sentry.gradle b/node_modules/@sentry/react-native/sentry.gradle
index c54bf8c..1b712af 100644
--- a/node_modules/@sentry/react-native/sentry.gradle
+++ b/node_modules/@sentry/react-native/sentry.gradle
@@ -121,14 +121,22 @@ gradle.projectsEvaluated {
cliExecutable = cliExecutable.replaceAll("/", "\\\\")
}
+ def sourcemapFile = new File(sourcemapOutput)
+ def bundleFile = new File(bundleOutput)
+ if(!sourcemapFile.isFile()){
+ throw new GradleException('>>> sourcemapFile invalid path', sourcemapFile)
+ }
+ if(!bundleFile.isFile()){
+ throw new GradleException('>>> bundleFile invalid path')
+ }
//
// based on:
// https://github.com/getsentry/sentry-cli/blob/master/src/commands/react_native_gradle.rs
//
def args = [cliExecutable]
- args.addAll(!config.logLevel ? [] : [
- "--log-level", config.logLevel // control verbosity of the output
+ args.addAll([
+ "--log-level", "debug" // control verbosity of the output
])
args.addAll(!config.flavorAware ? [] : [
"--url", sentryProps.get("defaults.url"),
@@ -211,10 +219,10 @@ static extractBundleTaskArguments(cmdArgs, Project project) {
cmdArgs.eachWithIndex { String arg, int i ->
if (arg == "--bundle-output") {
bundleOutput = cmdArgs[i + 1]
- project.logger.info("--bundle-output: `${bundleOutput}`")
+ project.logger.debug("--bundle-output: `${bundleOutput}`")
} else if (arg == "--sourcemap-output") {
sourcemapOutput = cmdArgs[i + 1]
- project.logger.info("--sourcemap-output param: `${sourcemapOutput}`")
+ project.logger.debug("--sourcemap-output param: `${sourcemapOutput}`")
}
}
@@ -240,7 +248,7 @@ static extractBundleTaskArguments(cmdArgs, Project project) {
if (matcher.find()) {
project.logger.info("sourcemapOutput has the wrong path, let's fix it.")
// replacing from bundleOutput which is more reliable
- sourcemapOutput = bundleOutput.replaceAll("(/|\\\\)generated\\1assets\\1react\\1", "\$1generated\$1sourcemaps\$1react\$1") + ".map"
+// sourcemapOutput = bundleOutput.replaceAll("(/|\\\\)generated\\1assets\\1react\\1", "\$1generated\$1sourcemaps\$1react\$1") + ".map"
project.logger.info("sourcemapOutput new path: `${sourcemapOutput}`")
}
}
@@ -251,6 +259,7 @@ static extractBundleTaskArguments(cmdArgs, Project project) {
/** Force Bundle task to produce sourcemap files if they are not pre-configured by user yet. */
def forceSourceMapOutputFromBundleTask(bundleTask) {
def props = bundleTask.getProperties()
+ project.logger.debug('bundleTask', bundleTask)
def cmd = props.get("commandLine") as List<String>
def cmdArgs = props.get("args") as List<String>
def shouldCleanUp = false