Skip to content

Commit 752e1cb

Browse files
authored
chore: temporarily disable sentry-native Windows integration (#2363)
* chore: temporarily disable sentry-native Windows integration * disable native test * changelog entry
1 parent b930b94 commit 752e1cb

File tree

6 files changed

+30
-11
lines changed

6 files changed

+30
-11
lines changed

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Fixes
6+
7+
- Temporarily disable Windows native error & obfuscation support ([#2363](https://github.com/getsentry/sentry-dart/pull/2363))
8+
39
## 8.10.0-beta.1
410

511
### Features

dart/lib/src/platform_checker.dart

+3-4
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ class PlatformChecker {
4444
// the OS checks return true when the browser runs on the checked platform.
4545
// Example: platform.isAndroid return true if the browser is used on an
4646
// Android device.
47-
return platform.isAndroid ||
48-
platform.isIOS ||
49-
platform.isMacOS ||
50-
platform.isWindows;
47+
return platform.isAndroid || platform.isIOS || platform.isMacOS;
48+
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
49+
// platform.isWindows
5150
}
5251

5352
static bool _isWebWithWasmSupport() {

flutter/test/sentry_flutter_test.dart

+7-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,11 @@ void main() {
249249
hasFileSystemTransport: false,
250250
);
251251

252+
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
253+
// testScopeObserver(
254+
// options: sentryFlutterOptions, expectedHasNativeScopeObserver: true);
252255
testScopeObserver(
253-
options: sentryFlutterOptions, expectedHasNativeScopeObserver: true);
256+
options: sentryFlutterOptions, expectedHasNativeScopeObserver: false);
254257

255258
testConfiguration(
256259
integrations: integrations,
@@ -271,7 +274,9 @@ void main() {
271274
beforeIntegration: WidgetsFlutterBindingIntegration,
272275
afterIntegration: OnErrorIntegration);
273276

274-
expect(SentryFlutter.native, isNotNull);
277+
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
278+
// expect(SentryFlutter.native, isNotNull);
279+
expect(SentryFlutter.native, isNull);
275280
expect(Sentry.currentHub.profilerFactory, isNull);
276281
}, testOn: 'vm');
277282

flutter/test/sentry_native/sentry_native_test.dart

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ import 'sentry_native_test_web.dart'
1212

1313
// Defining main() here allows us to manually run/debug from VSCode.
1414
// If we didn't need that, we could just `export` above.
15-
void main() => actual.main();
15+
16+
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
17+
// void main() => actual.main();
18+
void main() {}

flutter/windows/CMakeLists.txt

+9-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@
44
# customers of the plugin.
55
cmake_minimum_required(VERSION 3.14)
66

7-
include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake")
7+
# Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
8+
# include("${CMAKE_CURRENT_SOURCE_DIR}/../sentry-native/sentry-native.cmake")
89

9-
# Even though sentry_flutter doesn't actually provide a useful plugin, we need to accomodate the Flutter tooling.
10-
# sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar:
11-
target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR})
10+
# # Even though sentry_flutter doesn't actually provide a useful plugin, we need to accomodate the Flutter tooling.
11+
# # sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar:
12+
# target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR})
13+
14+
# Temp code: replace with the previous code when sentry-native is enabled
15+
add_library(sentry_flutter_plugin temp.cpp)
16+
target_include_directories(sentry_flutter_plugin INTERFACE ${CMAKE_CURRENT_LIST_DIR})

flutter/windows/temp.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
// Temp code, see cmakelists.txt for more info

0 commit comments

Comments
 (0)