Skip to content

Commit 2326a55

Browse files
authored
Merge pull request #66 from Automattic/issue/bundle-fix
Fix import of `xcassets` to resources bundles in `podspec`
2 parents 6c07455 + 3c3f722 commit 2326a55

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Gridicons.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Pod::Spec.new do |s|
44
s.name = 'Gridicons'
5-
s.version = '1.1.0'
5+
s.version = '1.2.0'
66

77
s.summary = 'Gridicons is a tiny framework which generates Gridicon images at any resolution.'
88
s.description = <<-DESC
@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
2121
s.source = { git: 'https://github.com/Automattic/Gridicons-iOS.git', tag: s.version.to_s }
2222
s.source_files = 'Gridicons/Gridicons/**/*.swift'
2323
s.resource_bundles = {
24-
Gridicons: [
24+
GridiconsAssets: [
2525
'Gridicons/Gridicons/*.{xcassets}'
2626
]
2727
}

Gridicons.stencil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extension {{enumName}} {
3535
var icon: UIImage {
3636
var bundle = Bundle(for: BundleToken.self)
3737

38-
if let url = bundle.url(forResource: "Gridicons", withExtension: "bundle"),
38+
if let url = bundle.url(forResource: "GridiconsAssets", withExtension: "bundle"),
3939
let assetBundle = Bundle(url: url) {
4040
// When loaded through CocoaPods, assets reside in a separate resource bundle
4141
bundle = assetBundle

Gridicons/Gridicons/GridiconsGenerated.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ extension GridiconType {
412412
var icon: UIImage {
413413
var bundle = Bundle(for: BundleToken.self)
414414

415-
if let url = bundle.url(forResource: "Gridicons", withExtension: "bundle"),
415+
if let url = bundle.url(forResource: "GridiconsAssets", withExtension: "bundle"),
416416
let assetBundle = Bundle(url: url) {
417417
// When loaded through CocoaPods, assets reside in a separate resource bundle
418418
bundle = assetBundle

0 commit comments

Comments
 (0)