Merge pull request #66 from Automattic/issue/bundle-fix

Fix import of `xcassets` to resources bundles in `podspec`
Automattic · Jan 28, 2022 · 2326a55 · 2326a55
2 parents 6c07455 + 3c3f722
commit 2326a55
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Gridicons.podspec b/Gridicons.podspec
@@ -2,7 +2,7 @@
 
 Pod::Spec.new do |s|
   s.name          = 'Gridicons'
-  s.version       = '1.1.0'
+  s.version       = '1.2.0'
 
   s.summary       = 'Gridicons is a tiny framework which generates Gridicon images at any resolution.'
   s.description   = <<-DESC
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.source        = { git: 'https://github.com/Automattic/Gridicons-iOS.git', tag: s.version.to_s }
   s.source_files  = 'Gridicons/Gridicons/**/*.swift'
   s.resource_bundles = {
-    Gridicons: [
+    GridiconsAssets: [
       'Gridicons/Gridicons/*.{xcassets}'
     ]
   }

diff --git a/Gridicons.stencil b/Gridicons.stencil
@@ -35,7 +35,7 @@ extension {{enumName}} {
   var icon: UIImage {
     var bundle = Bundle(for: BundleToken.self)
 
-    if let url = bundle.url(forResource: "Gridicons", withExtension: "bundle"),
+    if let url = bundle.url(forResource: "GridiconsAssets", withExtension: "bundle"),
         let assetBundle = Bundle(url: url) {
         // When loaded through CocoaPods, assets reside in a separate resource bundle
         bundle = assetBundle

diff --git a/Gridicons/Gridicons/GridiconsGenerated.swift b/Gridicons/Gridicons/GridiconsGenerated.swift
@@ -412,7 +412,7 @@ extension GridiconType {
   var icon: UIImage {
     var bundle = Bundle(for: BundleToken.self)
 
-    if let url = bundle.url(forResource: "Gridicons", withExtension: "bundle"),
+    if let url = bundle.url(forResource: "GridiconsAssets", withExtension: "bundle"),
         let assetBundle = Bundle(url: url) {
         // When loaded through CocoaPods, assets reside in a separate resource bundle
         bundle = assetBundle