Skip to content

Commit baa946d

Browse files
mindgraffitimindgraffiti
authored
Merge pull request #58 from Automattic/feature/add-p2-icon
Add P2 icon
2 parents b00cf88 + 628b3e6 commit baa946d

File tree

8 files changed

+38
-16
lines changed

8 files changed

+38
-16
lines changed

‎Gridicons.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
Pod::Spec.new do |s|
22
s.name = "Gridicons"
3-
s.version = "1.0.2"
3+
s.version = "1.1.0-beta.1"
44
s.summary = "Gridicons is a tiny framework which generates Gridicon images at any resolution."
55

66
s.homepage = "http://apps.wordpress.com"
77
s.license = { :type => "GPLv2" }
88
s.author = { "Automattic" => "[email protected]" }
99
s.social_media_url = "http://twitter.com/WordPressiOS"
1010

11-
s.platform = :ios, "10.0"
11+
s.platform = :ios, "11.0"
1212
s.source = { :git => "https://github.com/Automattic/Gridicons-iOS.git", :tag => s.version.to_s }
1313

1414
s.source_files = "Gridicons/Gridicons/**/*.swift"

‎Gridicons/Gridicons.xcodeproj/project.pbxproj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
isa = PBXProject;
155155
attributes = {
156156
LastSwiftUpdateCheck = 0730;
157-
LastUpgradeCheck = 1130;
157+
LastUpgradeCheck = 1220;
158158
ORGANIZATIONNAME = Automattic;
159159
TargetAttributes = {
160160
1704C1F71CAF08EF00F991DE = {
@@ -257,6 +257,7 @@
257257
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
258258
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
259259
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
260+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
260261
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
261262
CLANG_WARN_STRICT_PROTOTYPES = YES;
262263
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -282,7 +283,7 @@
282283
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
283284
GCC_WARN_UNUSED_FUNCTION = YES;
284285
GCC_WARN_UNUSED_VARIABLE = YES;
285-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
286+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
286287
MTL_ENABLE_DEBUG_INFO = YES;
287288
ONLY_ACTIVE_ARCH = YES;
288289
SDKROOT = iphoneos;
@@ -318,6 +319,7 @@
318319
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
319320
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
320321
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
322+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
321323
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
322324
CLANG_WARN_STRICT_PROTOTYPES = YES;
323325
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -337,7 +339,7 @@
337339
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
338340
GCC_WARN_UNUSED_FUNCTION = YES;
339341
GCC_WARN_UNUSED_VARIABLE = YES;
340-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
342+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
341343
MTL_ENABLE_DEBUG_INFO = NO;
342344
SDKROOT = iphoneos;
343345
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -360,7 +362,7 @@
360362
DYLIB_INSTALL_NAME_BASE = "@rpath";
361363
INFOPLIST_FILE = Gridicons/Info.plist;
362364
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
363-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
365+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
364366
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
365367
MARKETING_VERSION = 1.0;
366368
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.Gridicons;
@@ -383,7 +385,7 @@
383385
DYLIB_INSTALL_NAME_BASE = "@rpath";
384386
INFOPLIST_FILE = Gridicons/Info.plist;
385387
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
386-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
388+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
387389
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
388390
MARKETING_VERSION = 1.0;
389391
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.Gridicons;
@@ -398,7 +400,7 @@
398400
isa = XCBuildConfiguration;
399401
buildSettings = {
400402
INFOPLIST_FILE = GridiconsTests/Info.plist;
401-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
403+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
402404
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
403405
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.GridiconsTests;
404406
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -411,7 +413,7 @@
411413
isa = XCBuildConfiguration;
412414
buildSettings = {
413415
INFOPLIST_FILE = GridiconsTests/Info.plist;
414-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
416+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
415417
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
416418
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.GridiconsTests;
417419
PRODUCT_NAME = "$(TARGET_NAME)";

‎Gridicons/Gridicons.xcodeproj/xcshareddata/xcschemes/Gridicons.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 = "1130"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Gridicons/Gridicons/Gridicons.xcassets/p2.imageset/Contents.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "p2-icon.pdf",
5+
"idiom" : "universal"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
},
12+
"properties" : {
13+
"preserves-vector-representation" : true,
14+
"template-rendering-intent" : "template"
15+
}
16+
}

‎Gridicons/Gridicons/Gridicons.xcassets/p2.imageset/p2-icon.pdf‎

3.64 KB
Binary file not shown.

‎Gridicons/Gridicons/GridiconsGenerated.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ public enum GridiconType: Int {
126126
case noticeOutline
127127
case notice
128128
case offline
129+
case p2
129130
case pages
130131
case pause
131132
case pencil
@@ -329,6 +330,7 @@ extension GridiconType {
329330
case .noticeOutline: return "notice-outline"
330331
case .notice: return "notice"
331332
case .offline: return "offline"
333+
case .p2: return "p2"
332334
case .pages: return "pages"
333335
case .pause: return "pause"
334336
case .pencil: return "pencil"

‎GridiconsDemo/GridiconsDemo.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
isa = PBXProject;
106106
attributes = {
107107
LastSwiftUpdateCheck = 0730;
108-
LastUpgradeCheck = 1130;
108+
LastUpgradeCheck = 1220;
109109
ORGANIZATIONNAME = Automattic;
110110
TargetAttributes = {
111111
1704C20F1CAF0D7E00F991DE = {
@@ -201,6 +201,7 @@
201201
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
202202
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
203203
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
204+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
204205
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
205206
CLANG_WARN_STRICT_PROTOTYPES = YES;
206207
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -225,7 +226,7 @@
225226
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
226227
GCC_WARN_UNUSED_FUNCTION = YES;
227228
GCC_WARN_UNUSED_VARIABLE = YES;
228-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
229+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
229230
MTL_ENABLE_DEBUG_INFO = YES;
230231
ONLY_ACTIVE_ARCH = YES;
231232
SDKROOT = iphoneos;
@@ -259,6 +260,7 @@
259260
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
260261
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
261262
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
263+
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
262264
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
263265
CLANG_WARN_STRICT_PROTOTYPES = YES;
264266
CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -277,7 +279,7 @@
277279
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
278280
GCC_WARN_UNUSED_FUNCTION = YES;
279281
GCC_WARN_UNUSED_VARIABLE = YES;
280-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
282+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
281283
MTL_ENABLE_DEBUG_INFO = NO;
282284
SDKROOT = iphoneos;
283285
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -292,7 +294,7 @@
292294
buildSettings = {
293295
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
294296
INFOPLIST_FILE = GridiconsDemo/Info.plist;
295-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
297+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
296298
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
297299
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.GridiconsDemo;
298300
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -305,7 +307,7 @@
305307
buildSettings = {
306308
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
307309
INFOPLIST_FILE = GridiconsDemo/Info.plist;
308-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
310+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
309311
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
310312
PRODUCT_BUNDLE_IDENTIFIER = com.automattic.GridiconsDemo;
311313
PRODUCT_NAME = "$(TARGET_NAME)";

‎GridiconsDemo/GridiconsDemo.xcodeproj/xcshareddata/xcschemes/GridiconsDemo.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 = "1130"
3+
LastUpgradeVersion = "1220"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)