Skip to content

Commit

Permalink
core: update native ios sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@yacir
yacir committed Jan 4, 2021
1 parent fcd947a commit cd7a1e3
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 47 deletions.
78 changes: 39 additions & 39 deletions example/ios/NumberlyPluginExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2DCD954D1E0B4F2C00145EB5 /* NumberlyPluginExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* NumberlyPluginExampleTests.m */; };
38F8DDD32594CFDA00BDA1B0 /* Numberly.plist in Resources */ = {isa = PBXBuildFile; fileRef = 38F8DDD22594CFDA00BDA1B0 /* Numberly.plist */; };
4C39C56BAD484C67AA576FFA /* libPods-NumberlyPluginExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CA3E69C5B9553B26FBA2DF04 /* libPods-NumberlyPluginExample.a */; };
4B0EFAFEB00449E751896091 /* libPods-NumberlyPluginExample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AD6714D3E6EB1AB04C2C8918 /* libPods-NumberlyPluginExample.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -52,12 +52,12 @@
2D02E4901E0B4A5D006451C7 /* NumberlyPluginExample-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "NumberlyPluginExample-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
38F8DDD22594CFDA00BDA1B0 /* Numberly.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Numberly.plist; sourceTree = "<group>"; };
38F8DDD82594D83000BDA1B0 /* NumberlyPluginExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = NumberlyPluginExample.entitlements; path = NumberlyPluginExample/NumberlyPluginExample.entitlements; sourceTree = "<group>"; };
47F7ED3B7971BE374F7B8635 /* Pods-NumberlyPluginExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NumberlyPluginExample.debug.xcconfig"; path = "Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample.debug.xcconfig"; sourceTree = "<group>"; };
67CC2EC56569D3589F59DA06 /* Pods-NumberlyPluginExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NumberlyPluginExample.release.xcconfig"; path = "Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample.release.xcconfig"; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = NumberlyPluginExample/LaunchScreen.storyboard; sourceTree = "<group>"; };
CA3E69C5B9553B26FBA2DF04 /* libPods-NumberlyPluginExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NumberlyPluginExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
E00ACF0FDA8BF921659E2F9A /* Pods-NumberlyPluginExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NumberlyPluginExample.release.xcconfig"; path = "Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample.release.xcconfig"; sourceTree = "<group>"; };
AD6714D3E6EB1AB04C2C8918 /* libPods-NumberlyPluginExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NumberlyPluginExample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
F9EC4675899105708CC75BB2 /* Pods-NumberlyPluginExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NumberlyPluginExample.debug.xcconfig"; path = "Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand All @@ -72,7 +72,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4C39C56BAD484C67AA576FFA /* libPods-NumberlyPluginExample.a in Frameworks */,
4B0EFAFEB00449E751896091 /* libPods-NumberlyPluginExample.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -130,16 +130,16 @@
children = (
ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
CA3E69C5B9553B26FBA2DF04 /* libPods-NumberlyPluginExample.a */,
AD6714D3E6EB1AB04C2C8918 /* libPods-NumberlyPluginExample.a */,
);
name = Frameworks;
sourceTree = "<group>";
};
6B9684456A2045ADE5A6E47E /* Pods */ = {
isa = PBXGroup;
children = (
47F7ED3B7971BE374F7B8635 /* Pods-NumberlyPluginExample.debug.xcconfig */,
E00ACF0FDA8BF921659E2F9A /* Pods-NumberlyPluginExample.release.xcconfig */,
F9EC4675899105708CC75BB2 /* Pods-NumberlyPluginExample.debug.xcconfig */,
67CC2EC56569D3589F59DA06 /* Pods-NumberlyPluginExample.release.xcconfig */,
);
path = Pods;
sourceTree = "<group>";
Expand Down Expand Up @@ -203,14 +203,14 @@
isa = PBXNativeTarget;
buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "NumberlyPluginExample" */;
buildPhases = (
4F0A6FC082772762E3E4C96C /* [CP] Check Pods Manifest.lock */,
D7BA8574C254F4344A2262ED /* [CP] Check Pods Manifest.lock */,
FD10A7F022414F080027D42C /* Start Packager */,
13B07F871A680F5B00A75B9A /* Sources */,
13B07F8C1A680F5B00A75B9A /* Frameworks */,
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
C1D60D28B925C94BD88E79D7 /* [CP] Copy Pods Resources */,
16FC1F98B6B6CAF447B79E1F /* [CP] Embed Pods Frameworks */,
BD01E8B83B92BD9A060DC018 /* [CP] Embed Pods Frameworks */,
3A481BD615451DD6A6D897CB /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -356,76 +356,76 @@
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
};
16FC1F98B6B6CAF447B79E1F /* [CP] Embed Pods Frameworks */ = {
2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Numberly/Numberly.framework/Numberly",
);
name = "[CP] Embed Pods Frameworks";
name = "Bundle React Native Code And Images";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Numberly.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
};
2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = {
3A481BD615451DD6A6D897CB /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
);
name = "Bundle React Native Code And Images";
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
4F0A6FC082772762E3E4C96C /* [CP] Check Pods Manifest.lock */ = {
BD01E8B83B92BD9A060DC018 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-frameworks.sh",
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Numberly/Numberly.framework/Numberly",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-NumberlyPluginExample-checkManifestLockResult.txt",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Numberly.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
C1D60D28B925C94BD88E79D7 /* [CP] Copy Pods Resources */ = {
D7BA8574C254F4344A2262ED /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-resources.sh",
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
"$(DERIVED_FILE_DIR)/Pods-NumberlyPluginExample-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NumberlyPluginExample/Pods-NumberlyPluginExample-resources.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
FD10A7F022414F080027D42C /* Start Packager */ = {
Expand Down Expand Up @@ -562,7 +562,7 @@
};
13B07F941A680F5B00A75B9A /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 47F7ED3B7971BE374F7B8635 /* Pods-NumberlyPluginExample.debug.xcconfig */;
baseConfigurationReference = F9EC4675899105708CC75BB2 /* Pods-NumberlyPluginExample.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand All @@ -587,7 +587,7 @@
};
13B07F951A680F5B00A75B9A /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E00ACF0FDA8BF921659E2F9A /* Pods-NumberlyPluginExample.release.xcconfig */;
baseConfigurationReference = 67CC2EC56569D3589F59DA06 /* Pods-NumberlyPluginExample.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
Expand Down
14 changes: 6 additions & 8 deletions ios/NumberlyPlugin.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
// Copyright © 2020-present Numberly. All rights reserved.
//

@import UserNotifications;

#import "NumberlyPlugin.h"
#import "RNNumberlyEventEmitter.h"

Expand Down Expand Up @@ -78,7 +76,8 @@ - (void)removeListeners:(double)count {
{
[Numberly.push registerForRemoteNotifications:@[@(NBLPushAuthorizationOptionAlert),
@(NBLPushAuthorizationOptionSound),
@(NBLPushAuthorizationOptionBadge)]];
@(NBLPushAuthorizationOptionBadge)]
completionHandler:nil];
}

RCT_EXPORT_METHOD(clearBadge) {
Expand All @@ -89,13 +88,12 @@ - (void)removeListeners:(double)count {
pushAreNotificationsEnabled_resolver:(RCTPromiseResolveBlock)resolve
withRejecter:(RCTPromiseRejectBlock)reject)
{
[UNUserNotificationCenter.currentNotificationCenter
getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
switch (settings.authorizationStatus) {
case UNAuthorizationStatusDenied:
[Numberly.push areNotificationsEnabledWithCompletionHandler:^(enum NBLPushAuthorizationStatus result) {
switch (result) {
case NBLPushAuthorizationStatusDenied:
resolve(@NO);
break;
case UNAuthorizationStatusNotDetermined:
case NBLPushAuthorizationStatusNotDetermined:
resolve(nil);
break;
default:
Expand Down

0 comments on commit cd7a1e3

Please sign in to comment.