Skip to content
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.

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

Fix build issue with cocoapod and Xcode15 #156

Merged
merged 6 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
4608EE8E2BF5C1B800543095 /* ACRRatingInputRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4608EE8C2BF5C1B800543095 /* ACRRatingInputRenderer.mm */; };
4621E12C2BF3557C004F03F3 /* RatingLabel.h in Headers */ = {isa = PBXBuildFile; fileRef = 4621E12B2BF3557C004F03F3 /* RatingLabel.h */; };
4621E12E2BF35784004F03F3 /* RatingLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4621E12D2BF35784004F03F3 /* RatingLabel.cpp */; };
46F6F7812BFF1C8200D31C47 /* ValueChangedAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 46F6F7802BFF1C8200D31C47 /* ValueChangedAction.h */; };
46F6F7832BFF1CB400D31C47 /* ValueChangedAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F6F7822BFF1CB400D31C47 /* ValueChangedAction.cpp */; };
463C3C082BD8DB1F00A95C4E /* Icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463C3C062BD8DB1F00A95C4E /* Icon.cpp */; };
463C3C0B2BD8DCC000A95C4E /* Icon.h in Headers */ = {isa = PBXBuildFile; fileRef = 463C3C0A2BD8DCC000A95C4E /* Icon.h */; settings = {ATTRIBUTES = (Public, ); }; };
463C3C0E2BD8F6D100A95C4E /* ACRIconRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 463C3C0D2BD8F6D100A95C4E /* ACRIconRenderer.mm */; };
Expand All @@ -48,14 +46,16 @@
46445D872BF7242700831973 /* FluentAssets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 46445D862BF7242700831973 /* FluentAssets.xcassets */; };
46445D892BF72A5300831973 /* ACRRatingView.h in Headers */ = {isa = PBXBuildFile; fileRef = 46445D882BF72A5300831973 /* ACRRatingView.h */; };
46445D8B2BF7324100831973 /* ACRRatingView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46445D8A2BF7324100831973 /* ACRRatingView.mm */; };
468F1F182BFC5B3400C2F561 /* ACRRatingInputDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 468F1F172BFC5B3400C2F561 /* ACRRatingInputDataSource.h */; };
465352612C16FD9800DCEE25 /* ACRRatingInputDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 465352602C16FD9800DCEE25 /* ACRRatingInputDataSource.h */; };
468F1F1A2BFC5BC500C2F561 /* ACRRatingInputDataSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 468F1F192BFC5BC500C2F561 /* ACRRatingInputDataSource.mm */; };
46B329162BF32057009671AE /* RatingInput.h in Headers */ = {isa = PBXBuildFile; fileRef = 46B329152BF32057009671AE /* RatingInput.h */; };
46B329182BF3228F009671AE /* RatingInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46B329172BF3228F009671AE /* RatingInput.cpp */; };
46B78E642C0580D100EF4566 /* AdaptiveCardsRatingElementTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 46B78E632C0580D100EF4566 /* AdaptiveCardsRatingElementTests.mm */; };
46B78E662C0586D500EF4566 /* RatingInputValid.json in Resources */ = {isa = PBXBuildFile; fileRef = 46B78E652C0586D500EF4566 /* RatingInputValid.json */; };
46B78E682C0587B700EF4566 /* RatingLabelValid.json in Resources */ = {isa = PBXBuildFile; fileRef = 46B78E672C0587B700EF4566 /* RatingLabelValid.json */; };
46B78E6A2C058A8200EF4566 /* RatingInputInvalid.json in Resources */ = {isa = PBXBuildFile; fileRef = 46B78E692C058A8200EF4566 /* RatingInputInvalid.json */; };
46F6F7812BFF1C8200D31C47 /* ValueChangedAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 46F6F7802BFF1C8200D31C47 /* ValueChangedAction.h */; };
46F6F7832BFF1CB400D31C47 /* ValueChangedAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46F6F7822BFF1CB400D31C47 /* ValueChangedAction.cpp */; };
6B00E1162A3A58B30079D8A6 /* ACRTypeaheadSearchViewControllerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B00E1152A3A58B30079D8A6 /* ACRTypeaheadSearchViewControllerPrivate.h */; };
6B096D4E225431D0006CC034 /* ACRRichTextBlockRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B096D4C225431D0006CC034 /* ACRRichTextBlockRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; };
6B096D4F225431D0006CC034 /* ACRRichTextBlockRenderer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B096D4D225431D0006CC034 /* ACRRichTextBlockRenderer.mm */; };
Expand Down Expand Up @@ -127,8 +127,8 @@
6B8C765726449B09009548FA /* TableRow.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B8C764F26449B08009548FA /* TableRow.h */; settings = {ATTRIBUTES = (Public, ); }; };
6B8C765826449B09009548FA /* TableRow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6B8C765026449B08009548FA /* TableRow.cpp */; };
6B8C765926449B09009548FA /* TableCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B8C765126449B08009548FA /* TableCell.h */; settings = {ATTRIBUTES = (Public, ); }; };
6B8C766526461E98009548FA /* ACOBundle.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B8C766226461E97009548FA /* ACOBundle.m */; };
6B8C766626461E98009548FA /* ACRInputTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B8C766326461E98009548FA /* ACRInputTableView.m */; };
6B8C766526461E98009548FA /* ACOBundle.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B8C766226461E97009548FA /* ACOBundle.mm */; };
6B8C766626461E98009548FA /* ACRInputTableView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B8C766326461E98009548FA /* ACRInputTableView.mm */; };
6B8C766726461E98009548FA /* ACOBundle.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B8C766426461E98009548FA /* ACOBundle.h */; settings = {ATTRIBUTES = (Public, ); }; };
6B8C768226461F1A009548FA /* ACRButtonExpandable.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6B8C766926461F1A009548FA /* ACRButtonExpandable.xib */; };
6B8C768326461F1A009548FA /* ACRTextTelelphoneField.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6B8C766A26461F1A009548FA /* ACRTextTelelphoneField.xib */; };
Expand Down Expand Up @@ -544,8 +544,6 @@
4608EE8C2BF5C1B800543095 /* ACRRatingInputRenderer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ACRRatingInputRenderer.mm; sourceTree = "<group>"; };
4621E12B2BF3557C004F03F3 /* RatingLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RatingLabel.h; path = ../../../../shared/cpp/ObjectModel/RatingLabel.h; sourceTree = "<group>"; };
4621E12D2BF35784004F03F3 /* RatingLabel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RatingLabel.cpp; path = ../../../../shared/cpp/ObjectModel/RatingLabel.cpp; sourceTree = "<group>"; };
46F6F7802BFF1C8200D31C47 /* ValueChangedAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ValueChangedAction.h; path = ../../../../shared/cpp/ObjectModel/ValueChangedAction.h; sourceTree = "<group>"; };
46F6F7822BFF1CB400D31C47 /* ValueChangedAction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ValueChangedAction.cpp; path = ../../../../shared/cpp/ObjectModel/ValueChangedAction.cpp; sourceTree = "<group>"; };
463C3C062BD8DB1F00A95C4E /* Icon.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Icon.cpp; path = ../../../../shared/cpp/ObjectModel/Icon.cpp; sourceTree = "<group>"; };
463C3C0A2BD8DCC000A95C4E /* Icon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Icon.h; path = ../../../../shared/cpp/ObjectModel/Icon.h; sourceTree = "<group>"; };
463C3C0C2BD8F63100A95C4E /* ACRIconRenderer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ACRIconRenderer.h; sourceTree = "<group>"; };
Expand All @@ -557,14 +555,16 @@
46445D862BF7242700831973 /* FluentAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = FluentAssets.xcassets; sourceTree = "<group>"; };
46445D882BF72A5300831973 /* ACRRatingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ACRRatingView.h; sourceTree = "<group>"; };
46445D8A2BF7324100831973 /* ACRRatingView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ACRRatingView.mm; sourceTree = "<group>"; };
468F1F172BFC5B3400C2F561 /* ACRRatingInputDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ACRRatingInputDataSource.h; sourceTree = "<group>"; };
465352602C16FD9800DCEE25 /* ACRRatingInputDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ACRRatingInputDataSource.h; path = PrivateHeaders/ACRRatingInputDataSource.h; sourceTree = "<group>"; };
468F1F192BFC5BC500C2F561 /* ACRRatingInputDataSource.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ACRRatingInputDataSource.mm; sourceTree = "<group>"; };
46B329152BF32057009671AE /* RatingInput.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = RatingInput.h; path = ../../../../shared/cpp/ObjectModel/RatingInput.h; sourceTree = "<group>"; };
46B329172BF3228F009671AE /* RatingInput.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = RatingInput.cpp; path = ../../../../shared/cpp/ObjectModel/RatingInput.cpp; sourceTree = "<group>"; };
46B78E632C0580D100EF4566 /* AdaptiveCardsRatingElementTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AdaptiveCardsRatingElementTests.mm; sourceTree = "<group>"; };
46B78E652C0586D500EF4566 /* RatingInputValid.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = RatingInputValid.json; sourceTree = "<group>"; };
46B78E672C0587B700EF4566 /* RatingLabelValid.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = RatingLabelValid.json; sourceTree = "<group>"; };
46B78E692C058A8200EF4566 /* RatingInputInvalid.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = RatingInputInvalid.json; sourceTree = "<group>"; };
46F6F7802BFF1C8200D31C47 /* ValueChangedAction.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ValueChangedAction.h; path = ../../../../shared/cpp/ObjectModel/ValueChangedAction.h; sourceTree = "<group>"; };
46F6F7822BFF1CB400D31C47 /* ValueChangedAction.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ValueChangedAction.cpp; path = ../../../../shared/cpp/ObjectModel/ValueChangedAction.cpp; sourceTree = "<group>"; };
4B0881019D2B9BA6009F1B94 /* Pods-AdaptiveCards.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AdaptiveCards.release.xcconfig"; path = "Target Support Files/Pods-AdaptiveCards/Pods-AdaptiveCards.release.xcconfig"; sourceTree = "<group>"; };
6B00E1152A3A58B30079D8A6 /* ACRTypeaheadSearchViewControllerPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ACRTypeaheadSearchViewControllerPrivate.h; path = PrivateHeaders/ACRTypeaheadSearchViewControllerPrivate.h; sourceTree = "<group>"; };
6B096D4C225431D0006CC034 /* ACRRichTextBlockRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ACRRichTextBlockRenderer.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -639,8 +639,8 @@
6B8C764F26449B08009548FA /* TableRow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableRow.h; path = ../../../../shared/cpp/ObjectModel/TableRow.h; sourceTree = "<group>"; };
6B8C765026449B08009548FA /* TableRow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TableRow.cpp; path = ../../../../shared/cpp/ObjectModel/TableRow.cpp; sourceTree = "<group>"; };
6B8C765126449B08009548FA /* TableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TableCell.h; path = ../../../../shared/cpp/ObjectModel/TableCell.h; sourceTree = "<group>"; };
6B8C766226461E97009548FA /* ACOBundle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ACOBundle.m; sourceTree = "<group>"; };
6B8C766326461E98009548FA /* ACRInputTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ACRInputTableView.m; sourceTree = "<group>"; };
6B8C766226461E97009548FA /* ACOBundle.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ACOBundle.mm; sourceTree = "<group>"; };
6B8C766326461E98009548FA /* ACRInputTableView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ACRInputTableView.mm; sourceTree = "<group>"; };
6B8C766426461E98009548FA /* ACOBundle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ACOBundle.h; sourceTree = "<group>"; };
6B8C766926461F1A009548FA /* ACRButtonExpandable.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ACRButtonExpandable.xib; sourceTree = "<group>"; };
6B8C766A26461F1A009548FA /* ACRTextTelelphoneField.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ACRTextTelelphoneField.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1193,7 +1193,7 @@
F4F44B882048F82F00A2F24C /* ACOBaseCardElement.mm */,
6BFF23DD2714C0EF00183C59 /* ACOBaseCardElementPrivate.h */,
6B8C766426461E98009548FA /* ACOBundle.h */,
6B8C766226461E97009548FA /* ACOBundle.m */,
6B8C766226461E97009548FA /* ACOBundle.mm */,
6B25D3E126138E3600A47AFB /* ACOEnums.h */,
F431103F1F357487001AAE30 /* ACOHostConfig.h */,
F43110401F357487001AAE30 /* ACOHostConfig.mm */,
Expand Down Expand Up @@ -1633,7 +1633,7 @@
6B27CD6524BD52D600C0F90F /* ACRInputLabelView.mm */,
6BFF23DE2714C0EF00183C59 /* ACRInputLabelViewPrivate.h */,
F431103D1F357487001AAE30 /* ACRInputTableView.h */,
6B8C766326461E98009548FA /* ACRInputTableView.m */,
6B8C766326461E98009548FA /* ACRInputTableView.mm */,
F42979451F322C9000E89914 /* ACRNumericTextField.h */,
F42979441F322C9000E89914 /* ACRNumericTextField.mm */,
6BF4307D219129600068E432 /* ACRQuickReplyMultilineView.h */,
Expand All @@ -1648,7 +1648,7 @@
6B9AB30F20DD82A2005C8E15 /* ACRTextView.mm */,
6BFF24052714E26900183C59 /* ACRToggleInputDataSource.h */,
6B9BDF7120E1BD0E00F13155 /* ACRToggleInputDataSource.mm */,
468F1F172BFC5B3400C2F561 /* ACRRatingInputDataSource.h */,
465352602C16FD9800DCEE25 /* ACRRatingInputDataSource.h */,
468F1F192BFC5BC500C2F561 /* ACRRatingInputDataSource.mm */,
46445D882BF72A5300831973 /* ACRRatingView.h */,
46445D8A2BF7324100831973 /* ACRRatingView.mm */,
Expand Down Expand Up @@ -1854,6 +1854,7 @@
F4F44B9D204A16BC00A2F24C /* ACRTextBlockRenderer.h in Headers */,
F4F44B9C204A169D00A2F24C /* ACRErrors.h in Headers */,
F4F44B9A204A164100A2F24C /* ACRInputToggleRenderer.h in Headers */,
465352612C16FD9800DCEE25 /* ACRRatingInputDataSource.h in Headers */,
F4F44B99204A162900A2F24C /* ACRInputTimeRenderer.h in Headers */,
F4F44B9B204A165F00A2F24C /* ACRIBaseInputHandler.h in Headers */,
F4F44B93204A155B00A2F24C /* ACRFactSetRenderer.h in Headers */,
Expand Down Expand Up @@ -1984,7 +1985,6 @@
6B8C765726449B09009548FA /* TableRow.h in Headers */,
6B25D3E226138E3700A47AFB /* ACOEnums.h in Headers */,
6B25D3EB2613D83700A47AFB /* ACORenderContext.h in Headers */,
468F1F182BFC5B3400C2F561 /* ACRRatingInputDataSource.h in Headers */,
6BFF23F02714C0F000183C59 /* ACRViewPrivate.h in Headers */,
6BFF23F12714C0F000183C59 /* ACOAuthenticationPrivate.h in Headers */,
6BFF23EF2714C0F000183C59 /* ACRInputLabelViewPrivate.h in Headers */,
Expand Down Expand Up @@ -2340,7 +2340,7 @@
6B8C765826449B09009548FA /* TableRow.cpp in Sources */,
6BD025EE254784670009B019 /* ACOInputResults.mm in Sources */,
6BFF99CB25FFF53E0028069F /* TokenExchangeResource.cpp in Sources */,
6B8C766526461E98009548FA /* ACOBundle.m in Sources */,
6B8C766526461E98009548FA /* ACOBundle.mm in Sources */,
F495FC0E2022AC920093D4DE /* ACRChoiceSetViewDataSourceCompactStyle.mm in Sources */,
F4F44B7D20478C5C00A2F24C /* DateTimePreparser.cpp in Sources */,
F4F44BA0204CED2400A2F24C /* ACRCustomRenderer.mm in Sources */,
Expand Down Expand Up @@ -2385,7 +2385,7 @@
46B329182BF3228F009671AE /* RatingInput.cpp in Sources */,
F4CAE77B1F7325DF00545555 /* Separator.cpp in Sources */,
F448731F1EE2261F00FCAFAE /* ShowCardAction.cpp in Sources */,
6B8C766626461E98009548FA /* ACRInputTableView.m in Sources */,
6B8C766626461E98009548FA /* ACRInputTableView.mm in Sources */,
F4C1F5DE1F218F920018CB78 /* ACRInputNumberRenderer.mm in Sources */,
F448731A1EE2261F00FCAFAE /* OpenUrlAction.cpp in Sources */,
F4CAE7831F75AB9000545555 /* ACOAdaptiveCard.mm in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion source/ios/tools/AdaptiveCards.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Pod::Spec.new do |spec|
sspec.resource_bundles = {'AdaptiveCards' => ['source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/Resources/**/*']}
sspec.dependency 'AdaptiveCards/AdaptiveCardsPrivate'
sspec.dependency 'AdaptiveCards/ObjectModel'
sspec.dependency 'SVGKit', '>= 3.0.0'
end

spec.subspec 'ObjectModel' do | sspec |
Expand All @@ -41,7 +42,6 @@ Pod::Spec.new do |spec|
spec.subspec 'UIProviders' do | sspec |
sspec.dependency 'MicrosoftFluentUI/Tooltip_ios', '~> 0.3.6'
sspec.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'ADAPTIVECARDS_USE_FLUENT_TOOLTIPS=1' }
sspec.dependency 'SVGKit', '~> 3.0.0'
end

spec.platform = :ios, '14'
Expand Down