Skip to content

Commit abfcae9

Browse files
SergioEstevaoSergioEstevao
committed
Update project file for Xcode 12 and Circle.ci configuration to use Xcode 12.
1 parent 9b93655 commit abfcae9

File tree

7 files changed

+43
-47
lines changed

7 files changed

+43
-47
lines changed

‎.circleci/config.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,42 @@ version: 2.1
33
orbs:
44
# Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
55
ios: wordpress-mobile/ios@1.0
6+
git: wordpress-mobile/git@1.0
7+
8+
xcode_version: &xcode_version
9+
xcode-version: "12.1.0"
10+
11+
iphone_test_device: &iphone_test_device
12+
device: iPhone 11
13+
ios-version: "14.1"
614

715
workflows:
816
test_and_validate:
917
jobs:
1018
- ios/test:
1119
name: Test
12-
xcode-version: "11.0"
20+
<<: *xcode_version
1321
bundle-install: false
1422
pod-install: false
1523
workspace: Aztec.xcworkspace
1624
scheme: AztecExample
17-
device: iPhone 11
18-
ios-version: "13.0"
25+
<<: *iphone_test_device
1926

2027
- ios/validate-podspec:
2128
name: Validate WordPress-Aztec-iOS.podspec
22-
xcode-version: "11.0"
29+
<<: *xcode_version
2330
podspec-path: WordPress-Aztec-iOS.podspec
2431

2532
- ios/validate-podspec:
2633
name: Validate WordPress-Editor-iOS.podspec
27-
xcode-version: "11.0"
34+
<<: *xcode_version
2835
podspec-path: WordPress-Editor-iOS.podspec
2936
# Reference WordPress-Aztec-iOS.podspec locally so we don't have to get it from the specs repo
3037
additional-parameters: --include-podspecs=WordPress-Aztec-iOS.podspec
3138

3239
- ios/publish-podspec:
3340
name: Publish WordPress-Aztec-iOS to Trunk
34-
xcode-version: "11.0"
41+
<<: *xcode_version
3542
podspec-path: WordPress-Aztec-iOS.podspec
3643
post-to-slack: true
3744
filters:
@@ -43,7 +50,7 @@ workflows:
4350
- ios/publish-podspec:
4451
name: Publish WordPress-Editor-iOS to Trunk
4552
requires: [ "Publish WordPress-Aztec-iOS to Trunk" ]
46-
xcode-version: "11.0"
53+
<<: *xcode_version
4754
podspec-path: WordPress-Editor-iOS.podspec
4855
post-to-slack: true
4956
filters:

‎Aztec.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,7 +1453,7 @@
14531453
isa = PBXProject;
14541454
attributes = {
14551455
LastSwiftUpdateCheck = 0800;
1456-
LastUpgradeCheck = 1020;
1456+
LastUpgradeCheck = 1230;
14571457
ORGANIZATIONNAME = "Automattic Inc.";
14581458
TargetAttributes = {
14591459
5951CB8D1D8BC93600E1866F = {
@@ -1801,6 +1801,7 @@
18011801
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18021802
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
18031803
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1804+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18041805
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
18051806
CLANG_WARN_STRICT_PROTOTYPES = YES;
18061807
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1867,6 +1868,7 @@
18671868
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
18681869
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
18691870
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1871+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
18701872
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
18711873
CLANG_WARN_STRICT_PROTOTYPES = YES;
18721874
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -1914,7 +1916,6 @@
19141916
DYLIB_COMPATIBILITY_VERSION = 1;
19151917
DYLIB_CURRENT_VERSION = 1;
19161918
DYLIB_INSTALL_NAME_BASE = "@rpath";
1917-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19181919
INFOPLIST_FILE = Aztec/Info.plist;
19191920
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
19201921
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -1942,7 +1943,6 @@
19421943
DYLIB_COMPATIBILITY_VERSION = 1;
19431944
DYLIB_CURRENT_VERSION = 1;
19441945
DYLIB_INSTALL_NAME_BASE = "@rpath";
1945-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19461946
INFOPLIST_FILE = Aztec/Info.plist;
19471947
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
19481948
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -1963,10 +1963,6 @@
19631963
CLANG_ENABLE_MODULES = YES;
19641964
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
19651965
DEVELOPMENT_TEAM = "";
1966-
FRAMEWORK_SEARCH_PATHS = (
1967-
"$(inherited)",
1968-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
1969-
);
19701966
INFOPLIST_FILE = AztecTests/Info.plist;
19711967
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
19721968
PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
@@ -1982,10 +1978,6 @@
19821978
CLANG_ENABLE_MODULES = YES;
19831979
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
19841980
DEVELOPMENT_TEAM = "";
1985-
FRAMEWORK_SEARCH_PATHS = (
1986-
"$(inherited)",
1987-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
1988-
);
19891981
INFOPLIST_FILE = AztecTests/Info.plist;
19901982
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
19911983
PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
@@ -2019,6 +2011,7 @@
20192011
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
20202012
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
20212013
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2014+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
20222015
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
20232016
CLANG_WARN_STRICT_PROTOTYPES = YES;
20242017
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2067,7 +2060,6 @@
20672060
DYLIB_COMPATIBILITY_VERSION = 1;
20682061
DYLIB_CURRENT_VERSION = 1;
20692062
DYLIB_INSTALL_NAME_BASE = "@rpath";
2070-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
20712063
INFOPLIST_FILE = Aztec/Info.plist;
20722064
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
20732065
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -2088,10 +2080,6 @@
20882080
CLANG_ENABLE_MODULES = YES;
20892081
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
20902082
DEVELOPMENT_TEAM = "";
2091-
FRAMEWORK_SEARCH_PATHS = (
2092-
"$(inherited)",
2093-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
2094-
);
20952083
INFOPLIST_FILE = AztecTests/Info.plist;
20962084
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
20972085
PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;
@@ -2125,6 +2113,7 @@
21252113
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
21262114
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
21272115
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
2116+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
21282117
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
21292118
CLANG_WARN_STRICT_PROTOTYPES = YES;
21302119
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2179,7 +2168,6 @@
21792168
DYLIB_COMPATIBILITY_VERSION = 1;
21802169
DYLIB_CURRENT_VERSION = 1;
21812170
DYLIB_INSTALL_NAME_BASE = "@rpath";
2182-
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
21832171
INFOPLIST_FILE = Aztec/Info.plist;
21842172
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
21852173
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -2201,10 +2189,6 @@
22012189
CLANG_ENABLE_MODULES = YES;
22022190
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
22032191
DEVELOPMENT_TEAM = "";
2204-
FRAMEWORK_SEARCH_PATHS = (
2205-
"$(inherited)",
2206-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
2207-
);
22082192
INFOPLIST_FILE = AztecTests/Info.plist;
22092193
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
22102194
PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests;

‎Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
onlyGenerateCoverageForSpecifiedTargets = "YES"
30-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
onlyGenerateCoverageForSpecifiedTargets = "YES">
31+
<MacroExpansion>
32+
<BuildableReference
33+
BuildableIdentifier = "primary"
34+
BlueprintIdentifier = "5951CB8D1D8BC93600E1866F"
35+
BuildableName = "Aztec.framework"
36+
BlueprintName = "Aztec"
37+
ReferencedContainer = "container:Aztec.xcodeproj">
38+
</BuildableReference>
39+
</MacroExpansion>
3140
<CodeCoverageTargets>
3241
<BuildableReference
3342
BuildableIdentifier = "primary"
@@ -49,17 +58,6 @@
4958
</BuildableReference>
5059
</TestableReference>
5160
</Testables>
52-
<MacroExpansion>
53-
<BuildableReference
54-
BuildableIdentifier = "primary"
55-
BlueprintIdentifier = "5951CB8D1D8BC93600E1866F"
56-
BuildableName = "Aztec.framework"
57-
BlueprintName = "Aztec"
58-
ReferencedContainer = "container:Aztec.xcodeproj">
59-
</BuildableReference>
60-
</MacroExpansion>
61-
<AdditionalOptions>
62-
</AdditionalOptions>
6361
</TestAction>
6462
<LaunchAction
6563
buildConfiguration = "Debug"
@@ -80,8 +78,6 @@
8078
ReferencedContainer = "container:Aztec.xcodeproj">
8179
</BuildableReference>
8280
</MacroExpansion>
83-
<AdditionalOptions>
84-
</AdditionalOptions>
8581
</LaunchAction>
8682
<ProfileAction
8783
buildConfiguration = "Profiling"

‎Aztec.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@
44
<dict>
55
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
66
<true/>
7+
<key>PreviewsEnabled</key>
8+
<false/>
79
</dict>
810
</plist>

‎Example/AztecExample.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
isa = PBXProject;
369369
attributes = {
370370
LastSwiftUpdateCheck = 0830;
371-
LastUpgradeCheck = 1020;
371+
LastUpgradeCheck = 1230;
372372
ORGANIZATIONNAME = "Automattic Inc.";
373373
TargetAttributes = {
374374
607FACCF1AFB9204008FA782 = {
@@ -574,6 +574,7 @@
574574
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
575575
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
576576
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
577+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
577578
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
578579
CLANG_WARN_STRICT_PROTOTYPES = YES;
579580
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -635,6 +636,7 @@
635636
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
636637
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
637638
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
639+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
638640
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
639641
CLANG_WARN_STRICT_PROTOTYPES = YES;
640642
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -791,6 +793,7 @@
791793
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
792794
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
793795
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
796+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
794797
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
795798
CLANG_WARN_STRICT_PROTOTYPES = YES;
796799
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -866,6 +869,7 @@
866869
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
867870
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
868871
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
872+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
869873
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
870874
CLANG_WARN_STRICT_PROTOTYPES = YES;
871875
CLANG_WARN_SUSPICIOUS_MOVE = YES;

‎Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.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 = "1020"
3+
LastUpgradeVersion = "1230"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎WordPressEditor/WordPressEditor.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
isa = PBXProject;
556556
attributes = {
557557
LastSwiftUpdateCheck = 0930;
558-
LastUpgradeCheck = 0930;
558+
LastUpgradeCheck = 1230;
559559
ORGANIZATIONNAME = "Automattic Inc.";
560560
TargetAttributes = {
561561
F1D360AC2092947500B4E7A5 = {
@@ -741,6 +741,7 @@
741741
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
742742
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
743743
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
744+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
744745
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
745746
CLANG_WARN_STRICT_PROTOTYPES = YES;
746747
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -848,6 +849,7 @@
848849
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
849850
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
850851
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
852+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
851853
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
852854
CLANG_WARN_STRICT_PROTOTYPES = YES;
853855
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -913,6 +915,7 @@
913915
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
914916
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
915917
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
918+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
916919
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
917920
CLANG_WARN_STRICT_PROTOTYPES = YES;
918921
CLANG_WARN_SUSPICIOUS_MOVE = YES;

0 commit comments

Comments
 (0)