Skip to content

Commit 180ec29

Browse files
marandanetomarandaneto
authored
Merge branch 'main' into enha/flutter-min-version-test
2 parents ebadd79 + a49594a commit 180ec29

File tree

7 files changed

+24
-41
lines changed

7 files changed

+24
-41
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
- Disable `enableUserInteractionBreadcrumbs` on Android when `enableAutoNativeBreadcrumbs` is disabled ([#1131](https://github.com/getsentry/sentry-dart/pull/1131))
88

9+
### Dependencies
10+
11+
- Bump Cocoa SDK from v7.30.2 to v7.31.0 ([#1132](https://github.com/getsentry/sentry-dart/pull/1132))
12+
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/master/CHANGELOG.md#7310)
13+
- [diff](https://github.com/getsentry/sentry-cocoa/compare/7.30.2...7.31.0)
14+
915
## 6.15.1
1016

1117
### Dependencies

‎flutter/example/.gitignore

-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
.pub/
3232
/build/
3333

34-
# Web related
35-
lib/generated_plugin_registrant.dart
36-
3734
# Symbolication related
3835
app.*.symbols
3936

‎flutter/example/pubspec.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ flutter:
3737
- assets/sentry-wordmark.png
3838

3939
sentry:
40-
upload_native_symbols: false
40+
upload_native_symbols: true
4141
upload_source_maps: true
42+
include_native_sources: true
4243
project: sentry-flutter
4344
org: sentry-sdks
44-
log_level: error
4545
wait_for_processing: true
46+
commits: true

‎flutter/example/run.sh

+9-32
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ set -euo pipefail
66
# Or try out the Alpha version of the Sentry Dart Plugin that does it automatically for you, feedback is welcomed.
77
# https://github.com/getsentry/sentry-dart-plugin
88

9-
export SENTRY_PROJECT=sentry-flutter
10-
export SENTRY_ORG=sentry-sdks
11-
export SENTRY_LOG_LEVEL=info
12-
export OUTPUT_FOLDER_WEB=./build/web/
13-
149
export SENTRY_RELEASE=$(date +%Y-%m-%d_%H-%M-%S)
1510

1611
echo -e "[\033[92mrun\033[0m] $1"
@@ -28,10 +23,12 @@ elif [ "$1" == "android" ]; then
2823
launchCmd='adb shell am start -n io.sentry.samples.flutter/io.sentry.samples.flutter.MainActivity'
2924
echo -e "[\033[92mrun\033[0m] Android app installed"
3025
elif [ "$1" == "web" ]; then
31-
# Uses dart2js
3226
flutter build web --dart-define=SENTRY_RELEASE=$SENTRY_RELEASE --source-maps
33-
ls -lah $OUTPUT_FOLDER_WEB
34-
echo -e "[\033[92mrun\033[0m] Built: $OUTPUT_FOLDER_WEB"
27+
buildDir='./build/web/'
28+
port='8132'
29+
ls -lah $buildDir
30+
echo -e "[\033[92mrun\033[0m] Built: $buildDir"
31+
launchCmd="bash -c '( sleep 3 ; open http://127.0.0.1:$port ) & python3 -m http.server --directory $buildDir $port'"
3532
elif [ "$1" == "macos" ]; then
3633
flutter build macos --split-debug-info=$symbolsDir --obfuscate
3734
launchCmd='./build/macos/Build/Products/Release/sentry_flutter_example.app/Contents/MacOS/sentry_flutter_example'
@@ -41,30 +38,10 @@ else
4138
else
4239
echo -e "[\033[92mrun\033[0m] $1 isn't supported"
4340
fi
44-
exit
41+
exit 1
4542
fi
4643

47-
if [ "$1" == "web" ]; then
48-
echo -e "[\033[92mrun\033[0m] Uploading sourcemaps for $SENTRY_RELEASE"
49-
sentry-cli releases new $SENTRY_RELEASE
50-
51-
sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps . \
52-
--ext dart
53-
54-
pushd $OUTPUT_FOLDER_WEB
55-
sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps . \
56-
--ext map \
57-
--ext js
58-
59-
sentry-cli releases finalize $SENTRY_RELEASE
44+
dart run sentry_dart_plugin
6045

61-
python3 -m http.server 8132
62-
popd
63-
else
64-
# 'symbols' directory contains the Dart debug info files but to include platform-specific ones, use the whole build dir instead.
65-
echo -e "[\033[92mrun\033[0m] Uploading debug information files"
66-
sentry-cli upload-dif --wait --org $SENTRY_ORG --project $SENTRY_PROJECT build
67-
68-
echo "Starting the built app: $($launchCmd)"
69-
$launchCmd
70-
fi
46+
echo "Starting the built app: $launchCmd"
47+
eval $launchCmd

‎flutter/example/web/index.html

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<meta charset="UTF-8">
56
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
@@ -12,12 +13,12 @@
1213
<link rel="apple-touch-icon" href="icons/Icon-192.png">
1314

1415
<!-- Favicon -->
15-
<link rel="shortcut icon" type="image/png" href="favicon.png"/>
16+
<link rel="shortcut icon" type="image/png" href="favicon.png" />
1617

1718
<title>sentry_flutter_example</title>
1819
<link rel="manifest" href="manifest.json">
19-
<base href="/sentry-dart/">
2020
</head>
21+
2122
<body>
2223
<!-- This script installs service_worker.js to provide PWA functionality to
2324
application. For more information, see:
@@ -31,4 +32,5 @@
3132
</script>
3233
<script src="main.dart.js" type="application/javascript"></script>
3334
</body>
35+
3436
</html>

‎flutter/ios/sentry_flutter.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Sentry SDK for Flutter with support to native through sentry-cocoa.
1212
:tag => s.version.to_s }
1313
s.source_files = 'Classes/**/*'
1414
s.public_header_files = 'Classes/**/*.h'
15-
s.dependency 'Sentry/HybridSDK', '7.30.2'
15+
s.dependency 'Sentry/HybridSDK', '7.31.0'
1616
s.ios.dependency 'Flutter'
1717
s.osx.dependency 'FlutterMacOS'
1818
s.ios.deployment_target = '9.0'

‎flutter/scripts/update-cocoa.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ get-repo)
1818
echo "https://github.com/getsentry/sentry-cocoa.git"
1919
;;
2020
set-version)
21-
newValue="${BASH_REMATCH[1]}$2'"
21+
newValue="${BASH_REMATCH[1]}'$2'"
2222
echo "${content/${BASH_REMATCH[0]}/$newValue}" >$file
2323
;;
2424
*)

0 commit comments

Comments
 (0)