Skip to content

Commit dd3a3ae

Browse files
author
Olga Danylova
authored
Merge pull request #188 from olgadanylova/master
BackendlessPushHelper added to mac target
2 parents 3a432a5 + 0ea7f2f commit dd3a3ae

File tree

13 files changed

+71
-174
lines changed

13 files changed

+71
-174
lines changed

‎Pods/Backendless-osx-SDK.podspec‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Pods/Backendless.podspec‎

Lines changed: 16 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SDK/backendlessAPI/Classes/Backendless.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#import "Channel.h"
5454
#import "DeviceRegistration.h"
5555
#import "MessagingService.h"
56-
#import "BackendlessPushHelper.h"
5756
#import "FileService.h"
5857
#import "BackendlessFile.h"
5958
#import "CustomService.h"
@@ -73,6 +72,10 @@
7372
#import "SharedObject.h"
7473
#import "RTService.h"
7574

75+
#if TARGET_OS_IOS || TARGET_OS_SIMULATOR
76+
#import "BackendlessPushHelper.h"
77+
#endif
78+
7679
//Cache
7780
#import "BackendlessCachePolicy.h"
7881
#import "AbstractQuery.h"

‎SDK/backendlessAPI/Classes/Messaging/BackendlessPushHelper.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ +(void)processMutableContent:(UNNotificationRequest *_Nonnull)request withConten
2828
UNMutableNotificationContent *bestAttemptContent = [request.content mutableCopy];
2929
if ([request.content.userInfo valueForKey:@"attachment-url"]) {
3030
NSString *urlString = [request.content.userInfo valueForKey:@"attachment-url"];
31-
NSURL *fileUrl = [NSURL URLWithString:urlString];
31+
NSURL *fileUrl = [NSURL URLWithString:urlString];
3232
[[[NSURLSession sharedSession] downloadTaskWithURL:fileUrl
3333
completionHandler:^(NSURL *location, NSURLResponse *response, NSError *error) {
3434
if (location) {

‎SDK/backendlessAPI/backendlessAPI.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
10-
D3CF37E41A387DEB0070B746 /* backendless-dev-fat */ = {
11-
isa = PBXAggregateTarget;
12-
buildConfigurationList = D3CF37E61A387DEB0070B746 /* Build configuration list for PBXAggregateTarget "backendless-dev-fat" */;
13-
buildPhases = (
14-
D3CF37E51A387DEB0070B746 /* Run Script */,
15-
);
16-
dependencies = (
17-
);
18-
name = "backendless-dev-fat";
19-
productName = "backendless-fat";
20-
};
2110
F9796A6F166CD49A00595F5E /* backendless-fat */ = {
2211
isa = PBXAggregateTarget;
2312
buildConfigurationList = F9796A70166CD49A00595F5E /* Build configuration list for PBXAggregateTarget "backendless-fat" */;
@@ -1670,6 +1659,8 @@
16701659
5A95F1FC202B3D60000D6EA5 /* MapAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A95F1F2202B3D60000D6EA5 /* MapAdapter.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
16711660
5A9E9A6C1FA769FB001BB2BE /* EventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A8A15801FA0D3C3009A1394 /* EventHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
16721661
5AA8FF1B1FCD945700F36C6D /* UserService.m in Sources */ = {isa = PBXBuildFile; fileRef = F91B480515FF5AC500012DFC /* UserService.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
1662+
5AAC6CBD20C92D3D0094C4E4 /* BackendlessPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A633F401F7BB7F6004D7ACA /* BackendlessPushHelper.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
1663+
5AAC6CBE20C92D480094C4E4 /* BackendlessPushHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 5A633F3F1F7BB7F6004D7ACA /* BackendlessPushHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
16731664
5AB0CA9A1FB490A400C21766 /* RTMessaging.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F38501FB317EB002F21D4 /* RTMessaging.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
16741665
5ABF776A1FB4AD00006299F7 /* RTListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F384F1FB317EB002F21D4 /* RTListener.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
16751666
5ABF776D1FB4AD46006299F7 /* RTSubscription.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A5F38551FB317EB002F21D4 /* RTSubscription.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
@@ -4275,6 +4266,7 @@
42754266
1C7BB5051A2E092900D3C2C1 /* BackendlessCacheProtocol.h in Headers */,
42764267
1C7BB5061A2E092900D3C2C1 /* QueryOptions.h in Headers */,
42774268
5A1052CF20063B580036A784 /* JSONHelper.h in Headers */,
4269+
5AAC6CBE20C92D480094C4E4 /* BackendlessPushHelper.h in Headers */,
42784270
5EC159592099B3360095BA74 /* PublishMessageInfo.h in Headers */,
42794271
5AF2B7281EB2136300D54442 /* MessagingService.h in Headers */,
42804272
);
@@ -5470,7 +5462,6 @@
54705462
F9796A27166CD3A400595F5E /* backendless-device */,
54715463
F9F0AE801CDBCA3900035C62 /* bkndlss-simulator */,
54725464
F9F0AF3A1CDBCAB500035C62 /* bkndlss-device */,
5473-
D3CF37E41A387DEB0070B746 /* backendless-dev-fat */,
54745465
);
54755466
};
54765467
/* End PBXProject section */
@@ -5607,20 +5598,6 @@
56075598
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";
56085599
showEnvVarsInLog = 0;
56095600
};
5610-
D3CF37E51A387DEB0070B746 /* Run Script */ = {
5611-
isa = PBXShellScriptBuildPhase;
5612-
buildActionMask = 2147483647;
5613-
files = (
5614-
);
5615-
inputPaths = (
5616-
);
5617-
name = "Run Script";
5618-
outputPaths = (
5619-
);
5620-
runOnlyForDeploymentPostprocessing = 0;
5621-
shellPath = /bin/sh;
5622-
shellScript = "\n# -- THIS IS THE DEVELOPMENT SCHEME - YOU SHOULD USE BACKENDLESS-FAT SCHEME TO BUILD BACKENDLESS LIBS\n\n# --------------------------- BUILD -----------------------------------------------------\n\n# -- ios\nrm -rf ${SRCROOT}/../ios/backendless\nmkdir ${SRCROOT}/../ios/backendless\nmkdir ${SRCROOT}/../ios/backendless/include\n\nxcodebuild -workspace ${SRCROOT}/../backendless.xcworkspace -scheme bkndlss-simulator TEST_AFTER_BUILD=NO clean build -sdk iphonesimulator -arch \"x86_64\" -arch \"i386\" OTHER_CFLAGS=\"-fembed-bitcode\"\nxcodebuild -workspace ${SRCROOT}/../backendless.xcworkspace -scheme bkndlss-device TEST_AFTER_BUILD=NO clean build -sdk iphoneos OTHER_CFLAGS=\"-fembed-bitcode\"\n\nlipo -create \"${SRCROOT}/../ios/backendless/libbkndlss-simulator.a\" \\\n\"${SRCROOT}/../ios/backendless/libbkndlss-device.a\" -output \\\n\"${SRCROOT}/../ios/backendless/backendless.a\"\n\nrm -rf ${SRCROOT}/../ios/backendless/libbkndlss-simulator.a\nrm -rf ${SRCROOT}/../ios/backendless/libbkndlss-device.a\n\n# -- lib\nrm -rf ${SRCROOT}/../lib/backendless\nmkdir ${SRCROOT}/../lib/backendless\nmkdir ${SRCROOT}/../lib/backendless/include\n\nxcodebuild -workspace ${SRCROOT}/../backendless.xcworkspace -scheme backendless-simulator TEST_AFTER_BUILD=NO clean build -sdk iphonesimulator -arch \"x86_64\" -arch \"i386\" OTHER_CFLAGS=\"-fembed-bitcode\"\nxcodebuild -workspace ${SRCROOT}/../backendless.xcworkspace -scheme backendless-device TEST_AFTER_BUILD=NO clean build -sdk iphoneos OTHER_CFLAGS=\"-fembed-bitcode\" \n\nlipo -create \"${SRCROOT}/../lib/backendless/libbackendless-simulator.a\" \\\n\"${SRCROOT}/../lib/backendless/libbackendless-device.a\" -output \\\n\"${SRCROOT}/../lib/backendless/backendless.a\"\n\nrm -rf ${SRCROOT}/../lib/backendless/libbackendless-simulator.a\nrm -rf ${SRCROOT}/../lib/backendless/libbackendless-device.a\n\n# -- osx\nrm -rf ${SRCROOT}/../osx/backendless\nmkdir ${SRCROOT}/../osx/backendless\nmkdir ${SRCROOT}/../osx/backendless/include\n\nxcodebuild -workspace ${SRCROOT}/../backendless.xcworkspace -scheme backendless-mac TEST_AFTER_BUILD=NO clean build\n\n# ---------------------------- MAKE THE COPIES ---------------------------------------\n\n#cp -rf ${SRCROOT}/../lib/backendless/* ${SRCROOT}/../../../iOS-Samples/lib/backendless\n#cp -rf ${SRCROOT}/../osx/backendless/* ${SRCROOT}/../../../iOS-Samples/osx/backendless\n \n#cp -rf ${SRCROOT}/../lib/backendless/* ~/backendless.gitlab/src/client/tests/ios/TCTestSDK/lib/backendless\n\n#cp -rf ${SRCROOT}/../lib/backendless/* ${SRCROOT}/../../../BlogFeatureDay/lib/backendless\n \n#cp -rf ${SRCROOT}/../lib/backendless/* ${SRCROOT}/../../../SamplesForDoc/lib/backendless\n\n# -------------------------- !!!!! TEMP TESTING COPIES !!!!! --------------------------\n\n#cp -rf ${SRCROOT}/../ios/backendless/* ${SRCROOT}/../../../Backendless4-Samples/B4UserService/Pods/Backendless/SDK/ios/backendless\n \n#cp -rf ${SRCROOT}/../ios/backendless/* ${SRCROOT}/../../../Backendless4-Samples/B4EasyLogin/Pods/Backendless/SDK/ios/backendless\n \n#cp -rf ${SRCROOT}/../ios/backendless/* ${SRCROOT}/../../../TestPushNotify/Pods/Backendless/SDK/ios/backendless\n \n#cp -rf ${SRCROOT}/../ios/backendless/* ${SRCROOT}/../../../TestEasyLogin/Pods/Backendless/SDK/ios/backendless\n\n#----------------------------------------------------------------------------------------\n";
5623-
};
56245601
F9796A73166CD4F800595F5E /* ShellScript */ = {
56255602
isa = PBXShellScriptBuildPhase;
56265603
buildActionMask = 12;
@@ -5667,6 +5644,7 @@
56675644
isa = PBXSourcesBuildPhase;
56685645
buildActionMask = 2147483647;
56695646
files = (
5647+
5AAC6CBD20C92D3D0094C4E4 /* BackendlessPushHelper.m in Sources */,
56705648
5EC159582099B32E0095BA74 /* PublishMessageInfo.m in Sources */,
56715649
5A549840200795010042234F /* SharedObjectService.m in Sources */,
56725650
5A54983F200794FD0042234F /* SharedObjectChanges.m in Sources */,
@@ -6826,32 +6804,6 @@
68266804
};
68276805
name = Release;
68286806
};
6829-
D3CF37E71A387DEB0070B746 /* Debug */ = {
6830-
isa = XCBuildConfiguration;
6831-
buildSettings = {
6832-
CLANG_ENABLE_OBJC_WEAK = YES;
6833-
CODE_SIGN_IDENTITY = "iPhone Developer";
6834-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
6835-
ONLY_ACTIVE_ARCH = NO;
6836-
PRODUCT_NAME = "backendless-fat-and-copy copy";
6837-
PROVISIONING_PROFILE = "";
6838-
VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64";
6839-
};
6840-
name = Debug;
6841-
};
6842-
D3CF37E81A387DEB0070B746 /* Release */ = {
6843-
isa = XCBuildConfiguration;
6844-
buildSettings = {
6845-
CLANG_ENABLE_OBJC_WEAK = YES;
6846-
CODE_SIGN_IDENTITY = "iPhone Developer";
6847-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
6848-
ONLY_ACTIVE_ARCH = NO;
6849-
PRODUCT_NAME = "backendless-fat-and-copy copy";
6850-
PROVISIONING_PROFILE = "";
6851-
VALID_ARCHS = "i386 x86_64 armv7 armv7s arm64";
6852-
};
6853-
name = Release;
6854-
};
68556807
F9042B2215FDD8D300C9381A /* Debug */ = {
68566808
isa = XCBuildConfiguration;
68576809
buildSettings = {
@@ -7226,15 +7178,6 @@
72267178
defaultConfigurationIsVisible = 0;
72277179
defaultConfigurationName = Release;
72287180
};
7229-
D3CF37E61A387DEB0070B746 /* Build configuration list for PBXAggregateTarget "backendless-dev-fat" */ = {
7230-
isa = XCConfigurationList;
7231-
buildConfigurations = (
7232-
D3CF37E71A387DEB0070B746 /* Debug */,
7233-
D3CF37E81A387DEB0070B746 /* Release */,
7234-
);
7235-
defaultConfigurationIsVisible = 0;
7236-
defaultConfigurationName = Release;
7237-
};
72387181
F9042AFD15FDD8D300C9381A /* Build configuration list for PBXProject "backendlessAPI" */ = {
72397182
isa = XCConfigurationList;
72407183
buildConfigurations = (

‎SDK/backendlessAPI/backendlessAPI.xcodeproj/xcshareddata/xcschemes/backendless-dev-fat.xcscheme‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎SDK/ios/backendless/backendless.a‎

1.3 KB
Binary file not shown.

‎SDK/ios/backendless/include/Backendless.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#import "Channel.h"
5454
#import "DeviceRegistration.h"
5555
#import "MessagingService.h"
56-
#import "BackendlessPushHelper.h"
5756
#import "FileService.h"
5857
#import "BackendlessFile.h"
5958
#import "CustomService.h"
@@ -73,6 +72,10 @@
7372
#import "SharedObject.h"
7473
#import "RTService.h"
7574

75+
#if TARGET_OS_IOS || TARGET_OS_SIMULATOR
76+
#import "BackendlessPushHelper.h"
77+
#endif
78+
7679
//Cache
7780
#import "BackendlessCachePolicy.h"
7881
#import "AbstractQuery.h"

‎SDK/lib/backendless/backendless.a‎

1.42 KB
Binary file not shown.

‎SDK/lib/backendless/include/Backendless.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#import "Channel.h"
5454
#import "DeviceRegistration.h"
5555
#import "MessagingService.h"
56-
#import "BackendlessPushHelper.h"
5756
#import "FileService.h"
5857
#import "BackendlessFile.h"
5958
#import "CustomService.h"
@@ -73,6 +72,10 @@
7372
#import "SharedObject.h"
7473
#import "RTService.h"
7574

75+
#if TARGET_OS_IOS || TARGET_OS_SIMULATOR
76+
#import "BackendlessPushHelper.h"
77+
#endif
78+
7679
//Cache
7780
#import "BackendlessCachePolicy.h"
7881
#import "AbstractQuery.h"

0 commit comments

Comments
 (0)