Skip to content

Added App extension to podspec #6849

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.

Sign up for GitHub

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

Merged
merged 7 commits into from
Dec 14, 2021
Merged

Added App extension to podspec #6849

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97d1b8b
app extension model added
jwoo-msft Dec 13, 2021
10c6552
updated podspec
jwoo-msft Dec 14, 2021
95ddaff
[ios] Updated to final podspec version
jwoo-msft Dec 14, 2021
0f01da3
update compiler flag
jwoo-msft Dec 14, 2021
aeaa2a1
pod spec update
jwoo-msft Dec 14, 2021
1b13282
updated flag name
jwoo-msft Dec 14, 2021
6d1051e
Merge branch 'main' into jwoo/ios-fluent-ui-sep
jwoo-msft Dec 14, 2021
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
4 changes: 3 additions & 1 deletion source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,9 +1261,9 @@
F423C0B71EE1FBA900905679 /* AdaptiveCards */ = {
isa = PBXGroup;
children = (
F42979331F30079D00E89914 /* Actions */,
6BFF24152714FA1D00183C59 /* AdaptiveCards.h */,
F423C0B91EE1FBAA00905679 /* Info.plist */,
F42979331F30079D00E89914 /* Actions */,
F42979321F30074900E89914 /* Inputs */,
F42979351F3007DF00E89914 /* Layouts */,
F42979341F3007C500E89914 /* ReadOnlyObjects */,
Expand Down Expand Up @@ -2278,6 +2278,7 @@
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
"ADAPTIVECARDS_APP_EXTENSION=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
Expand Down Expand Up @@ -2336,6 +2337,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = "ADAPTIVECARDS_APP_EXTENSION=1";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand Down
6 changes: 5 additions & 1 deletion source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRBaseTarget.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
//

#import "ACRBaseTarget.h"
#import <FluentUI/FluentUI-Swift.h>
#import <UIKit/UIKit.h>
#if defined(ADAPTIVECARDS_APP_EXTENSION)
#import <FluentUI/FluentUI-Swift.h>
#endif

@implementation ACRBaseTarget {
NSString *_toolTip;
Expand Down Expand Up @@ -35,9 +37,11 @@ - (void)setTooltip:(UIView *)view toolTipText:(NSString *)toolTipText

- (void)showToolTip:(UILongPressGestureRecognizer *)recognizer
{
#if defined(ADAPTIVECARDS_APP_EXTENSION)
if (recognizer.state == UIGestureRecognizerStateBegan && _toolTip && recognizer.view) {
[MSFTooltip.shared showWith:_toolTip for:recognizer.view preferredArrowDirection:MSFTooltipArrowDirectionUp offset:CGPointZero screenMargins:MSFTooltip.defaultScreenMargins dismissOn:MSFTooltipDismissModeTapAnywhere onTap:nil];
}
#endif
}

@end
31 changes: 19 additions & 12 deletions source/ios/tools/AdaptiveCards.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@

Pod::Spec.new do |spec|
spec.name = 'AdaptiveCards'

spec.version = '2.8.2'
spec.version = '2.8.3'

spec.license = { :type => 'Adaptive Cards Binary EULA', :file => 'source/EULA-Non-Windows.txt' }

spec.homepage = 'https://adaptivecards.io'

spec.authors = { 'AdaptiveCards' => '[email protected]' }

spec.summary = 'Adaptive Cards are a new way for developers to exchange card content in a common and consistent way'

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

spec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.{h,m,mm}'
spec.default_subspecs = 'AdaptiveCardsCore', 'AdaptiveCardsPrivate', 'ObjectModel', 'UIProviders'

spec.subspec 'AdaptiveCardsCore' do | sspec |
sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.{h,m,mm}'
sspec.dependency 'AdaptiveCards/AdaptiveCardsPrivate'
sspec.dependency 'AdaptiveCards/ObjectModel'
end

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

spec.subspec 'AdaptiveCardsPrivate' do | sspec |
sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/**/*.{h,m,mm}'
sspec.header_mappings_dir = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/'
sspec.private_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
end

spec.subspec 'UIProviders' do | sspec |
sspec.dependency 'MicrosoftFluentUI/Tooltip_ios', '~> 0.3.6'
sspec.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'ADAPTIVECARDS_APP_EXTENSION=1' }
end

spec.platform = :ios, '14'

spec.frameworks = 'AVFoundation', 'AVKit', 'CoreGraphics', 'QuartzCore', 'UIKit'

spec.public_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.h'

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

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

spec.dependency 'MicrosoftFluentUI', '~> 0.3.6'
end