Renaming RNUtils to avoid duplicate file symbol

RNNotifications/RCTConvert+Notifications.m → RNNotifications/RCTConvert+RNNotifications.m

-#import "RCTConvert+Notifications.h"
+#import "RCTConvert+RNNotifications.h"
 
 
 @implementation RCTConvert (UIUserNotificationActivationMode)

RNNotifications/RNBridgeModule.m

 #import "RNBridgeModule.h"
 #import "RNCommandsHandler.h"
-#import "RCTConvert+Notifications.h"
+#import "RCTConvert+RNNotifications.h"
 #import "RNNotificationsStore.h"
 #import <React/RCTBridgeDelegate.h>
 

RNNotifications/RNCommandsHandler.m

 #import "RNCommandsHandler.h"
 #import "RNNotifications.h"
 #import "RNNotificationsStore.h"
-#import "RCTConvert+Notifications.h"
+#import "RCTConvert+RNNotifications.h"
 
 @implementation RNCommandsHandler {
     RNNotificationCenter* _notificationCenter;

RNNotifications/RNNotificationCenter.m

 #import "RNNotificationCenter.h"
-#import "RCTConvert+Notifications.h"
+#import "RCTConvert+RNNotifications.h"
 
 @implementation RNNotificationCenter
 

RNNotifications/RNNotificationCenterListener.m

 #import "RNNotificationCenterListener.h"
-#import "RCTConvert+Notifications.h"
+#import "RCTConvert+RNNotifications.h"
 
 @implementation RNNotificationCenterListener {
     RNNotificationEventHandler* _notificationEventHandler;

RNNotifications/RNNotificationEventHandler.m

 #import "RNNotificationEventHandler.h"
 #import "RNEventEmitter.h"
-#import "RNUtils.h"
-#import "RCTConvert+Notifications.h"
+#import "RNNotificationUtils.h"
+#import "RCTConvert+RNNotifications.h"
 #import "RNNotificationParser.h"
 
 @implementation RNNotificationEventHandler {
@@ -15,7 +15,7 @@
 }
 
 - (void)didRegisterForRemoteNotificationsWithDeviceToken:(id)deviceToken {
-    NSString *tokenRepresentation = [deviceToken isKindOfClass:[NSString class]] ? deviceToken : [RNUtils deviceTokenToString:deviceToken];
+    NSString *tokenRepresentation = [deviceToken isKindOfClass:[NSString class]] ? deviceToken : [RNNotificationUtils deviceTokenToString:deviceToken];
     [RNEventEmitter sendEvent:RNRegistered body:@{@"deviceToken": tokenRepresentation}];
 }
 

RNNotifications/RNNotificationParser.m

 #import "RNNotificationParser.h"
-#import "RCTConvert+Notifications.h"
+#import "RCTConvert+RNNotifications.h"
 
 @implementation RNNotificationParser
 

RNNotifications/RNUtils.h → RNNotifications/RNNotificationUtils.h

 #import <Foundation/Foundation.h>
 
-@interface RNUtils : NSObject
+@interface RNNotificationUtils : NSObject
 
 + (NSString *)deviceTokenToString:(NSData *)deviceToken;
 

RNNotifications/RNUtils.m → RNNotifications/RNNotificationUtils.m

-#import "RNUtils.h"
+#import "RNNotificationUtils.h"
 
-@implementation RNUtils
+@implementation RNNotificationUtils
 
 + (NSString *)deviceTokenToString:(NSData *)deviceToken {
     NSMutableString *result = [NSMutableString string];

RNNotifications/RNNotifications.xcodeproj/project.pbxproj

@@ -9,14 +9,14 @@
 /* Begin PBXBuildFile section */
 		50351F8F22CD782F000713B3 /* RNEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F8E22CD782F000713B3 /* RNEventEmitter.m */; };
 		50351F9222CD7DF4000713B3 /* RNBridgeModule.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9122CD7DF4000713B3 /* RNBridgeModule.m */; };
-		50351F9522CD7FF1000713B3 /* RCTConvert+Notifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9422CD7FF1000713B3 /* RCTConvert+Notifications.m */; };
+		50351F9522CD7FF1000713B3 /* RCTConvert+RNNotifications.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */; };
 		50351F9822CD8604000713B3 /* RNCommandsHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 50351F9722CD8604000713B3 /* RNCommandsHandler.m */; };
 		507DCCF522CE3EBD005D4E0B /* RNNotifications.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = D8A2F7561CB57F28002CC8F5 /* RNNotifications.h */; };
 		507DCCF722CE3EF7005D4E0B /* RNBridgeModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F9022CD7DF4000713B3 /* RNBridgeModule.h */; };
 		507DCCF922CE3F04005D4E0B /* RNNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = D8A2F7561CB57F28002CC8F5 /* RNNotifications.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		507DCCFA22CE3F04005D4E0B /* RNEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F8D22CD782F000713B3 /* RNEventEmitter.h */; };
 		507DCCFB22CE3F04005D4E0B /* RNCommandsHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F9622CD8604000713B3 /* RNCommandsHandler.h */; };
-		507DCCFC22CE3F04005D4E0B /* RCTConvert+Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F9322CD7FF1000713B3 /* RCTConvert+Notifications.h */; };
+		507DCCFC22CE3F04005D4E0B /* RCTConvert+RNNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 50351F9322CD7FF1000713B3 /* RCTConvert+RNNotifications.h */; };
 		508CE7CB22D12B2600357815 /* RNNotificationsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 508CE7CA22D12B2600357815 /* RNNotificationsTests.m */; };
 		508CE7CD22D12B2600357815 /* libRNNotifications.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 134814201AA4EA6300B7C361 /* libRNNotifications.a */; };
 		508CE7D522D12CCA00357815 /* RNNotificationEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 508CE7D322D12CCA00357815 /* RNNotificationEventHandler.h */; };
@@ -27,8 +27,8 @@
 		508CE81A22D130B900357815 /* RNPushKitEventListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 508CE81822D130B900357815 /* RNPushKitEventListener.m */; };
 		508CE81D22D1337200357815 /* RNPushKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 508CE81B22D1337200357815 /* RNPushKit.h */; };
 		508CE81E22D1337200357815 /* RNPushKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 508CE81C22D1337200357815 /* RNPushKit.m */; };
-		508CE82222D1372E00357815 /* RNUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 508CE82022D1372E00357815 /* RNUtils.h */; };
-		508CE82322D1372E00357815 /* RNUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 508CE82122D1372E00357815 /* RNUtils.m */; };
+		508CE82222D1372E00357815 /* RNNotificationUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 508CE82022D1372E00357815 /* RNNotificationUtils.h */; };
+		508CE82322D1372E00357815 /* RNNotificationUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 508CE82122D1372E00357815 /* RNNotificationUtils.m */; };
 		50AD1FCA22D13ADB00E12362 /* RNPushKitEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 50AD1FC822D13ADB00E12362 /* RNPushKitEventHandler.h */; };
 		50AD1FCB22D13ADB00E12362 /* RNPushKitEventHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 50AD1FC922D13ADB00E12362 /* RNPushKitEventHandler.m */; };
 		50E49F0722D1E4E0007160C1 /* RNNotificationsStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E49F0522D1E4E0007160C1 /* RNNotificationsStore.h */; };
@@ -69,8 +69,8 @@
 		50351F8E22CD782F000713B3 /* RNEventEmitter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNEventEmitter.m; sourceTree = "<group>"; };
 		50351F9022CD7DF4000713B3 /* RNBridgeModule.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNBridgeModule.h; sourceTree = "<group>"; };
 		50351F9122CD7DF4000713B3 /* RNBridgeModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNBridgeModule.m; sourceTree = "<group>"; };
-		50351F9322CD7FF1000713B3 /* RCTConvert+Notifications.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+Notifications.h"; sourceTree = "<group>"; };
-		50351F9422CD7FF1000713B3 /* RCTConvert+Notifications.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+Notifications.m"; sourceTree = "<group>"; };
+		50351F9322CD7FF1000713B3 /* RCTConvert+RNNotifications.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RCTConvert+RNNotifications.h"; sourceTree = "<group>"; };
+		50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RCTConvert+RNNotifications.m"; sourceTree = "<group>"; };
 		50351F9622CD8604000713B3 /* RNCommandsHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNCommandsHandler.h; sourceTree = "<group>"; };
 		50351F9722CD8604000713B3 /* RNCommandsHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNCommandsHandler.m; sourceTree = "<group>"; };
 		508CE7C822D12B2600357815 /* RNNotificationsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNNotificationsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -84,8 +84,8 @@
 		508CE81822D130B900357815 /* RNPushKitEventListener.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNPushKitEventListener.m; sourceTree = "<group>"; };
 		508CE81B22D1337200357815 /* RNPushKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNPushKit.h; sourceTree = "<group>"; };
 		508CE81C22D1337200357815 /* RNPushKit.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNPushKit.m; sourceTree = "<group>"; };
-		508CE82022D1372E00357815 /* RNUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNUtils.h; sourceTree = "<group>"; };
-		508CE82122D1372E00357815 /* RNUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNUtils.m; sourceTree = "<group>"; };
+		508CE82022D1372E00357815 /* RNNotificationUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNotificationUtils.h; sourceTree = "<group>"; };
+		508CE82122D1372E00357815 /* RNNotificationUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNotificationUtils.m; sourceTree = "<group>"; };
 		50AD1FC822D13ADB00E12362 /* RNPushKitEventHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNPushKitEventHandler.h; sourceTree = "<group>"; };
 		50AD1FC922D13ADB00E12362 /* RNPushKitEventHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNPushKitEventHandler.m; sourceTree = "<group>"; };
 		50E49F0522D1E4E0007160C1 /* RNNotificationsStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNotificationsStore.h; sourceTree = "<group>"; };
@@ -167,10 +167,10 @@
 		508CE81F22D1371700357815 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
-				508CE82022D1372E00357815 /* RNUtils.h */,
-				508CE82122D1372E00357815 /* RNUtils.m */,
-				50351F9322CD7FF1000713B3 /* RCTConvert+Notifications.h */,
-				50351F9422CD7FF1000713B3 /* RCTConvert+Notifications.m */,
+				508CE82022D1372E00357815 /* RNNotificationUtils.h */,
+				508CE82122D1372E00357815 /* RNNotificationUtils.m */,
+				50351F9322CD7FF1000713B3 /* RCTConvert+RNNotifications.h */,
+				50351F9422CD7FF1000713B3 /* RCTConvert+RNNotifications.m */,
 			);
 			name = Helpers;
 			sourceTree = "<group>";
@@ -218,11 +218,11 @@
 				508CE81922D130B900357815 /* RNPushKitEventListener.h in Headers */,
 				50E49F0722D1E4E0007160C1 /* RNNotificationsStore.h in Headers */,
 				508CE81622D12FF600357815 /* RNNotificationCenterListener.h in Headers */,
-				508CE82222D1372E00357815 /* RNUtils.h in Headers */,
+				508CE82222D1372E00357815 /* RNNotificationUtils.h in Headers */,
 				50FED76E22D3EBA800DDD516 /* RNNotificationParser.h in Headers */,
 				507DCCFA22CE3F04005D4E0B /* RNEventEmitter.h in Headers */,
 				507DCCFB22CE3F04005D4E0B /* RNCommandsHandler.h in Headers */,
-				507DCCFC22CE3F04005D4E0B /* RCTConvert+Notifications.h in Headers */,
+				507DCCFC22CE3F04005D4E0B /* RCTConvert+RNNotifications.h in Headers */,
 				507DCCF722CE3EF7005D4E0B /* RNBridgeModule.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -335,8 +335,8 @@
 				508CE81E22D1337200357815 /* RNPushKit.m in Sources */,
 				508CE7D622D12CCA00357815 /* RNNotificationEventHandler.m in Sources */,
 				50E49F0822D1E4E0007160C1 /* RNNotificationsStore.m in Sources */,
-				508CE82322D1372E00357815 /* RNUtils.m in Sources */,
-				50351F9522CD7FF1000713B3 /* RCTConvert+Notifications.m in Sources */,
+				508CE82322D1372E00357815 /* RNNotificationUtils.m in Sources */,
+				50351F9522CD7FF1000713B3 /* RCTConvert+RNNotifications.m in Sources */,
 				50AD1FCB22D13ADB00E12362 /* RNPushKitEventHandler.m in Sources */,
 				508CE81422D12FC700357815 /* RNNotificationCenterListener.m in Sources */,
 			);

RNNotifications/RNPushKitEventListener.m

 #import "RNPushKitEventListener.h"
-#import "RNUtils.h"
+#import "RNNotificationUtils.h"
 
 @implementation RNPushKitEventListener {
     PKPushRegistry* _pushRegistry;
@@ -16,7 +16,7 @@
 }
 
 - (void)pushRegistry:(PKPushRegistry *)registry didUpdatePushCredentials:(PKPushCredentials *)credentials forType:(NSString *)type {
-    [_pushKitEventHandler registeredWithToken:[RNUtils deviceTokenToString:credentials.token]];
+    [_pushKitEventHandler registeredWithToken:[RNNotificationUtils deviceTokenToString:credentials.token]];
 }
 
 - (void)pushRegistry:(PKPushRegistry *)registry didReceiveIncomingPushWithPayload:(PKPushPayload *)payload forType:(NSString *)type {

e2e/Notifications.test.js

@@ -12,7 +12,7 @@ describe('Notifications', () => {
       await expect(elementByLabel('foreground/notification')).toBeVisible();
     });
 
-    it.only('Click notification', async () => {
+    it('Click notification', async () => {
       await device.sendUserNotification(createNotification({link: 'foreground/notification/click', showAlert: true}));
       await expect(elementByLabel('Notification Clicked: foreground/notification/click')).toBeVisible();
     });
@@ -20,7 +20,7 @@ describe('Notifications', () => {
 
   describe('Background', () => {
     beforeEach(async () => {
-      await device.relaunchApp({permissions: {notifications: 'YES'}});
+      await device.launchApp({newInstance: true, permissions: {notifications: 'YES'}});
     });
 
     it('Receive notification', async () => {