Skip to content

Commit 54555f7

Browse files
jwoo-msftmichaelfarnsworth
authored andcommitted
Added App extension to podspec (microsoft#6849)
* app extension model added updated spec added podspec at root for testing\n revert it spec updated updated pod spec pod spec update moretesting [updated macro name] * updated podspec * [ios] Updated to final podspec version * update compiler flag * pod spec update * updated flag name
1 parent 140c0d8 commit 54555f7

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,9 +1261,9 @@
12611261
F423C0B71EE1FBA900905679 /* AdaptiveCards */ = {
12621262
isa = PBXGroup;
12631263
children = (
1264+
F42979331F30079D00E89914 /* Actions */,
12641265
6BFF24152714FA1D00183C59 /* AdaptiveCards.h */,
12651266
F423C0B91EE1FBAA00905679 /* Info.plist */,
1266-
F42979331F30079D00E89914 /* Actions */,
12671267
F42979321F30074900E89914 /* Inputs */,
12681268
F42979351F3007DF00E89914 /* Layouts */,
12691269
F42979341F3007C500E89914 /* ReadOnlyObjects */,
@@ -2278,6 +2278,7 @@
22782278
GCC_PREPROCESSOR_DEFINITIONS = (
22792279
"DEBUG=1",
22802280
"$(inherited)",
2281+
"ADAPTIVECARDS_USE_FLUENT_TOOLTIPS=1",
22812282
);
22822283
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
22832284
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -2336,6 +2337,7 @@
23362337
ENABLE_STRICT_OBJC_MSGSEND = YES;
23372338
GCC_C_LANGUAGE_STANDARD = gnu99;
23382339
GCC_NO_COMMON_BLOCKS = YES;
2340+
GCC_PREPROCESSOR_DEFINITIONS = "ADAPTIVECARDS_USE_FLUENT_TOOLTIPS=1";
23392341
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
23402342
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
23412343
GCC_WARN_UNDECLARED_SELECTOR = YES;

source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRBaseTarget.mm

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
//
77

88
#import "ACRBaseTarget.h"
9-
#import <FluentUI/FluentUI-Swift.h>
109
#import <UIKit/UIKit.h>
10+
#if defined(ADAPTIVECARDS_USE_FLUENT_TOOLTIPS)
11+
#import <FluentUI/FluentUI-Swift.h>
12+
#endif
1113

1214
@implementation ACRBaseTarget {
1315
NSString *_toolTip;
@@ -35,9 +37,11 @@ - (void)setTooltip:(UIView *)view toolTipText:(NSString *)toolTipText
3537

3638
- (void)showToolTip:(UILongPressGestureRecognizer *)recognizer
3739
{
40+
#if defined(ADAPTIVECARDS_USE_FLUENT_TOOLTIPS)
3841
if (recognizer.state == UIGestureRecognizerStateBegan && _toolTip && recognizer.view) {
3942
[MSFTooltip.shared showWith:_toolTip for:recognizer.view preferredArrowDirection:MSFTooltipArrowDirectionUp offset:CGPointZero screenMargins:MSFTooltip.defaultScreenMargins dismissOn:MSFTooltipDismissModeTapAnywhere onTap:nil];
4043
}
44+
#endif
4145
}
4246

4347
@end
Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
21
Pod::Spec.new do |spec|
32
spec.name = 'AdaptiveCards'
43

5-
spec.version = '2.8.2'
6-
4+
spec.version = '2.8.3'
5+
76
spec.license = { :type => 'Adaptive Cards Binary EULA', :file => 'source/EULA-Non-Windows.txt' }
8-
7+
98
spec.homepage = 'https://adaptivecards.io'
10-
9+
1110
spec.authors = { 'AdaptiveCards' => 'Joseph.Woo@microsoft.com' }
12-
11+
1312
spec.summary = 'Adaptive Cards are a new way for developers to exchange card content in a common and consistent way'
1413

15-
spec.source = { :git => 'https://github.com/microsoft/AdaptiveCards.git', :tag => 'ios-v2.8.2' }
14+
spec.source = { :git => 'https://github.com/microsoft/AdaptiveCards.git', :tag => 'ios-v2.8.3' }
1615

17-
spec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.{h,m,mm}'
16+
spec.default_subspecs = 'AdaptiveCardsCore', 'AdaptiveCardsPrivate', 'ObjectModel', 'UIProviders'
17+
18+
spec.subspec 'AdaptiveCardsCore' do | sspec |
19+
sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.{h,m,mm}'
20+
sspec.dependency 'AdaptiveCards/AdaptiveCardsPrivate'
21+
sspec.dependency 'AdaptiveCards/ObjectModel'
22+
end
1823

1924
spec.subspec 'ObjectModel' do | sspec |
2025
sspec.source_files = 'source/shared/cpp/ObjectModel/**/*.{h,cpp}'
@@ -27,21 +32,23 @@ Pod::Spec.new do |spec|
2732
end
2833

2934
spec.subspec 'AdaptiveCardsPrivate' do | sspec |
30-
sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
35+
sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/**/*.{h,m,mm}'
3136
sspec.header_mappings_dir = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/'
3237
sspec.private_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
3338
end
3439

40+
spec.subspec 'UIProviders' do | sspec |
41+
sspec.dependency 'MicrosoftFluentUI/Tooltip_ios', '~> 0.3.6'
42+
sspec.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'ADAPTIVECARDS_USE_FLUENT_TOOLTIPS=1' }
43+
end
44+
3545
spec.platform = :ios, '14'
3646

3747
spec.frameworks = 'AVFoundation', 'AVKit', 'CoreGraphics', 'QuartzCore', 'UIKit'
38-
39-
spec.public_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.h'
4048

4149
spec.resource_bundles = {'AdaptiveCards' => ['source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/Resources/**/*']}
4250

4351
spec.exclude_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/include/**/*'
4452

45-
spec.dependency 'MicrosoftFluentUI', '~> 0.3.6'
4653
end
4754

0 commit comments

Comments
 (0)