Source form distribution in cocoapods (#6795)

janusbal · Janus Balatbat · jwoo-msft · commit f102419fb1f2 · 2021-12-02T11:36:35.000-08:00
* source form distribution

* changing import style

* adding podspec for testing

* changing platform from ios 12 to 14

* removing unneeded podspec

Co-authored-by: Janus Balatbat &lt;jsbalatbat@microsoft.com&gt;
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOActionOverflowPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOActionOverflowPrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2021 Microsoft. All rights reserved.
 //
 
-#import "ACOBaseActionElement.h"
-#import "BaseActionElement.h"
+#import <AdaptiveCards/ACOBaseActionElement.h>
+#import <AdaptiveCards/BaseActionElement.h>
 #import <Foundation/Foundation.h>
 
 using namespace AdaptiveCards;
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAdaptiveCardPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAdaptiveCardPrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACOAdaptiveCard.h"
-#import "SharedAdaptiveCard.h"
+#import <AdaptiveCards/ACOAdaptiveCard.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
 using namespace AdaptiveCards;
 
 @interface ACOAdaptiveCard ()
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAuthCardButtonPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAuthCardButtonPrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2021 Microsoft. All rights reserved.
 //
 
-#import "ACOAuthCardButton.h"
-#import "AuthCardButton.h"
+#import <AdaptiveCards/ACOAuthCardButton.h>
+#import <AdaptiveCards/AuthCardButton.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAuthenticationPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAuthenticationPrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2021 Microsoft. All rights reserved.
 //
 
-#import "ACOAuthentication.h"
-#import "Authentication.h"
+#import <AdaptiveCards/ACOAuthentication.h>
+#import <AdaptiveCards/Authentication.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOBaseCardElementPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOBaseCardElementPrivate.h
@@ -4,8 +4,8 @@
 //
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
-#import "ACOBaseCardElement.h"
-#import "BaseCardElement.h"
+#import <AdaptiveCards/ACOBaseCardElement.h>
+#import <AdaptiveCards/BaseCardElement.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOHostConfigPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOHostConfigPrivate.h
@@ -4,10 +4,10 @@
 //
 //  Copyright © 2017 Microsoft. All rights reserved.
 //
-#import "ACOBaseActionElement.h"
-#import "ACOBaseCardElement.h"
-#import "ACREnums.h"
-#import "ACOHostConfig.h"
+#import <AdaptiveCards/ACOBaseActionElement.h>
+#import <AdaptiveCards/ACOBaseCardElement.h>
+#import <AdaptiveCards/ACREnums.h>
+#import <AdaptiveCards/ACOHostConfig.h>
 #import <AdaptiveCards/HostConfig.h>
 #import <AdaptiveCards/TextBlock.h>
 #import <AdaptiveCards/ACORenderContext.h>
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOMediaEventPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOMediaEventPrivate.h
@@ -5,10 +5,10 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACOMediaEvent.h"
-#import "Media.h"
-#import "MediaSource.h"
-#import "SharedAdaptiveCard.h"
+#import <AdaptiveCards/ACOMediaEvent.h>
+#import <AdaptiveCards/Media.h>
+#import <AdaptiveCards/MediaSource.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
 #import <Foundation/Foundation.h>
 
 using namespace AdaptiveCards;
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOParseContextPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOParseContextPrivate.h
@@ -4,8 +4,8 @@
 //
 //  Copyright © 2019 Microsoft. All rights reserved.
 //
-#import "ACOParseContext.h"
-#import "ParseContext.h"
+#import <AdaptiveCards/ACOParseContext.h>
+#import <AdaptiveCards/ParseContext.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACORefreshPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACORefreshPrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2021 Microsoft. All rights reserved.
 //
 
-#import "ACORefresh.h"
-#import "Refresh.h"
+#import <AdaptiveCards/ACORefresh.h>
+#import <AdaptiveCards/Refresh.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOTokenExchangeResourcePrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOTokenExchangeResourcePrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2021 Microsoft. All rights reserved.
 //
 
-#import "ACOTokenExchangeResource.h"
-#import "TokenExchangeResource.h"
+#import <AdaptiveCards/ACOTokenExchangeResource.h>
+#import <AdaptiveCards/TokenExchangeResource.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRChoiceSetViewDataSource.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRChoiceSetViewDataSource.h
@@ -5,11 +5,11 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACOBaseCardElement.h"
-#import "ACRIBaseInputHandler.h"
-#import "ChoiceInput.h"
-#import "ChoiceSetInput.h"
-#import "HostConfig.h"
+#import <AdaptiveCards/ACOBaseCardElement.h>
+#import <AdaptiveCards/ACRIBaseInputHandler.h>
+#import <AdaptiveCards/ChoiceInput.h>
+#import <AdaptiveCards/ChoiceSetInput.h>
+#import <AdaptiveCards/HostConfig.h>
 #import <UIKit/UIKit.h>
 
 extern NSString *checkedCheckboxReuseID;
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRChoiceSetViewDataSourceCompactStyle.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRChoiceSetViewDataSourceCompactStyle.h
@@ -5,11 +5,11 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACRIBaseInputHandler.h"
-#import "ACRView.h"
-#import "ChoiceInput.h"
-#import "ChoiceSetInput.h"
-#import "HostConfig.h"
+#import <AdaptiveCards/ACRIBaseInputHandler.h>
+#import <AdaptiveCards/ACRView.h>
+#import <AdaptiveCards/ChoiceInput.h>
+#import <AdaptiveCards/ChoiceSetInput.h>
+#import <AdaptiveCards/HostConfig.h>
 #import <UIKit/UIKit.h>
 
 @interface ACRChoiceSetViewDataSourceCompactStyle : NSObject <UITableViewDataSource, UITableViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, ACRIBaseInputHandler>
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRDateTextField.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRDateTextField.h
@@ -5,10 +5,10 @@
 //  Copyright © 2017 Microsoft. All rights reserved.
 //
 
-#import "ACRIBaseInputHandler.h"
-#import "ACRTextField.h"
-#import <Adaptivecards/BaseInputElement.h>
-#import <Adaptivecards/SharedAdaptiveCard.h>
+#import <AdaptiveCards/ACRIBaseInputHandler.h>
+#import <AdaptiveCards/ACRTextField.h>
+#import <AdaptiveCards/BaseInputElement.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
 #import <UIKit/UIKit.h>
 
 @interface ACRDateTextField : ACRTextField<ACRIBaseInputHandler>
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRImageSetUICollectionView.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRImageSetUICollectionView.h
@@ -5,10 +5,10 @@
 //
 //  Copyright © 2017 Microsoft. All rights reserved.
 //
-#import "ACRView.h"
-#import "HostConfig.h"
-#import "ImageSet.h"
-#import "SharedAdaptiveCard.h"
+#import <AdaptiveCards/ACRView.h>
+#import <AdaptiveCards/HostConfig.h>
+#import <AdaptiveCards/ImageSet.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
 #import <UIKit/UIKit.h>
 
 @interface ACRImageSetUICollectionView : UICollectionView <UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRInputLabelViewPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRInputLabelViewPrivate.h
@@ -6,10 +6,10 @@
 //
 //
 
-#import "ACRInputLabelView.h"
-#import "BaseInputElement.h"
-#import "SharedAdaptiveCard.h"
-#import "ACRView.h"
+#import <AdaptiveCards/ACRInputLabelView.h>
+#import <AdaptiveCards/BaseInputElement.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
+#import <AdaptiveCards/ACRView.h>
 
 using namespace AdaptiveCards;
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRParseWarningPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRParseWarningPrivate.h
@@ -5,8 +5,8 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACRParseWarning.h"
-#import "AdaptiveCardParseWarning.h"
+#import <AdaptiveCards/ACRParseWarning.h>
+#import <AdaptiveCards/AdaptiveCardParseWarning.h>
 #import <Foundation/Foundation.h>
 
 @interface ACRParseWarning ()
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRRendererPrivate.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRRendererPrivate.h
@@ -6,12 +6,12 @@
 //
 //
 
-#import "ACRBaseCardElementRenderer.h"
-#import "ACRIContentHoldingView.h"
-#import "ACRRenderer.h"
-#import "BackgroundImage.h"
-#import "HostConfig.h"
-#import "SharedAdaptiveCard.h"
+#import <AdaptiveCards/ACRBaseCardElementRenderer.h>
+#import <AdaptiveCards/ACRIContentHoldingView.h>
+#import <AdaptiveCards/ACRRenderer.h>
+#import <AdaptiveCards/BackgroundImage.h>
+#import <AdaptiveCards/HostConfig.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRSeparator.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRSeparator.h
@@ -4,10 +4,10 @@
 //
 //  Copyright © 2017 Microsoft. All rights reserved.
 //
-#import "ACRContentStackView.h"
-#import "ACRIContentHoldingView.h"
-#import "HostConfig.h"
-#import "SharedAdaptiveCard.h"
+#import <AdaptiveCards/ACRContentStackView.h>
+#import <AdaptiveCards/ACRIContentHoldingView.h>
+#import <AdaptiveCards/HostConfig.h>
+#import <AdaptiveCards/SharedAdaptiveCard.h>
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRShowCardTarget.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRShowCardTarget.h
@@ -5,9 +5,9 @@
 //  Copyright © 2017 Microsoft. All rights reserved.
 //
 
-#import "ACRBaseTarget.h"
-#import "ACRIContentHoldingView.h"
-#import "ACRView.h"
+#import <AdaptiveCards/ACRBaseTarget.h>
+#import <AdaptiveCards/ACRIContentHoldingView.h>
+#import <AdaptiveCards/ACRView.h>
 #import <AdaptiveCards/SharedAdaptiveCard.h>
 #import <AdaptiveCards/ShowCardAction.h>
 #import <UIKit/UIKit.h>
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRTableCellView.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRTableCellView.h
@@ -5,8 +5,8 @@
 //  Copyright © 2021 Microsoft. All rights reserved.
 //
 
-#import "ACRContentStackView.h"
-#import "ACRView.h"
+#import <AdaptiveCards/ACRContentStackView.h>
+#import <AdaptiveCards/ACRView.h>
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRTargetBuilderDirector.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRTargetBuilderDirector.h
@@ -6,7 +6,7 @@
 //
 
 #import <AdaptiveCards/ACOBaseActionElementPrivate.h>
-#import "ACRView.h"
+#import <AdaptiveCards/ACRView.h>
 #import <Foundation/Foundation.h>
 #import <AdaptiveCards/ACRTargetBuilder.h>
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRToggleInputDataSource.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRToggleInputDataSource.h
@@ -5,12 +5,12 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACOBaseCardElement.h"
-#import "ACRColumnSetView.h"
-#import "ACRIBaseCardElementRenderer.h"
-#import "ACRIBaseInputHandler.h"
-#import <Adaptivecards/HostConfig.h>
-#import <Adaptivecards/ToggleInput.h>
+#import <AdaptiveCards/ACOBaseCardElement.h>
+#import <AdaptiveCards/ACRColumnSetView.h>
+#import <AdaptiveCards/ACRIBaseCardElementRenderer.h>
+#import <AdaptiveCards/ACRIBaseInputHandler.h>
+#import <AdaptiveCards/HostConfig.h>
+#import <AdaptiveCards/ToggleInput.h>
 
 @interface ACRToggleInputDataSource : NSObject <ACRIBaseInputHandler>
 
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRToggleVisibilityTarget.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACRToggleVisibilityTarget.h
@@ -5,9 +5,9 @@
 //  Copyright © 2018 Microsoft. All rights reserved.
 //
 
-#import "ACRBaseTarget.h"
-#import "ACRIContentHoldingView.h"
-#import "ACRView.h"
+#import <AdaptiveCards/ACRBaseTarget.h>
+#import <AdaptiveCards/ACRIContentHoldingView.h>
+#import <AdaptiveCards/ACRView.h>
 #import <AdaptiveCards/ToggleVisibilityAction.h>
 
 #import <UIKit/UIKit.h>
diff --git a/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/UtiliOS.h b/source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/UtiliOS.h
@@ -5,8 +5,8 @@
 //
 
 #import <AdaptiveCards/ACORenderContext.h>
-#import "ACOVisibilityManager.h"
-#import "ACRErrors.h"
+#import <AdaptiveCards/ACOVisibilityManager.h>
+#import <AdaptiveCards/ACRErrors.h>
 #import <AdaptiveCards/ACRIBaseCardElementRenderer.h>
 #import <AdaptiveCards/ACRSeparator.h>
 #import <AdaptiveCards/ACRViewPrivate.h>
diff --git a/source/ios/tools/AdaptiveCards.podspec b/source/ios/tools/AdaptiveCards.podspec
@@ -2,7 +2,7 @@
 Pod::Spec.new do |spec|
   spec.name             = 'AdaptiveCards'
 
-  spec.version          = '2.8.1'
+  spec.version          = '2.8.2'
   
   spec.license          = { :type => 'Adaptive Cards Binary EULA', :file => 'source/EULA-Non-Windows.txt' } 
   
@@ -12,32 +12,36 @@ Pod::Spec.new do |spec|
   
   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.1' }
+  spec.source       = { :git => 'https://github.com/microsoft/AdaptiveCards.git', :tag => 'ios-v2.8.2' }
 
-  spec.source_files           = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/**/*.{h,m,mm}' 
+  spec.source_files           = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.{h,m,mm}'
 
   spec.subspec 'ObjectModel' do | sspec |
-    sspec.source_files = 'source/shared/cpp/ObjectModel/**/*.{h,cpp}', 'source/shared/cpp/ObjectModel/json/**/*.{h}'
+    sspec.source_files = 'source/shared/cpp/ObjectModel/**/*.{h,cpp}'
     sspec.header_mappings_dir = 'source/shared/cpp/ObjectModel/'
-    sspec.project_header_files = 'source/shared/cpp/ObjectModel/**/*.{h}'
+    sspec.private_header_files = 'source/shared/cpp/ObjectModel/**/*.{h}'
     sspec.xcconfig = {
          'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
          'CLANG_CXX_LIBRARY' => 'libc++'
     }
   end
 
-  spec.platform         = :ios, '12'
-
-  spec.frameworks = 'AVFoundation', 'AVKit', 'CoreGraphics', 'QuartzCore', 'UIKit' 
+  spec.subspec 'AdaptiveCardsPrivate' do | sspec |
+    sspec.source_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
+    sspec.header_mappings_dir = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/'
+    sspec.private_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
+  end
 
-  spec.public_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/*.h'
+  spec.platform         = :ios, '14'
 
-  spec.project_header_files = 'source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/*.h'
+  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.1.9'
+  spec.dependency 'MicrosoftFluentUI', '~> 0.3.6'
 end
 
