Skip to content

Commit dd78f97

Browse files
author
Zdravko
authored
Merge pull request #148 from NativeScript/hristova/set-podfile-version
fix: set share kit sdk version
2 parents 315e38b + acee3cb commit dd78f97

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ matrix:
2525
language: node_js
2626
node_js: "8"
2727
jdk: oraclejdk8
28+
before_script: pod repo update
2829
script: cd src && npm run build.iosOnly && cd ../demo && npm i && tns build ios --env.uglify && cd ../demo-angular && npm i && tns build ios --env.uglify --env.aot
2930
- language: android
3031
os: linux
@@ -52,6 +53,7 @@ matrix:
5253
language: node_js
5354
node_js: "8"
5455
jdk: oraclejdk8
56+
before_script: pod repo update
5557
script:
5658
- cd demo && npm run ci.ios.build && cd ../demo-angular && npm run ci.ios.build
5759
- cd $IOS_PACKAGE_FOLDER && zip -r $IOS_PACKAGE demo.app

src/platforms/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pod 'FBSDKCoreKit', '~> 4.7'
22
pod 'FBSDKLoginKit', '~> 4.7'
3-
pod 'FBSDKShareKit', '~> 4.7'
3+
pod 'FBSDKShareKit', '~> 4.39.1'

src/platforms/ios/typings/objc!FBSDKShareKit.d.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -217,14 +217,14 @@ declare class FBSDKAppInviteDialog extends NSObject {
217217

218218
static showWithContentDelegate(content: FBSDKAppInviteContent, delegate: FBSDKAppInviteDialogDelegate): FBSDKAppInviteDialog;
219219

220+
readonly canShow: boolean;
221+
220222
content: FBSDKAppInviteContent;
221223

222224
delegate: FBSDKAppInviteDialogDelegate;
223225

224226
fromViewController: UIViewController;
225227

226-
canShow(): boolean;
227-
228228
show(): boolean;
229229

230230
validateWithError(): boolean;
@@ -455,14 +455,14 @@ declare class FBSDKGameRequestDialog extends NSObject {
455455

456456
static showWithContentDelegate(content: FBSDKGameRequestContent, delegate: FBSDKGameRequestDialogDelegate): FBSDKGameRequestDialog;
457457

458+
readonly canShow: boolean;
459+
458460
content: FBSDKGameRequestContent;
459461

460462
delegate: FBSDKGameRequestDialogDelegate;
461463

462464
frictionlessRequestsEnabled: boolean;
463465

464-
canShow(): boolean;
465-
466466
show(): boolean;
467467

468468
validateWithError(): boolean;
@@ -734,6 +734,8 @@ declare class FBSDKMessageDialog extends NSObject implements FBSDKSharingDialog
734734

735735
static showWithContentDelegate(content: FBSDKSharingContent, delegate: FBSDKSharingDelegate): FBSDKMessageDialog;
736736

737+
readonly canShow: boolean; // inherited from FBSDKSharingDialog
738+
737739
readonly debugDescription: string; // inherited from NSObjectProtocol
738740

739741
delegate: FBSDKSharingDelegate; // inherited from FBSDKSharing
@@ -752,8 +754,6 @@ declare class FBSDKMessageDialog extends NSObject implements FBSDKSharingDialog
752754

753755
readonly // inherited from NSObjectProtocol
754756

755-
canShow(): boolean;
756-
757757
class(): typeof NSObject;
758758

759759
conformsToProtocol(aProtocol: any /* Protocol */): boolean;
@@ -848,6 +848,8 @@ declare class FBSDKShareAPI extends NSObject implements FBSDKSharing {
848848

849849
accessToken: FBSDKAccessToken;
850850

851+
readonly canShare: boolean;
852+
851853
graphNode: string;
852854

853855
message: string;
@@ -870,8 +872,6 @@ declare class FBSDKShareAPI extends NSObject implements FBSDKSharing {
870872

871873
readonly // inherited from NSObjectProtocol
872874

873-
canShare(): boolean;
874-
875875
class(): typeof NSObject;
876876

877877
conformsToProtocol(aProtocol: any /* Protocol */): boolean;
@@ -1068,6 +1068,8 @@ declare class FBSDKShareDialog extends NSObject implements FBSDKSharingDialog {
10681068

10691069
mode: FBSDKShareDialogMode;
10701070

1071+
readonly canShow: boolean; // inherited from FBSDKSharingDialog
1072+
10711073
readonly debugDescription: string; // inherited from NSObjectProtocol
10721074

10731075
delegate: FBSDKSharingDelegate; // inherited from FBSDKSharing
@@ -1086,8 +1088,6 @@ declare class FBSDKShareDialog extends NSObject implements FBSDKSharingDialog {
10861088

10871089
readonly // inherited from NSObjectProtocol
10881090

1089-
canShow(): boolean;
1090-
10911091
class(): typeof NSObject;
10921092

10931093
conformsToProtocol(aProtocol: any /* Protocol */): boolean;
@@ -2422,7 +2422,7 @@ declare var FBSDKSharingDelegate: {
24222422

24232423
interface FBSDKSharingDialog extends FBSDKSharing {
24242424

2425-
canShow(): boolean;
2425+
canShow: boolean;
24262426

24272427
show(): boolean;
24282428
}

src/share-manager.ios.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export function canShareDialogShow(content: any): boolean {
150150
if (content) {
151151
const dialog = getShareDialog();
152152
getShareDialog().shareContent = content;
153-
return dialog.canShow();
153+
return dialog.canShow;
154154
}
155155
return false;
156156
}
@@ -169,7 +169,7 @@ export function canMessageDialogShow(content: any): boolean {
169169
if (content) {
170170
const dialog = getMessageDialog();
171171
getMessageDialog().shareContent = content;
172-
return dialog.canShow();
172+
return dialog.canShow;
173173
}
174174
return false;
175175
}

0 commit comments

Comments
 (0)