Skip to content

Commit 9b93655

Browse files
SergioEstevaoSergioEstevao
authored
Merge pull request #1319 from wordpress-mobile/issue/replace_gridicons_with_SFSymbols
Replace gridicons with SFSymbols on the Example app
2 parents bec35ea + faa4d28 commit 9b93655

File tree

11 files changed

+67
-233
lines changed

11 files changed

+67
-233
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ workflows:
1010
- ios/test:
1111
name: Test
1212
xcode-version: "11.0"
13-
carthage-update: true
14-
carthage-working-directory: Example
1513
bundle-install: false
1614
pod-install: false
1715
workspace: Aztec.xcworkspace

‎Aztec.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -264,13 +264,6 @@
264264
remoteGlobalIDString = 5951CB8D1D8BC93600E1866F;
265265
remoteInfo = Aztec;
266266
};
267-
E8CE3F041F213AD0003254AB /* PBXContainerItemProxy */ = {
268-
isa = PBXContainerItemProxy;
269-
containerPortal = 5951CB851D8BC93600E1866F /* Project object */;
270-
proxyType = 1;
271-
remoteGlobalIDString = E8CE3EFE1F213AAA003254AB;
272-
remoteInfo = "Carthage Update";
273-
};
274267
/* End PBXContainerItemProxy section */
275268

276269
/* Begin PBXCopyFilesBuildPhase section */
@@ -1415,23 +1408,6 @@
14151408
};
14161409
/* End PBXHeadersBuildPhase section */
14171410

1418-
/* Begin PBXLegacyTarget section */
1419-
E8CE3EFE1F213AAA003254AB /* Carthage Update */ = {
1420-
isa = PBXLegacyTarget;
1421-
buildArgumentsString = "$(ACTION)";
1422-
buildConfigurationList = E8CE3F031F213AAA003254AB /* Build configuration list for PBXLegacyTarget "Carthage Update" */;
1423-
buildPhases = (
1424-
);
1425-
buildToolPath = "${PROJECT_DIR}/Scripts/carthage_script.sh";
1426-
buildWorkingDirectory = "";
1427-
dependencies = (
1428-
);
1429-
name = "Carthage Update";
1430-
passBuildSettingsInEnvironment = 1;
1431-
productName = "Carthage Update";
1432-
};
1433-
/* End PBXLegacyTarget section */
1434-
14351411
/* Begin PBXNativeTarget section */
14361412
5951CB8D1D8BC93600E1866F /* Aztec */ = {
14371413
isa = PBXNativeTarget;
@@ -1445,7 +1421,6 @@
14451421
buildRules = (
14461422
);
14471423
dependencies = (
1448-
E8CE3F051F213AD0003254AB /* PBXTargetDependency */,
14491424
);
14501425
name = Aztec;
14511426
productName = Aztec;
@@ -1492,10 +1467,6 @@
14921467
LastSwiftMigration = 1100;
14931468
ProvisioningStyle = Automatic;
14941469
};
1495-
E8CE3EFE1F213AAA003254AB = {
1496-
CreatedOnToolsVersion = 8.3.3;
1497-
ProvisioningStyle = Automatic;
1498-
};
14991470
};
15001471
};
15011472
buildConfigurationList = 5951CB881D8BC93600E1866F /* Build configuration list for PBXProject "Aztec" */;
@@ -1513,7 +1484,6 @@
15131484
targets = (
15141485
5951CB8D1D8BC93600E1866F /* Aztec */,
15151486
5951CB961D8BC93600E1866F /* AztecTests */,
1516-
E8CE3EFE1F213AAA003254AB /* Carthage Update */,
15171487
);
15181488
};
15191489
/* End PBXProject section */
@@ -1803,11 +1773,6 @@
18031773
target = 5951CB8D1D8BC93600E1866F /* Aztec */;
18041774
targetProxy = 5951CB991D8BC93600E1866F /* PBXContainerItemProxy */;
18051775
};
1806-
E8CE3F051F213AD0003254AB /* PBXTargetDependency */ = {
1807-
isa = PBXTargetDependency;
1808-
target = E8CE3EFE1F213AAA003254AB /* Carthage Update */;
1809-
targetProxy = E8CE3F041F213AD0003254AB /* PBXContainerItemProxy */;
1810-
};
18111776
/* End PBXTargetDependency section */
18121777

18131778
/* Begin XCBuildConfiguration section */
@@ -1949,10 +1914,7 @@
19491914
DYLIB_COMPATIBILITY_VERSION = 1;
19501915
DYLIB_CURRENT_VERSION = 1;
19511916
DYLIB_INSTALL_NAME_BASE = "@rpath";
1952-
FRAMEWORK_SEARCH_PATHS = (
1953-
"$(inherited)",
1954-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
1955-
);
1917+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19561918
INFOPLIST_FILE = Aztec/Info.plist;
19571919
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
19581920
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -1980,10 +1942,7 @@
19801942
DYLIB_COMPATIBILITY_VERSION = 1;
19811943
DYLIB_CURRENT_VERSION = 1;
19821944
DYLIB_INSTALL_NAME_BASE = "@rpath";
1983-
FRAMEWORK_SEARCH_PATHS = (
1984-
"$(inherited)",
1985-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
1986-
);
1945+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
19871946
INFOPLIST_FILE = Aztec/Info.plist;
19881947
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
19891948
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -2035,53 +1994,6 @@
20351994
};
20361995
name = Release;
20371996
};
2038-
E8CE3EFF1F213AAA003254AB /* Debug */ = {
2039-
isa = XCBuildConfiguration;
2040-
buildSettings = {
2041-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2042-
DEBUGGING_SYMBOLS = YES;
2043-
DEBUG_INFORMATION_FORMAT = dwarf;
2044-
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
2045-
GCC_OPTIMIZATION_LEVEL = 0;
2046-
OTHER_CFLAGS = "";
2047-
OTHER_LDFLAGS = "";
2048-
PRODUCT_NAME = "$(TARGET_NAME)";
2049-
};
2050-
name = Debug;
2051-
};
2052-
E8CE3F001F213AAA003254AB /* Release-Alpha */ = {
2053-
isa = XCBuildConfiguration;
2054-
buildSettings = {
2055-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2056-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2057-
OTHER_CFLAGS = "";
2058-
OTHER_LDFLAGS = "";
2059-
PRODUCT_NAME = "$(TARGET_NAME)";
2060-
};
2061-
name = "Release-Alpha";
2062-
};
2063-
E8CE3F011F213AAA003254AB /* Release */ = {
2064-
isa = XCBuildConfiguration;
2065-
buildSettings = {
2066-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2067-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2068-
OTHER_CFLAGS = "";
2069-
OTHER_LDFLAGS = "";
2070-
PRODUCT_NAME = "$(TARGET_NAME)";
2071-
};
2072-
name = Release;
2073-
};
2074-
E8CE3F021F213AAA003254AB /* Profiling */ = {
2075-
isa = XCBuildConfiguration;
2076-
buildSettings = {
2077-
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
2078-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
2079-
OTHER_CFLAGS = "";
2080-
OTHER_LDFLAGS = "";
2081-
PRODUCT_NAME = "$(TARGET_NAME)";
2082-
};
2083-
name = Profiling;
2084-
};
20851997
F111A1101DA7E8B600294FD3 /* Profiling */ = {
20861998
isa = XCBuildConfiguration;
20871999
buildSettings = {
@@ -2155,10 +2067,7 @@
21552067
DYLIB_COMPATIBILITY_VERSION = 1;
21562068
DYLIB_CURRENT_VERSION = 1;
21572069
DYLIB_INSTALL_NAME_BASE = "@rpath";
2158-
FRAMEWORK_SEARCH_PATHS = (
2159-
"$(inherited)",
2160-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
2161-
);
2070+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
21622071
INFOPLIST_FILE = Aztec/Info.plist;
21632072
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
21642073
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -2270,10 +2179,7 @@
22702179
DYLIB_COMPATIBILITY_VERSION = 1;
22712180
DYLIB_CURRENT_VERSION = 1;
22722181
DYLIB_INSTALL_NAME_BASE = "@rpath";
2273-
FRAMEWORK_SEARCH_PATHS = (
2274-
"$(inherited)",
2275-
"$(PROJECT_DIR)/Example/Carthage/Build/iOS",
2276-
);
2182+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
22772183
INFOPLIST_FILE = Aztec/Info.plist;
22782184
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
22792185
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -2344,17 +2250,6 @@
23442250
defaultConfigurationIsVisible = 0;
23452251
defaultConfigurationName = Release;
23462252
};
2347-
E8CE3F031F213AAA003254AB /* Build configuration list for PBXLegacyTarget "Carthage Update" */ = {
2348-
isa = XCConfigurationList;
2349-
buildConfigurations = (
2350-
E8CE3EFF1F213AAA003254AB /* Debug */,
2351-
E8CE3F001F213AAA003254AB /* Release-Alpha */,
2352-
E8CE3F011F213AAA003254AB /* Release */,
2353-
E8CE3F021F213AAA003254AB /* Profiling */,
2354-
);
2355-
defaultConfigurationIsVisible = 0;
2356-
defaultConfigurationName = Release;
2357-
};
23582253
/* End XCConfigurationList section */
23592254
};
23602255
rootObject = 5951CB851D8BC93600E1866F /* Project object */;

‎Example/AztecExample.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
59280F2A1D47CAF40083FB59 /* content.html in Resources */ = {isa = PBXBuildFile; fileRef = 59280F281D47CAF40083FB59 /* content.html */; };
1111
59280F2B1D47CAF40083FB59 /* SampleText.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 59280F291D47CAF40083FB59 /* SampleText.rtf */; };
1212
592D62C91D8DF5590013EFF7 /* Aztec.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 599F25771D8BD045002871D6 /* Aztec.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
13-
596719401D8BC60D00F18F7F /* Gridicons.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5967193D1D8BC60D00F18F7F /* Gridicons.framework */; };
1413
599F25701D8BCF57002871D6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599F256F1D8BCF57002871D6 /* AppDelegate.swift */; };
15-
599F25861D8BD998002871D6 /* Gridicons.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5967193D1D8BC60D00F18F7F /* Gridicons.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1614
59D2873B1D8C599B00B99C80 /* AttachmentDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59D287391D8C599B00B99C80 /* AttachmentDetailsViewController.swift */; };
1715
607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; };
1816
607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; };
@@ -121,7 +119,6 @@
121119
dstPath = "";
122120
dstSubfolderSpec = 10;
123121
files = (
124-
599F25861D8BD998002871D6 /* Gridicons.framework in CopyFiles */,
125122
);
126123
runOnlyForDeploymentPostprocessing = 0;
127124
};
@@ -130,7 +127,6 @@
130127
/* Begin PBXFileReference section */
131128
59280F281D47CAF40083FB59 /* content.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = content.html; sourceTree = "<group>"; };
132129
59280F291D47CAF40083FB59 /* SampleText.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = SampleText.rtf; sourceTree = "<group>"; };
133-
5967193D1D8BC60D00F18F7F /* Gridicons.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Gridicons.framework; path = Carthage/Build/iOS/Gridicons.framework; sourceTree = "<group>"; };
134130
599F256F1D8BCF57002871D6 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
135131
599F25711D8BD044002871D6 /* Aztec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Aztec.xcodeproj; path = ../Aztec.xcodeproj; sourceTree = "<group>"; };
136132
59D287391D8C599B00B99C80 /* AttachmentDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentDetailsViewController.swift; sourceTree = "<group>"; };
@@ -178,7 +174,6 @@
178174
buildActionMask = 2147483647;
179175
files = (
180176
F1D3610A20929EF700B4E7A5 /* Aztec.framework in Frameworks */,
181-
596719401D8BC60D00F18F7F /* Gridicons.framework in Frameworks */,
182177
F1D3610B20929F0200B4E7A5 /* WordPressEditor.framework in Frameworks */,
183178
);
184179
runOnlyForDeploymentPostprocessing = 0;
@@ -198,7 +193,6 @@
198193
isa = PBXGroup;
199194
children = (
200195
F122C2502072AE190018ED06 /* libxml2.tbd */,
201-
5967193D1D8BC60D00F18F7F /* Gridicons.framework */,
202196
);
203197
name = Frameworks;
204198
sourceTree = "<group>";
@@ -606,7 +600,7 @@
606600
GCC_WARN_UNUSED_FUNCTION = YES;
607601
GCC_WARN_UNUSED_VARIABLE = YES;
608602
HEADER_SEARCH_PATHS = /usr/include/libxml2;
609-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
603+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
610604
MTL_ENABLE_DEBUG_INFO = YES;
611605
ONLY_ACTIVE_ARCH = YES;
612606
SDKROOT = iphoneos;
@@ -660,7 +654,7 @@
660654
GCC_WARN_UNUSED_FUNCTION = YES;
661655
GCC_WARN_UNUSED_VARIABLE = YES;
662656
HEADER_SEARCH_PATHS = /usr/include/libxml2;
663-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
657+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
664658
MTL_ENABLE_DEBUG_INFO = NO;
665659
SDKROOT = iphoneos;
666660
STRIP_INSTALLED_PRODUCT = NO;
@@ -678,10 +672,7 @@
678672
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
679673
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
680674
DEVELOPMENT_TEAM = PZYM8XX95Q;
681-
FRAMEWORK_SEARCH_PATHS = (
682-
"$(inherited)",
683-
"$(PROJECT_DIR)/Carthage/Build/iOS",
684-
);
675+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
685676
INFOPLIST_FILE = Example/Info.plist;
686677
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
687678
MODULE_NAME = AztecExample;
@@ -701,10 +692,7 @@
701692
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
702693
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Automattic, Inc. (PZYM8XX95Q)";
703694
DEVELOPMENT_TEAM = PZYM8XX95Q;
704-
FRAMEWORK_SEARCH_PATHS = (
705-
"$(inherited)",
706-
"$(PROJECT_DIR)/Carthage/Build/iOS",
707-
);
695+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
708696
INFOPLIST_FILE = Example/Info.plist;
709697
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
710698
MODULE_NAME = AztecExample;
@@ -823,7 +811,7 @@
823811
GCC_WARN_UNUSED_FUNCTION = YES;
824812
GCC_WARN_UNUSED_VARIABLE = YES;
825813
HEADER_SEARCH_PATHS = /usr/include/libxml2;
826-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
814+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
827815
MTL_ENABLE_DEBUG_INFO = NO;
828816
ONLY_ACTIVE_ARCH = YES;
829817
SDKROOT = iphoneos;
@@ -841,10 +829,7 @@
841829
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
842830
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
843831
DEVELOPMENT_TEAM = PZYM8XX95Q;
844-
FRAMEWORK_SEARCH_PATHS = (
845-
"$(inherited)",
846-
"$(PROJECT_DIR)/Carthage/Build/iOS",
847-
);
832+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
848833
INFOPLIST_FILE = Example/Info.plist;
849834
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
850835
MODULE_NAME = AztecExample;
@@ -907,7 +892,7 @@
907892
GCC_WARN_UNUSED_FUNCTION = YES;
908893
GCC_WARN_UNUSED_VARIABLE = YES;
909894
HEADER_SEARCH_PATHS = /usr/include/libxml2;
910-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
895+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
911896
MTL_ENABLE_DEBUG_INFO = YES;
912897
ONLY_ACTIVE_ARCH = YES;
913898
SDKROOT = iphoneos;
@@ -925,10 +910,7 @@
925910
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
926911
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Automattic, Inc.";
927912
DEVELOPMENT_TEAM = 99KV9Z6BKV;
928-
FRAMEWORK_SEARCH_PATHS = (
929-
"$(inherited)",
930-
"$(PROJECT_DIR)/Carthage/Build/iOS",
931-
);
913+
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
932914
INFOPLIST_FILE = Example/Info.plist;
933915
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
934916
MODULE_NAME = AztecExample;

‎Example/Cartfile.private‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Example/Cartfile.resolved‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)