Merge branch 'fix-ios-rctswiftlog-collision' into fix-ios-rctswiftlog-collision-del

* fix-ios-rctswiftlog-collision:
  Fix iOS RCTSwiftLog naming collision with rive-react-native

CHANGELOG.md

@@ -1,9 +1,10 @@
 ## Changelog
 ### Version 6.0.0-alpha4
 - Android: Switch Google's maven repository to default `google()` [#2860](https://github.com/react-native-video/react-native-video/pull/2860)
+- Fix iOS RCTSwiftLog naming collision [#2868](https://github.com/react-native-video/react-native-video/issues/2868)
 
 ### Version 6.0.0-alpha3
-- fix ios build [#2854](https://gthub.com/react-native-video/react-native-video/pull/2854)
+- Fix ios build [#2854](https://github.com/react-native-video/react-native-video/pull/2854)
 
 ### Version 6.0.0-alpha.2
 

ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-@interface RCTSwiftLog : NSObject
+@interface RCTVideoSwiftLog : NSObject
 
 + (void)error:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;
 + (void)warn:(NSString * _Nonnull)message file:(NSString * _Nonnull)file line:(NSUInteger)line;

ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.m

@@ -1,8 +1,8 @@
 #import <React/RCTLog.h>
 
-#import "RCTSwiftLog.h"
+#import "RCTVideoSwiftLog.h"
 
-@implementation RCTSwiftLog
+@implementation RCTVideoSwiftLog
 
 + (void)info:(NSString *)message file:(NSString *)file line:(NSUInteger)line
 {

ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.swift

@@ -26,23 +26,23 @@
  */
 
 func RCTLogError(_ message: String, _ file: String=#file, _ line: UInt=#line) {
-    RCTSwiftLog.error(message, file: file, line: line)
+    RCTVideoSwiftLog.error(message, file: file, line: line)
 }
 
 func RCTLogWarn(_ message: String, _ file: String=#file, _ line: UInt=#line) {
-    RCTSwiftLog.warn(message, file: file, line: line)
+    RCTVideoSwiftLog.warn(message, file: file, line: line)
 }
 
 func RCTLogInfo(_ message: String, _ file: String=#file, _ line: UInt=#line) {
-    RCTSwiftLog.info(message, file: file, line: line)
+    RCTVideoSwiftLog.info(message, file: file, line: line)
 }
 
 func RCTLog(_ message: String, _ file: String=#file, _ line: UInt=#line) {
-    RCTSwiftLog.log(message, file: file, line: line)
+    RCTVideoSwiftLog.log(message, file: file, line: line)
 }
 
 func RCTLogTrace(_ message: String, _ file: String=#file, _ line: UInt=#line) {
-    RCTSwiftLog.trace(message, file: file, line: line)
+    RCTVideoSwiftLog.trace(message, file: file, line: line)
 }
 
 func DebugLog(_ message: String) {