feat: ios symbol upload flavors (#292)

* feat: ios symbol upload flavors * chore: changelog
getsentry · Jan 17, 2025 · 15eabfa · 15eabfa
1 parent 560dadb
commit 15eabfa
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Features
+
+- Support flavors in iOS symbol upload ([#292](https://github.com/getsentry/sentry-dart-plugin/pull/292))
+
 ### Dependencies
 
 - Bump CLI from v2.38.1 to v2.39.1 ([#282](https://github.com/getsentry/sentry-dart-plugin/pull/282))

diff --git a/lib/sentry_dart_plugin.dart b/lib/sentry_dart_plugin.dart
@@ -80,8 +80,8 @@ class SentryDartPlugin {
 
     _addWait(params);
 
-    final debugSymbolPaths = _enumerateDebugSymbolPaths();
     final fs = injector.get<FileSystem>();
+    final debugSymbolPaths = _enumerateDebugSymbolPaths(fs);
     await for (final path in debugSymbolPaths) {
       if (await fs.directory(path).exists() || await fs.file(path).exists()) {
         await _executeAndLog('Failed to upload symbols', [...params, path]);
@@ -95,7 +95,7 @@ class SentryDartPlugin {
     Log.taskCompleted(taskName);
   }
 
-  Stream<String> _enumerateDebugSymbolPaths() async* {
+  Stream<String> _enumerateDebugSymbolPaths(FileSystem fs) async* {
     final buildDir = _configuration.buildFilesFolder;
 
     // Android (apk, appbundle)
@@ -122,8 +122,15 @@ class SentryDartPlugin {
     yield '$buildDir/macos/framework/Release';
 
     // iOS
-    yield '$buildDir/ios/iphoneos/Runner.App';
-    yield '$buildDir/ios/Release-iphoneos';
+    yield '$buildDir/ios/iphoneos/Runner.app';
+    if (await fs.directory('$buildDir/ios').exists()) {
+      final regexp = RegExp(r'^Release(-.*)?-iphoneos$');
+      yield* fs
+          .directory('$buildDir/ios')
+          .list()
+          .where((v) => regexp.hasMatch(v.basename))
+          .map((e) => e.path);
+    }
 
     // iOS (ipa)
     yield '$buildDir/ios/archive';

diff --git a/test/plugin_test.dart b/test/plugin_test.dart
@@ -353,6 +353,43 @@ void main() {
               '$cli $args releases $orgAndProject finalize $configRelease'
             ]);
           });
+
+          test('uploads debug symbols from all known paths', () async {
+            const version = '1.0.0';
+            final config = 'upload_debug_symbols: true';
+
+            final outputDirectories = [
+              'app/outputs',
+              'app/intermediates',
+              'windows/runner/Release',
+              'windows/x64/runner/Release',
+              'windows/arm64/runner/Release',
+              'linux/x64/release/bundle',
+              'linux/arm64/release/bundle',
+              'macos/Build/Products/Release',
+              'macos/framework/Release',
+              'ios/iphoneos/Runner.app',
+              'ios/Release-iphoneos',
+              'ios/Release-anyrandomflavor-iphoneos',
+              'ios/archive',
+              'ios/framework/Release'
+            ];
+            for (final dir in outputDirectories) {
+              fs
+                  .directory(buildDir)
+                  .childDirectory(dir)
+                  .createSync(recursive: true);
+            }
+
+            final commandLog = await runWith(version, config);
+
+            for (final dir in outputDirectories) {
+              expect(
+                  commandLog,
+                  contains(
+                      '$cli $commonArgs debug-files upload $orgAndProject $buildDir/$dir'));
+            }
+          });
         });
       });
     }