diff --git a/CHANGELOG.md b/CHANGELOG.md index b95ce22..550ac2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## Unreleased + +### Fixes + +- Add additional path to check for iOS debug symbols ([#342](https://github.com/getsentry/sentry-dart-plugin/pull/342)) + ## 3.1.0 ### Features diff --git a/lib/sentry_dart_plugin.dart b/lib/sentry_dart_plugin.dart index a69463d..537dd1a 100644 --- a/lib/sentry_dart_plugin.dart +++ b/lib/sentry_dart_plugin.dart @@ -102,6 +102,7 @@ class SentryDartPlugin { Stream _enumerateDebugSymbolPaths(FileSystem fs) async* { final buildDir = _configuration.buildFilesFolder; + final projectRoot = fs.currentDirectory.path; // Android (apk, appbundle) yield '$buildDir/app/outputs'; @@ -142,6 +143,9 @@ class SentryDartPlugin { // iOS (ios-framework) yield '$buildDir/ios/framework/Release'; + + // iOS in Fastlane + yield '$projectRoot/ios/build'; } Future> _enumerateSymbolFiles() async { diff --git a/test/plugin_test.dart b/test/plugin_test.dart index b2feb57..8622de2 100644 --- a/test/plugin_test.dart +++ b/test/plugin_test.dart @@ -406,6 +406,7 @@ void main() { const version = '1.0.0'; final config = 'upload_debug_symbols: true'; + // Default output directories in build/ final outputDirectories = [ 'app/outputs', 'app/intermediates', @@ -420,22 +421,32 @@ void main() { 'ios/Release-iphoneos', 'ios/Release-anyrandomflavor-iphoneos', 'ios/archive', - 'ios/framework/Release' + 'ios/framework/Release', ]; + // Alternative output directories from 'root' + final alternativeOutputDirectories = ['ios/build']; for (final dir in outputDirectories) { fs .directory(buildDir) .childDirectory(dir) .createSync(recursive: true); } + for (final dir in alternativeOutputDirectories) { + 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')); + contains(anyOf([ + '$cli $commonArgs debug-files upload $orgAndProject $buildDir/$dir', + '$cli $commonArgs debug-files upload $orgAndProject $dir' + ]))); } }); });