Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto-fix and format native sources #94

Merged
merged 3 commits into from
Jan 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 11 additions & 26 deletions ios/ElectrodeReactNativeBridge.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -616,18 +616,17 @@
DA4BE0B31E36DBCD00DBA1ED /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0920;
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = Walmart;
TargetAttributes = {
DA4BE0BB1E36DBCD00DBA1ED = {
CreatedOnToolsVersion = 8.2.1;
LastSwiftMigration = 0920;
LastSwiftMigration = 0940;
ProvisioningStyle = Manual;
};
DA4BE0C41E36DBCD00DBA1ED = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = DXZ5VF8836;
LastSwiftMigration = 0920;
LastSwiftMigration = 0940;
ProvisioningStyle = Automatic;
};
};
Expand Down Expand Up @@ -903,7 +902,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -912,13 +910,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -928,8 +927,6 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -940,27 +937,24 @@
"DEBUG=1",
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
DA4BE0CF1E36DBCD00DBA1ED /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand All @@ -969,13 +963,14 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
Expand All @@ -984,9 +979,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -997,14 +990,10 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
Expand All @@ -1015,7 +1004,6 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -1048,7 +1036,6 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand Down Expand Up @@ -1078,7 +1065,6 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = DXZ5VF8836;
INFOPLIST_FILE = ElectrodeReactNativeBridgeTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.walmart.platform.ElectrodeReactNativeBridgeTests;
Expand All @@ -1095,7 +1081,6 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ENABLE_MODULES = YES;
DEVELOPMENT_TEAM = DXZ5VF8836;
INFOPLIST_FILE = ElectrodeReactNativeBridgeTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.walmart.platform.ElectrodeReactNativeBridgeTests;
Expand Down
5 changes: 3 additions & 2 deletions ios/ElectrodeReactNativeBridge/ElectrodeBridgeEvent.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ + (nullable instancetype)createEventWithData:(NSDictionary *)data {
}

- (instancetype)initWithName:(NSString *)name data:(id)data {
if (self =
[super initWithName:name type:ElectrodeMessageTypeEvent data:data]) {
if (self = [super initWithName:name
type:ElectrodeMessageTypeEvent
data:data]) {
return self;
}
ERNDebug(@"%@ : unable to create with data %@",
Expand Down
19 changes: 9 additions & 10 deletions ios/ElectrodeReactNativeBridge/ElectrodeBridgeHolder.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@
* limitations under the License.
*/

#import <Foundation/Foundation.h>
#import "ElectrodeBridgeEvent.h"
#import "ElectrodeBridgeRequest.h"

#import "ElectrodeBridgeProtocols.h"
#import "ElectrodeBridgeRequest.h"
#import <Foundation/Foundation.h>

@class ElectrodeBridgeTransceiver;
@protocol ElectrodeBridgeRequestHandler
Expand All @@ -32,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
* Handles queuing every method calls until react native is ready.
*/

extern NSString * const ElectrodeBridgeDidStartObservingNotification;
extern NSString *const ElectrodeBridgeDidStartObservingNotification;

@interface ElectrodeBridgeHolder : NSObject

Expand All @@ -42,16 +41,16 @@ extern NSString * const ElectrodeBridgeDidStartObservingNotification;
completionHandler:(ElectrodeBridgeResponseCompletionHandler)completion;

+ (NSUUID *)registerRequestHandlerWithName:(NSString *)name
requestCompletionHandler:
(ElectrodeBridgeRequestCompletionHandler)completion;

+ (nullable ElectrodeBridgeRequestCompletionHandler)unregisterRequestHandlerWithUUID: (NSUUID *)uuid;
requestCompletionHandler:
(ElectrodeBridgeRequestCompletionHandler)completion;

+ (nullable ElectrodeBridgeRequestCompletionHandler)
unregisterRequestHandlerWithUUID:(NSUUID *)uuid;

+ (NSUUID *)addEventListenerWithName:(NSString *)name
eventListner:(ElectrodeBridgeEventListener)eventListner;
eventListner:(ElectrodeBridgeEventListener)eventListner;

+ (nullable ElectrodeBridgeEventListener)removeEventListener: (NSUUID *)UUID;
+ (nullable ElectrodeBridgeEventListener)removeEventListener:(NSUUID *)UUID;

+ (void)setBridge:(ElectrodeBridgeTransceiver *)bridge;
+ (void)addConstantsProvider:(id<ConstantsProvider>)constantsProvider;
Expand Down
Loading