wordpress-mobile · SergioEstevao · Jun 23, 2020 · Jun 26, 2020 · Dec 30, 2020 · Jan 4, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,33 +7,38 @@ orbs:
 workflows:
   test_and_validate:
     jobs:
+      - ios/test:
+          name: Carthage Update
+          xcode-version: "12.1.0"
+          workspace: Aztec.xcworkspace
+          scheme: CarthageBuild
+          device: iPhone 11
+
       - ios/test:
           name: Test
-          xcode-version: "11.0"
-          carthage-update: true
-          carthage-working-directory: Example
+          xcode-version: "12.1.0"
           bundle-install: false
           pod-install: false
           workspace: Aztec.xcworkspace
           scheme: AztecExample
           device: iPhone 11
-          ios-version: "13.0"
+          ios-version: "14.0"
 
       - ios/validate-podspec:
           name: Validate WordPress-Aztec-iOS.podspec
-          xcode-version: "11.0"
+          xcode-version: "12.1.0"
           podspec-path: WordPress-Aztec-iOS.podspec
 
       - ios/validate-podspec:
           name: Validate WordPress-Editor-iOS.podspec
-          xcode-version: "11.0"
+          xcode-version: "12.1.0"
           podspec-path: WordPress-Editor-iOS.podspec
           # Reference WordPress-Aztec-iOS.podspec locally so we don't have to get it from the specs repo
           additional-parameters: --include-podspecs=WordPress-Aztec-iOS.podspec
 
       - ios/publish-podspec:
           name: Publish WordPress-Aztec-iOS to Trunk
-          xcode-version: "11.0"
+          xcode-version: "12.1.0"
           podspec-path: WordPress-Aztec-iOS.podspec
           post-to-slack: true
           filters:
@@ -45,7 +50,7 @@ workflows:
       - ios/publish-podspec:
           name: Publish WordPress-Editor-iOS to Trunk
           requires: [ "Publish WordPress-Aztec-iOS to Trunk" ]
-          xcode-version: "11.0"
+          xcode-version: "12.1.0"
           podspec-path: WordPress-Editor-iOS.podspec
           post-to-slack: true
           filters:

diff --git a/Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme b/Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,8 +26,17 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      onlyGenerateCoverageForSpecifiedTargets = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5951CB8D1D8BC93600E1866F"
+            BuildableName = "Aztec.framework"
+            BlueprintName = "Aztec"
+            ReferencedContainer = "container:Aztec.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -49,17 +58,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5951CB8D1D8BC93600E1866F"
-            BuildableName = "Aztec.framework"
-            BlueprintName = "Aztec"
-            ReferencedContainer = "container:Aztec.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -80,8 +78,6 @@
             ReferencedContainer = "container:Aztec.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profiling"

diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj
@@ -6,6 +6,20 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXAggregateTarget section */
+		FFB801A425A4DE2000B5A78F /* Chartage Update */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = FFB801AC25A4DE2000B5A78F /* Build configuration list for PBXAggregateTarget "Chartage Update" */;
+			buildPhases = (
+				FFB801AF25A4DE2A00B5A78F /* ShellScript */,
+			);
+			dependencies = (
+			);
+			name = "Chartage Update";
+			productName = ChartageBuild;
+		};
+/* End PBXAggregateTarget section */
+
 /* Begin PBXBuildFile section */
 		59280F2A1D47CAF40083FB59 /* content.html in Resources */ = {isa = PBXBuildFile; fileRef = 59280F281D47CAF40083FB59 /* content.html */; };
 		59280F2B1D47CAF40083FB59 /* SampleText.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 59280F291D47CAF40083FB59 /* SampleText.rtf */; };
@@ -40,6 +54,7 @@
 		FF149F4A20E3C49A0070FECB /* imagesOverlays.html in Resources */ = {isa = PBXBuildFile; fileRef = FF149F4920E3C49A0070FECB /* imagesOverlays.html */; };
 		FF1FD05C20932EDE00186384 /* gutenberg.html in Resources */ = {isa = PBXBuildFile; fileRef = FF1FD05B20932EDE00186384 /* gutenberg.html */; };
 		FF1FEC7E2406E071006221AA /* underline.html in Resources */ = {isa = PBXBuildFile; fileRef = FF1FEC7D2406E071006221AA /* underline.html */; };
+		FF29DF0C24A2399A00868706 /* EditorDemoController+PHPicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF29DF0B24A2399A00868706 /* EditorDemoController+PHPicker.swift */; };
 		FF5CDACD239E78B200CF235B /* failedMedia.html in Resources */ = {isa = PBXBuildFile; fileRef = FF5CDACC239E78B200CF235B /* failedMedia.html */; };
 		FF629DC9223BC418004C4106 /* videoShortcodes.html in Resources */ = {isa = PBXBuildFile; fileRef = FF629DC8223BC418004C4106 /* videoShortcodes.html */; };
 		FF9AF5481DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */; };
@@ -162,6 +177,8 @@
 		FF149F4920E3C49A0070FECB /* imagesOverlays.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = imagesOverlays.html; sourceTree = "<group>"; };
 		FF1FD05B20932EDE00186384 /* gutenberg.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = gutenberg.html; sourceTree = "<group>"; };
 		FF1FEC7D2406E071006221AA /* underline.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = underline.html; sourceTree = "<group>"; };
+		FF29DF0B24A2399A00868706 /* EditorDemoController+PHPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EditorDemoController+PHPicker.swift"; sourceTree = "<group>"; };
+		FF29DF1024A246D800868706 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
 		FF5CDACC239E78B200CF235B /* failedMedia.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = failedMedia.html; sourceTree = "<group>"; };
 		FF629DC8223BC418004C4106 /* videoShortcodes.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = videoShortcodes.html; sourceTree = "<group>"; };
 		FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = AttachmentDetailsViewController.storyboard; sourceTree = "<group>"; };
@@ -197,6 +214,7 @@
 		02ECB379638AE0CDEAB24BEC /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				FF29DF1024A246D800868706 /* MobileCoreServices.framework */,
 				F122C2502072AE190018ED06 /* libxml2.tbd */,
 				5967193D1D8BC60D00F18F7F /* Gridicons.framework */,
 			);
@@ -267,6 +285,7 @@
 				FF9AF5471DB0E4E200C42ED3 /* AttachmentDetailsViewController.storyboard */,
 				607FACD71AFB9204008FA782 /* ViewController.swift */,
 				E63EF92A1D36A60B00B5BA4B /* EditorDemoController.swift */,
+				FF29DF0B24A2399A00868706 /* EditorDemoController+PHPicker.swift */,
 				FFFA53D423C4AD0B00829A43 /* TextViewAttachmentDelegateProvider.swift */,
 				FFFA53CF23C4A64200829A43 /* MediaInserter.swift */,
 				FFFA53D623C4C43700829A43 /* UIImage+SaveTo.swift */,
@@ -374,7 +393,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1230;
 				ORGANIZATIONNAME = "Automattic Inc.";
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
@@ -389,6 +408,10 @@
 						ProvisioningStyle = Automatic;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
+					FFB801A425A4DE2000B5A78F = {
+						CreatedOnToolsVersion = 12.3;
+						ProvisioningStyle = Automatic;
+					};
 				};
 			};
 			buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "AztecExample" */;
@@ -416,6 +439,7 @@
 			targets = (
 				607FACCF1AFB9204008FA782 /* AztecExample */,
 				CC400F161E9EC04200859AB4 /* AztecUITests */,
+				FFB801A425A4DE2000B5A78F /* Chartage Update */,
 			);
 		};
 /* End PBXProject section */
@@ -483,6 +507,26 @@
 		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		FFB801AF25A4DE2A00B5A78F /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n./carthage.sh build --platform iOS\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		607FACCC1AFB9204008FA782 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -491,6 +535,7 @@
 				FFFA53D023C4A64200829A43 /* MediaInserter.swift in Sources */,
 				B5DB1C371EC630E10005E623 /* UnknownEditorViewController.swift in Sources */,
 				FFFA53D523C4AD0B00829A43 /* TextViewAttachmentDelegateProvider.swift in Sources */,
+				FF29DF0C24A2399A00868706 /* EditorDemoController+PHPicker.swift in Sources */,
 				599F25701D8BCF57002871D6 /* AppDelegate.swift in Sources */,
 				59D2873B1D8C599B00B99C80 /* AttachmentDetailsViewController.swift in Sources */,
 				FFFA53D723C4C43700829A43 /* UIImage+SaveTo.swift in Sources */,
@@ -580,6 +625,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -641,6 +687,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -803,6 +850,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -881,6 +929,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -942,6 +991,38 @@
 			};
 			name = "Release-Alpha";
 		};
+		FFB801A525A4DE2000B5A78F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		FFB801A625A4DE2000B5A78F /* Release-Alpha */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = "Release-Alpha";
+		};
+		FFB801A725A4DE2000B5A78F /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		FFB801A825A4DE2000B5A78F /* Profiling */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CODE_SIGN_STYLE = Automatic;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Profiling;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -978,6 +1059,17 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		FFB801AC25A4DE2000B5A78F /* Build configuration list for PBXAggregateTarget "Chartage Update" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				FFB801A525A4DE2000B5A78F /* Debug */,
+				FFB801A625A4DE2000B5A78F /* Release-Alpha */,
+				FFB801A725A4DE2000B5A78F /* Release */,
+				FFB801A825A4DE2000B5A78F /* Profiling */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 607FACC81AFB9204008FA782 /* Project object */;

diff --git a/Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme b/Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/...eddata/xcschemes/Carthage Update.xcscheme → ...areddata/xcschemes/CarthageBuild.xcscheme b/...eddata/xcschemes/Carthage Update.xcscheme → ...areddata/xcschemes/CarthageBuild.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
-               BuildableName = "Carthage Update"
-               BlueprintName = "Carthage Update"
-               ReferencedContainer = "container:Aztec.xcodeproj">
+               BlueprintIdentifier = "FFB801A425A4DE2000B5A78F"
+               BuildableName = "Chartage Update"
+               BlueprintName = "Chartage Update"
+               ReferencedContainer = "container:AztecExample.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -42,17 +40,6 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
-            BuildableName = "Carthage Update"
-            BlueprintName = "Carthage Update"
-            ReferencedContainer = "container:Aztec.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -63,10 +50,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E8CE3EFE1F213AAA003254AB"
-            BuildableName = "Carthage Update"
-            BlueprintName = "Carthage Update"
-            ReferencedContainer = "container:Aztec.xcodeproj">
+            BlueprintIdentifier = "FFB801A425A4DE2000B5A78F"
+            BuildableName = "Chartage Update"
+            BlueprintName = "Chartage Update"
+            ReferencedContainer = "container:AztecExample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>