Skip to content

Commit 1abb711

Browse files
jwoo-msftjanusbalJanus Balatbat
authored
[iOS] patch release update (#6806)
* [iOS] Updated symlinks on release branch * Source form distribution in cocoapods (#6795) * 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 <jsbalatbat@microsoft.com> * [iOS] Updated Project file Co-authored-by: janusbal <86079148+janusbal@users.noreply.github.com> Co-authored-by: Janus Balatbat <jsbalatbat@microsoft.com>
1 parent 7704807 commit 1abb711

40 files changed

+115
-121
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
30860BC220C9B5C9009F9D99 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
11-
30860BC420C9B5C9009F9D99 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
1210
6B055764233EC53D000EE24A /* RichTextBlock.json in Resources */ = {isa = PBXBuildFile; fileRef = 6B055763233EC53D000EE24A /* RichTextBlock.json */; };
13-
6B14FC5D2113BC2200A11CC5 /* BuildFile in Resources */ = {isa = PBXBuildFile; };
1411
6B1509FE22FC98AE00046B3A /* samples in Resources */ = {isa = PBXBuildFile; fileRef = 6B1509FD22FC98AE00046B3A /* samples */; };
1512
6B150A0022FCE49600046B3A /* AdaptiveFileBrowserSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B1509FF22FCE49600046B3A /* AdaptiveFileBrowserSource.mm */; };
1613
6B150A042302415000046B3A /* sample.json in Resources */ = {isa = PBXBuildFile; fileRef = 6B150A032302415000046B3A /* sample.json */; };
@@ -65,8 +62,6 @@
6562
6B22426621E92AF9000ACDA1 /* CustomActionNewType.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B22426521E92AF9000ACDA1 /* CustomActionNewType.mm */; };
6663
6B22426A21FFA76D000ACDA1 /* ADCIOSVisualizerUITests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B22426921FFA76D000ACDA1 /* ADCIOSVisualizerUITests.mm */; };
6764
6B250FC9253FB0CE007FFCFB /* ACRCustomSubmitTargetBuilder.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B250FC8253FB0CC007FFCFB /* ACRCustomSubmitTargetBuilder.mm */; };
68-
6B268FE320CEF19400D99C1B /* BuildFile in Resources */ = {isa = PBXBuildFile; };
69-
6B268FE520CEF89100D99C1B /* BuildFile in Resources */ = {isa = PBXBuildFile; };
7065
6B2D8605211143BD008DD972 /* AdaptiveCards.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B2D8604211143BD008DD972 /* AdaptiveCards.framework */; };
7166
6B37723F26015FA30024E527 /* Action.Execute.Auth.json in Resources */ = {isa = PBXBuildFile; fileRef = 6B37723E26015FA30024E527 /* Action.Execute.Auth.json */; };
7267
6B5E9CBD24B663CA00757882 /* Adaptive1.0.png in Resources */ = {isa = PBXBuildFile; fileRef = 6B5E9CBC24B663CA00757882 /* Adaptive1.0.png */; };
@@ -587,7 +582,7 @@
587582
F423C06A1EE1FB6100905679 /* Project object */ = {
588583
isa = PBXProject;
589584
attributes = {
590-
LastUpgradeCheck = 1250;
585+
LastUpgradeCheck = 1310;
591586
ORGANIZATIONNAME = Microsoft;
592587
TargetAttributes = {
593588
F423C0711EE1FB6100905679 = {
@@ -637,26 +632,22 @@
637632
6B150A36230354F200046B3A /* Image.Size.json in Resources */,
638633
6B150A1123034F2800046B3A /* FoodOrder.json in Resources */,
639634
6B70AB88256490CC0095D925 /* Image.SelectAction.json in Resources */,
640-
6B268FE520CEF89100D99C1B /* BuildFile in Resources */,
641635
6B150A37230354F200046B3A /* ColumnSet.Spacing.json in Resources */,
642636
6B182BBC25DF5FB700629A39 /* Conflict.png in Resources */,
643637
6B1509FE22FC98AE00046B3A /* samples in Resources */,
644638
6B182BB425DF5FB700629A39 /* filebrowserHostConfig.json in Resources */,
645-
6B268FE320CEF19400D99C1B /* BuildFile in Resources */,
646639
6B182BBB25DF5FB700629A39 /* power_point.png in Resources */,
647640
6B182BB325DF5FB700629A39 /* SmallVerticalLineGray.png in Resources */,
648641
6B150A2A230353AB00046B3A /* TextBlock.IsSubtle.json in Resources */,
649642
6B37723F26015FA30024E527 /* Action.Execute.Auth.json in Resources */,
650643
6B150A29230353AB00046B3A /* TextBlock.Spacing.json in Resources */,
651-
6B14FC5D2113BC2200A11CC5 /* BuildFile in Resources */,
652644
6B150A3E230354F200046B3A /* Column.Size.Ratio.json in Resources */,
653645
6B150A40230354F200046B3A /* Image.json in Resources */,
654646
6B150A042302415000046B3A /* sample.json in Resources */,
655647
6BFBF9612457ADD0006FF8FB /* ActionSet.Inputs.Tests.json in Resources */,
656648
6B182BBA25DF5FB700629A39 /* Action.Scrolling.json in Resources */,
657649
6B182BCF25E5AD3500629A39 /* image_3.png in Resources */,
658650
6BFF9A18260155240028069F /* Action.Execute.json in Resources */,
659-
30860BC220C9B5C9009F9D99 /* BuildFile in Resources */,
660651
6B150A3C230354F200046B3A /* Column.Width.json in Resources */,
661652
6B9FAF4F25D70AAB00D1A791 /* AdditionalProperties.json in Resources */,
662653
6B150A20230353AB00046B3A /* TextBlock.Color.json in Resources */,
@@ -696,7 +687,6 @@
696687
6B182BD325E5D7D400629A39 /* bg_image.png in Resources */,
697688
6B150A1223034F2800046B3A /* Restaurant.json in Resources */,
698689
6B150A0F23034F2800046B3A /* Feedback.json in Resources */,
699-
30860BC420C9B5C9009F9D99 /* BuildFile in Resources */,
700690
6BBE841D23CD1A4900ECA586 /* Action.ShowCard.Style.json in Resources */,
701691
6B150A27230353AB00046B3A /* TextBlock.HorizontalAlignment.json in Resources */,
702692
);
@@ -934,7 +924,7 @@
934924
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
935925
GCC_WARN_UNUSED_FUNCTION = YES;
936926
GCC_WARN_UNUSED_VARIABLE = YES;
937-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
927+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
938928
MTL_ENABLE_DEBUG_INFO = YES;
939929
ONLY_ACTIVE_ARCH = YES;
940930
SDKROOT = iphoneos;
@@ -989,7 +979,7 @@
989979
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
990980
GCC_WARN_UNUSED_FUNCTION = YES;
991981
GCC_WARN_UNUSED_VARIABLE = YES;
992-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
982+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
993983
MTL_ENABLE_DEBUG_INFO = NO;
994984
SDKROOT = iphoneos;
995985
VALIDATE_PRODUCT = YES;

‎source/ios/AdaptiveCards/ADCIOSVisualizer/ADCIOSVisualizer.xcodeproj/xcshareddata/xcschemes/ADCIOSVisualizer.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1310"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@
288288
F42979461F322C9000E89914 /* ACRNumericTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F42979441F322C9000E89914 /* ACRNumericTextField.mm */; };
289289
F42979471F322C9000E89914 /* ACRNumericTextField.h in Headers */ = {isa = PBXBuildFile; fileRef = F42979451F322C9000E89914 /* ACRNumericTextField.h */; settings = {ATTRIBUTES = (Public, ); }; };
290290
F429794D1F32684900E89914 /* ACRDateTextField.mm in Sources */ = {isa = PBXBuildFile; fileRef = F429794C1F32684900E89914 /* ACRDateTextField.mm */; };
291-
F42C2F4A20351954008787B0 /* (null) in Sources */ = {isa = PBXBuildFile; };
292291
F42E51731FEC3840008F9642 /* MarkDownParsedResult.h in Headers */ = {isa = PBXBuildFile; fileRef = F42E516B1FEC383E008F9642 /* MarkDownParsedResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
293292
F42E51741FEC3840008F9642 /* MarkDownBlockParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F42E516C1FEC383E008F9642 /* MarkDownBlockParser.cpp */; };
294293
F42E51751FEC3840008F9642 /* MarkDownHtmlGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = F42E516D1FEC383F008F9642 /* MarkDownHtmlGenerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -402,7 +401,6 @@
402401
F4F44B7D20478C5C00A2F24C /* DateTimePreparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4F44B7920478C5C00A2F24C /* DateTimePreparser.cpp */; };
403402
F4F44B8020478C6F00A2F24C /* Util.h in Headers */ = {isa = PBXBuildFile; fileRef = F4F44B7E20478C6F00A2F24C /* Util.h */; settings = {ATTRIBUTES = (Public, ); }; };
404403
F4F44B8120478C6F00A2F24C /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F4F44B7F20478C6F00A2F24C /* Util.cpp */; };
405-
F4F44B8D204A11D000A2F24C /* (null) in Headers */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Public, ); }; };
406404
F4F44B8E204A145200A2F24C /* ACOBaseCardElement.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4F44B882048F82F00A2F24C /* ACOBaseCardElement.mm */; };
407405
F4F44B8F204A148200A2F24C /* ACOBaseCardElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F4F44B8A2048F83F00A2F24C /* ACOBaseCardElement.h */; settings = {ATTRIBUTES = (Public, ); }; };
408406
F4F44B90204A14EF00A2F24C /* ACRColumnRenderer.h in Headers */ = {isa = PBXBuildFile; fileRef = F42741221EFB274C00399FBB /* ACRColumnRenderer.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1665,7 +1663,6 @@
16651663
F4F44B91204A152100A2F24C /* ACRColumnSetRenderer.h in Headers */,
16661664
F43110431F357487001AAE30 /* ACRInputTableView.h in Headers */,
16671665
F4F44B94204A157B00A2F24C /* ACRImageRenderer.h in Headers */,
1668-
F4F44B8D204A11D000A2F24C /* (null) in Headers */,
16691666
F4F44B8F204A148200A2F24C /* ACOBaseCardElement.h in Headers */,
16701667
F401A87F1F1045CA006D7AF2 /* ACRContentHoldingUIView.h in Headers */,
16711668
F4C1F5DD1F218F920018CB78 /* ACRInputNumberRenderer.h in Headers */,
@@ -1847,7 +1844,7 @@
18471844
F423C0AC1EE1FBA900905679 /* Project object */ = {
18481845
isa = PBXProject;
18491846
attributes = {
1850-
LastUpgradeCheck = 1250;
1847+
LastUpgradeCheck = 1310;
18511848
ORGANIZATIONNAME = Microsoft;
18521849
TargetAttributes = {
18531850
F423C0B41EE1FBA900905679 = {
@@ -2146,7 +2143,6 @@
21462143
F4C1F5DE1F218F920018CB78 /* ACRInputNumberRenderer.mm in Sources */,
21472144
F448731A1EE2261F00FCAFAE /* OpenUrlAction.cpp in Sources */,
21482145
F4CAE7831F75AB9000545555 /* ACOAdaptiveCard.mm in Sources */,
2149-
F42C2F4A20351954008787B0 /* (null) in Sources */,
21502146
F4CA74A02016B3B9002041DF /* ACRTapGestureRecognizerEventHandler.mm in Sources */,
21512147
F42741171EF895AB00399FBB /* ACRTextBlockRenderer.mm in Sources */,
21522148
6BDE5C4626FEA7DC003A1DDB /* ACRShowCardTarget.mm in Sources */,
@@ -2244,6 +2240,7 @@
22442240
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
22452241
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
22462242
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2243+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
22472244
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
22482245
CLANG_WARN_STRICT_PROTOTYPES = YES;
22492246
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2270,7 +2267,7 @@
22702267
GCC_WARN_UNUSED_FUNCTION = YES;
22712268
GCC_WARN_UNUSED_VARIABLE = YES;
22722269
HEADER_SEARCH_PATHS = "";
2273-
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
2270+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
22742271
MTL_ENABLE_DEBUG_INFO = YES;
22752272
ONLY_ACTIVE_ARCH = YES;
22762273
SDKROOT = iphoneos;
@@ -2306,6 +2303,7 @@
23062303
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
23072304
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
23082305
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2306+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
23092307
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
23102308
CLANG_WARN_STRICT_PROTOTYPES = YES;
23112309
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2327,7 +2325,7 @@
23272325
GCC_WARN_UNUSED_FUNCTION = YES;
23282326
GCC_WARN_UNUSED_VARIABLE = YES;
23292327
HEADER_SEARCH_PATHS = "";
2330-
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
2328+
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
23312329
MTL_ENABLE_DEBUG_INFO = NO;
23322330
SDKROOT = iphoneos;
23332331
TARGETED_DEVICE_FAMILY = "1,2";
@@ -2342,7 +2340,7 @@
23422340
baseConfigurationReference = 777DD1173C03E3F4EC695141 /* Pods-AdaptiveCards.debug.xcconfig */;
23432341
buildSettings = {
23442342
BITCODE_GENERATION_MODE = bitcode;
2345-
CODE_SIGN_IDENTITY = "Apple Development";
2343+
CODE_SIGN_IDENTITY = "";
23462344
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
23472345
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "iPhone Developer";
23482346
CODE_SIGN_STYLE = Automatic;
@@ -2384,7 +2382,7 @@
23842382
baseConfigurationReference = 4B0881019D2B9BA6009F1B94 /* Pods-AdaptiveCards.release.xcconfig */;
23852383
buildSettings = {
23862384
BITCODE_GENERATION_MODE = bitcode;
2387-
CODE_SIGN_IDENTITY = "Apple Development";
2385+
CODE_SIGN_IDENTITY = "";
23882386
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
23892387
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "iPhone Developer";
23902388
CODE_SIGN_STYLE = Automatic;
@@ -2425,6 +2423,7 @@
24252423
isa = XCBuildConfiguration;
24262424
baseConfigurationReference = 3F3FBD57C361267D351D4B65 /* Pods-AdaptiveCards-AdaptiveCardsTests.debug.xcconfig */;
24272425
buildSettings = {
2426+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
24282427
CODE_SIGN_IDENTITY = "Apple Development";
24292428
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
24302429
CODE_SIGN_STYLE = Automatic;
@@ -2443,6 +2442,7 @@
24432442
isa = XCBuildConfiguration;
24442443
baseConfigurationReference = 92C9540BDB87B09349BF0018 /* Pods-AdaptiveCards-AdaptiveCardsTests.release.xcconfig */;
24452444
buildSettings = {
2445+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
24462446
CODE_SIGN_IDENTITY = "Apple Development";
24472447
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
24482448
CODE_SIGN_STYLE = Automatic;

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards.xcodeproj/xcshareddata/xcschemes/AdaptiveCards-Universal.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1310"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards.xcodeproj/xcshareddata/xcschemes/AdaptiveCards.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1250"
3+
LastUpgradeVersion = "1310"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOActionOverflowPrivate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// Copyright © 2021 Microsoft. All rights reserved.
66
//
77

8-
#import "ACOBaseActionElement.h"
9-
#import "BaseActionElement.h"
8+
#import <AdaptiveCards/ACOBaseActionElement.h>
9+
#import <AdaptiveCards/BaseActionElement.h>
1010
#import <Foundation/Foundation.h>
1111

1212
using namespace AdaptiveCards;

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAdaptiveCardPrivate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// Copyright © 2018 Microsoft. All rights reserved.
66
//
77

8-
#import "ACOAdaptiveCard.h"
9-
#import "SharedAdaptiveCard.h"
8+
#import <AdaptiveCards/ACOAdaptiveCard.h>
9+
#import <AdaptiveCards/SharedAdaptiveCard.h>
1010
using namespace AdaptiveCards;
1111

1212
@interface ACOAdaptiveCard ()

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAuthCardButtonPrivate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// Copyright © 2021 Microsoft. All rights reserved.
66
//
77

8-
#import "ACOAuthCardButton.h"
9-
#import "AuthCardButton.h"
8+
#import <AdaptiveCards/ACOAuthCardButton.h>
9+
#import <AdaptiveCards/AuthCardButton.h>
1010

1111
using namespace AdaptiveCards;
1212

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOAuthenticationPrivate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// Copyright © 2021 Microsoft. All rights reserved.
66
//
77

8-
#import "ACOAuthentication.h"
9-
#import "Authentication.h"
8+
#import <AdaptiveCards/ACOAuthentication.h>
9+
#import <AdaptiveCards/Authentication.h>
1010

1111
using namespace AdaptiveCards;
1212

‎source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/PrivateHeaders/ACOBaseCardElementPrivate.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
//
55
// Copyright © 2018 Microsoft. All rights reserved.
66
//
7-
#import "ACOBaseCardElement.h"
8-
#import "BaseCardElement.h"
7+
#import <AdaptiveCards/ACOBaseCardElement.h>
8+
#import <AdaptiveCards/BaseCardElement.h>
99

1010
using namespace AdaptiveCards;
1111

0 commit comments

Comments
 (0)