railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* fix-ios-rctswiftlog-collision:
  Fix iOS RCTSwiftLog naming collision with rive-react-native
This commit is contained in:
Liam Potter 2022-09-26 00:21:00 +01:00
commit fe3d778145
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,9 +1,10 @@
## Changelog ## Changelog
### Version 6.0.0-alpha4 ### 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) - 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 ### 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 ### Version 6.0.0-alpha.2

2
ios/Video/RCTSwiftLog/RCTSwiftLog.h → ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.h
View File

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

4
ios/Video/RCTSwiftLog/RCTSwiftLog.m → ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.m
View File

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

10
ios/Video/RCTSwiftLog/RCTSwiftLog.swift → ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.swift
View File

@ -26,23 +26,23 @@
*/ */
func RCTLogError(_ message: String, _ file: String=#file, _ line: UInt=#line) { 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) { 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) { 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) { 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) { 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) { func DebugLog(_ message: String) {