From 0e49e64d512726a42cc76168f26567338505b6e6 Mon Sep 17 00:00:00 2001
From: Jonas Franz <jonas.franz@zollsoft.de>
Date: Mon, 3 Mar 2025 14:47:52 +0100
Subject: [PATCH 1/2] Add support for macOS flavors

---
 CHANGELOG.md                |  6 ++++++
 lib/sentry_dart_plugin.dart | 30 +++++++++++++++++++++---------
 test/plugin_test.dart       |  2 ++
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8200e6bb..c598b24d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Support flavors in macOS symbol upload ([#308](https://github.com/getsentry/sentry-dart-plugin/pull/308))
+
 ## 2.4.1
 
 ### Fixes
diff --git a/lib/sentry_dart_plugin.dart b/lib/sentry_dart_plugin.dart
index 7ba0e030..2ce17705 100644
--- a/lib/sentry_dart_plugin.dart
+++ b/lib/sentry_dart_plugin.dart
@@ -104,7 +104,7 @@ class SentryDartPlugin {
 
     // Windows
     for (final subdir in ['', '/x64', '/arm64']) {
-      yield '$buildDir/windows$subdir/runner/Release';
+      yield* _enumerateDirectoryWithFlavors(fs, basePath: '$buildDir/windows$subdir/runner');
     }
     // TODO we should delete this once we have windows symbols collected automatically.
     // Related to https://github.com/getsentry/sentry-dart-plugin/issues/173
@@ -116,10 +116,10 @@ class SentryDartPlugin {
     }
 
     // macOS
-    yield '$buildDir/macos/Build/Products/Release';
+    yield* _enumerateDirectoryWithFlavors(fs, basePath: '$buildDir/macos/Build/Products');
 
     // macOS (macOS-framework)
-    yield '$buildDir/macos/framework/Release';
+    yield* _enumerateDirectoryWithFlavors(fs, basePath: '$buildDir/macos/framework');
 
     // iOS
     yield '$buildDir/ios/iphoneos/Runner.app';
@@ -136,7 +136,20 @@ class SentryDartPlugin {
     yield '$buildDir/ios/archive';
 
     // iOS (ios-framework)
-    yield '$buildDir/ios/framework/Release';
+    yield* _enumerateDirectoryWithFlavors(fs, basePath: '$buildDir/ios/framework');
+  }
+
+  Stream<String> _enumerateDirectoryWithFlavors(FileSystem fs, {
+    required String basePath,
+    String targetDirectoryName = "Release"
+  }) async* {
+    if (await fs.directory(basePath).exists()) {
+      yield* fs
+          .directory(basePath)
+          .list()
+          .where((v) => v.basename.startsWith(targetDirectoryName))
+          .map((e) => e.path);
+    }
   }
 
   Future<Set<String>> _enumerateSymbolFiles() async {
@@ -282,9 +295,8 @@ class SentryDartPlugin {
     int? exitCode;
 
     try {
-      final process = await injector
-          .get<ProcessManager>()
-          .start([_configuration.cliPath!, ...params]);
+      final process =
+          await injector.get<ProcessManager>().start([_configuration.cliPath!, ...params]);
 
       process.stdout.transform(utf8.decoder).listen((data) {
         Log.info(data.trim());
@@ -303,8 +315,8 @@ class SentryDartPlugin {
     }
   }
 
-  void _addExtensionToParams(List<String> exts, List<String> params,
-      String release, String folder, String? urlPrefix) {
+  void _addExtensionToParams(
+      List<String> exts, List<String> params, String release, String folder, String? urlPrefix) {
     params.add('files');
     params.add(release);
     params.add('upload-sourcemaps');
diff --git a/test/plugin_test.dart b/test/plugin_test.dart
index 3198873c..6e3fd443 100644
--- a/test/plugin_test.dart
+++ b/test/plugin_test.dart
@@ -367,7 +367,9 @@ void main() {
               'linux/x64/release/bundle',
               'linux/arm64/release/bundle',
               'macos/Build/Products/Release',
+              'macos/Build/Products/Release-demo',
               'macos/framework/Release',
+              'macos/framework/Release-demo',
               'ios/iphoneos/Runner.app',
               'ios/Release-iphoneos',
               'ios/Release-anyrandomflavor-iphoneos',

From 4e531755b77a715fa98c2895d38816dc3d489d4a Mon Sep 17 00:00:00 2001
From: Jonas Franz <jonas.franz@zollsoft.de>
Date: Mon, 3 Mar 2025 17:14:05 +0100
Subject: [PATCH 2/2] Remove flavor support for windows since flutter doesn't
 support it

---
 lib/sentry_dart_plugin.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sentry_dart_plugin.dart b/lib/sentry_dart_plugin.dart
index 2ce17705..e52bb5e7 100644
--- a/lib/sentry_dart_plugin.dart
+++ b/lib/sentry_dart_plugin.dart
@@ -104,7 +104,7 @@ class SentryDartPlugin {
 
     // Windows
     for (final subdir in ['', '/x64', '/arm64']) {
-      yield* _enumerateDirectoryWithFlavors(fs, basePath: '$buildDir/windows$subdir/runner');
+      yield '$buildDir/windows$subdir/runner/Release';
     }
     // TODO we should delete this once we have windows symbols collected automatically.
     // Related to https://github.com/getsentry/sentry-dart-plugin/issues/173