Skip to content

Commit

Permalink
Revert "chore: temporarily disable sentry-native Windows integration (#…
Browse files Browse the repository at this point in the history
…2363)"

This reverts commit 752e1cb.
  • Loading branch information
vaind committed Nov 15, 2024
1 parent 18e6fd7 commit cfabe42
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 24 deletions.
7 changes: 4 additions & 3 deletions dart/lib/src/platform_checker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ class PlatformChecker {
// the OS checks return true when the browser runs on the checked platform.
// Example: platform.isAndroid return true if the browser is used on an
// Android device.
return platform.isAndroid || platform.isIOS || platform.isMacOS;
// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
// platform.isWindows
return platform.isAndroid ||
platform.isIOS ||
platform.isMacOS ||
platform.isWindows;
}

static bool _isWebWithWasmSupport() {
Expand Down
9 changes: 2 additions & 7 deletions flutter/test/sentry_flutter_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -249,11 +249,8 @@ void main() {
hasFileSystemTransport: false,
);

// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
// testScopeObserver(
// options: sentryFlutterOptions, expectedHasNativeScopeObserver: true);
testScopeObserver(
options: sentryFlutterOptions, expectedHasNativeScopeObserver: false);
options: sentryFlutterOptions, expectedHasNativeScopeObserver: true);

testConfiguration(
integrations: integrations,
Expand All @@ -274,9 +271,7 @@ void main() {
beforeIntegration: WidgetsFlutterBindingIntegration,
afterIntegration: OnErrorIntegration);

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

Expand Down
5 changes: 1 addition & 4 deletions flutter/test/sentry_native/sentry_native_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,4 @@ import 'sentry_native_test_web.dart'

// Defining main() here allows us to manually run/debug from VSCode.
// If we didn't need that, we could just `export` above.

// Temporarily disabled due to https://github.com/getsentry/sentry-dart-plugin/issues/270
// void main() => actual.main();
void main() {}
void main() => actual.main();
13 changes: 4 additions & 9 deletions flutter/windows/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
# customers of the plugin.
cmake_minimum_required(VERSION 3.14)

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

# # Even though sentry_flutter doesn't actually provide a useful plugin, we need to accomodate the Flutter tooling.
# # sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar:
# target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR})

# Temp code: replace with the previous code when sentry-native is enabled
add_library(sentry_flutter_plugin temp.cpp)
target_include_directories(sentry_flutter_plugin INTERFACE ${CMAKE_CURRENT_LIST_DIR})
# Even though sentry_flutter doesn't actually provide a useful plugin, we need to accomodate the Flutter tooling.
# sentry_flutter/sentry_flutter_plugin.h is included by the flutter-tool generated plugin registrar:
target_include_directories(sentry INTERFACE ${CMAKE_CURRENT_LIST_DIR})
1 change: 0 additions & 1 deletion flutter/windows/temp.cpp

This file was deleted.

0 comments on commit cfabe42

Please sign in to comment.