Merge pull request #33 from Automattic/develop

Bring master to current
Automattic · Jun 25, 2018 · b5c4256 · b5c4256
2 parents bb322d6 + 05e5d15
commit b5c4256
Show file tree

Hide file tree

Showing 5 changed files with 285 additions and 5 deletions.
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+4.0
diff --git a/Gridicons.podspec b/Gridicons.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "Gridicons"
-  s.version      = "0.13"
+  s.version      = "0.16"
   s.summary      = "Gridicons is a tiny framework which generates Gridicon images at any resolution."
 
   s.homepage     = "http://apps.wordpress.com"

diff --git a/Gridicons/Gridicons/Gridicons.swift b/Gridicons/Gridicons/Gridicons.swift
@@ -59,6 +59,7 @@ public enum GridiconType: Int {
     case plus
     case plugins
     case play
+    case plans
     case phone
     case pencil
     case pause
@@ -70,6 +71,7 @@ public enum GridiconType: Int {
     case nextPage
     case mySitesHorizon
     case mySites
+    case multipleUsers
     case money
     case minusSmall
     case minus
@@ -82,6 +84,7 @@ public enum GridiconType: Int {
     case location
     case listUnordered
     case listOrdered
+    case listOrderedRTL
     case listCheckmark
     case linkBreak
     case link
@@ -332,6 +335,8 @@ public final class Gridicon: NSObject {
             return GridiconsGenerated.imageOfGridiconsplugins(size: size)
         case .play:
             return GridiconsGenerated.imageOfGridiconsplay(size: size)
+        case .plans:
+            return GridiconsGenerated.imageOfGridiconsplans(size: size)
         case .phone:
             return GridiconsGenerated.imageOfGridiconsphone(size: size)
         case .pencil:
@@ -354,6 +359,8 @@ public final class Gridicon: NSObject {
             return GridiconsGenerated.imageOfGridiconsmysites(size: size)
         case .mySitesHorizon:
             return GridiconsGenerated.imageOfGridiconsmysiteshorizon(size: size)
+        case .multipleUsers:
+            return GridiconsGenerated.imageOfGridiconsmultipleusers(size: size)
         case .money:
             return GridiconsGenerated.imageOfGridiconsmoney(size: size)
         case .minus:
@@ -378,6 +385,8 @@ public final class Gridicon: NSObject {
             return GridiconsGenerated.imageOfGridiconslistunordered(size: size)
         case .listOrdered:
             return GridiconsGenerated.imageOfGridiconslistordered(size: size)
+        case .listOrderedRTL:
+            return GridiconsGenerated.imageOfGridiconslistorderedrtl(size: size)
         case .listCheckmark:
             return GridiconsGenerated.imageOfGridiconslistcheckmark(size: size)
         case .link: