Merge branch 'v6' into v6-remove-event-apis

bugsnag · Mar 27, 2020 · f09813a · f09813a
2 parents 6814f48 + 83c98a8
commit f09813a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ Bugsnag Notifiers on other platforms.
 * Remove unused APIs on `BugsnagEvent` interface
   [#498](https://github.com/bugsnag/bugsnag-cocoa/pull/498)
 
+* Remove unused APIs from `BugsnagMetadata` interface
+[#501](https://github.com/bugsnag/bugsnag-cocoa/pull/501)
+
 * Remove unused APIs from `BugsnagConfiguration` interface
   [#496](https://github.com/bugsnag/bugsnag-cocoa/pull/496)
 

diff --git a/Source/Bugsnag.m b/Source/Bugsnag.m
@@ -56,6 +56,10 @@ @interface BugsnagClient ()
 - (void)startListeningForStateChangeNotification:(NSString *_Nonnull)notificationName;
 @end
 
+@interface BugsnagMetadata ()
+- (NSDictionary *_Nonnull)toDictionary;
+@end
+
 @implementation Bugsnag
 
 + (void)startBugsnagWithApiKey:(NSString *)apiKey {

diff --git a/Source/BugsnagClient.m b/Source/BugsnagClient.m
@@ -224,6 +224,11 @@ @interface BugsnagEvent ()
 @property(readwrite) NSUInteger depth;
 @end
 
+@interface BugsnagMetadata ()
+- (NSDictionary *_Nonnull)toDictionary;
+@property(unsafe_unretained) id<BugsnagMetadataDelegate> _Nullable delegate;
+@end
+
 @implementation BugsnagClient
 
 @synthesize configuration;

diff --git a/Source/BugsnagMetadata.h b/Source/BugsnagMetadata.h
@@ -26,8 +26,6 @@
 
 #import <Foundation/Foundation.h>
 
-@protocol BugsnagMetadataDelegate;
-
 @interface BugsnagMetadata : NSObject <NSMutableCopying>
 
 - (instancetype _Nonnull)initWithDictionary:(NSMutableDictionary *_Nonnull)dict;
@@ -71,14 +69,10 @@
                            key:(NSString *_Nonnull)key
     NS_SWIFT_NAME(clearMetadata(section:key:));
 
-- (NSDictionary *_Nonnull)toDictionary;
-
 - (void)addAttribute:(NSString *_Nonnull)attributeName
            withValue:(id _Nullable)value
        toTabWithName:(NSString *_Nonnull)sectionName;
 
-@property(unsafe_unretained) id<BugsnagMetadataDelegate> _Nullable delegate;
-
 /**
  * Merge supplied and existing metadata.
  *

diff --git a/Source/BugsnagMetadata.m b/Source/BugsnagMetadata.m
@@ -30,6 +30,8 @@
 
 @interface BugsnagMetadata ()
 @property(atomic, strong) NSMutableDictionary *dictionary;
+- (NSDictionary *_Nonnull)toDictionary;
+@property(unsafe_unretained) id<BugsnagMetadataDelegate> _Nullable delegate;
 @end
 
 @implementation BugsnagMetadata

diff --git a/Tests/BugsnagEventTests.m b/Tests/BugsnagEventTests.m
@@ -27,6 +27,10 @@ - (BOOL)shouldBeSent;
 @property(readwrite) NSUInteger depth;
 @end
 
+@interface BugsnagMetadata ()
+- (NSDictionary *_Nonnull)toDictionary;
+@end
+
 @interface BugsnagEventTests : BugsnagBaseUnitTest
 @end
 

diff --git a/Tests/BugsnagMetadataTests.m b/Tests/BugsnagMetadataTests.m
@@ -18,6 +18,8 @@ @interface BugsnagMetadataTests : XCTestCase <BugsnagMetadataDelegate>
 
 @interface BugsnagMetadata ()
 @property(atomic, strong) NSMutableDictionary *dictionary;
+- (NSDictionary *_Nonnull)toDictionary;
+@property(unsafe_unretained) id<BugsnagMetadataDelegate> _Nullable delegate;
 @end
 
 // MARK: - DummyClass

diff --git a/UPGRADING.md b/UPGRADING.md
@@ -172,7 +172,14 @@ Swift:
 ```
 
 Note that `BugsnagMetadata.getTab()` previously would create a metadata section if it
-did not exist; the new behaviour in `getMetadata` is to return `nil`. 
+did not exist; the new behaviour in `getMetadata` is to return `nil`.
+
+#### Removals
+
+```diff
+- toDictionary
+- delegate
+```
 
 ### `BugsnagBreadcrumb` class