Skip to content

Commit

Permalink
Merge pull request #57 from Automattic/merge/1.0.2-into-trunk
Browse files Browse the repository at this point in the history
Merge 1.0.2 changes into trunk
  • Loading branch information
jkmassel committed Nov 16, 2020
2 parents 99717b2 + b00cf88 commit 726e5d2
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Gridicons.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Gridicons"
s.version = "1.0.1"
s.version = "1.0.2"
s.summary = "Gridicons is a tiny framework which generates Gridicon images at any resolution."

s.homepage = "http://apps.wordpress.com"
Expand Down
6 changes: 3 additions & 3 deletions Gridicons/Gridicons/Gridicons.xcassets/Contents.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"images" : [
{
"filename" : "story.pdf",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"preserves-vector-representation" : true,
"template-rendering-intent" : "template"
}
}
Binary file not shown.
2 changes: 2 additions & 0 deletions Gridicons/Gridicons/GridiconsGenerated.swift
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ public enum GridiconType: Int {
case statsUp
case stats
case status
case story
case strikethrough
case sync
case tablet
Expand Down Expand Up @@ -380,6 +381,7 @@ extension GridiconType {
case .statsUp: return "stats-up"
case .stats: return "stats"
case .status: return "status"
case .story: return "story"
case .strikethrough: return "strikethrough"
case .sync: return "sync"
case .tablet: return "tablet"
Expand Down

0 comments on commit 726e5d2

Please sign in to comment.