Skip to content

Commit

Permalink
Update assets to be included within the Podspec
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sherlouk @SD10
Sherlouk authored and SD10 committed Sep 12, 2017
1 parent 51089cb commit 3f634c1
Show file tree
Hide file tree
Showing 23 changed files with 94 additions and 70 deletions.
0 ...geKitAssets.bundle/Images/bubble_full.png → Assets/Images/bubble_full.png
View file
File renamed without changes
0 ...itAssets.bundle/Images/bubble_full@2x.png → Assets/Images/bubble_full@2x.png
View file
File renamed without changes
0 ...itAssets.bundle/Images/bubble_full@3x.png → Assets/Images/bubble_full@3x.png
View file
File renamed without changes
0 ...ets.bundle/Images/bubble_full_tail_v1.png → Assets/Images/bubble_full_tail_v1.png
View file
File renamed without changes
0 ....bundle/Images/bubble_full_tail_v1@2x.png → Assets/Images/bubble_full_tail_v1@2x.png
View file
File renamed without changes
0 ....bundle/Images/bubble_full_tail_v1@3x.png → Assets/Images/bubble_full_tail_v1@3x.png
View file
File renamed without changes
0 ...ets.bundle/Images/bubble_full_tail_v2.png → Assets/Images/bubble_full_tail_v2.png
View file
File renamed without changes
0 ....bundle/Images/bubble_full_tail_v2@2x.png → Assets/Images/bubble_full_tail_v2@2x.png
View file
File renamed without changes
0 ....bundle/Images/bubble_full_tail_v2@3x.png → Assets/Images/bubble_full_tail_v2@3x.png
View file
File renamed without changes
0 ...tAssets.bundle/Images/bubble_outlined.png → Assets/Images/bubble_outlined.png
View file
File renamed without changes
0 ...sets.bundle/Images/bubble_outlined@2x.png → Assets/Images/bubble_outlined@2x.png
View file
File renamed without changes
0 ...sets.bundle/Images/bubble_outlined@3x.png → Assets/Images/bubble_outlined@3x.png
View file
File renamed without changes
0 ...bundle/Images/bubble_outlined_tail_v1.png → Assets/Images/bubble_outlined_tail_v1.png
View file
File renamed without changes
0 ...dle/Images/bubble_outlined_tail_v1@2x.png → Assets/Images/bubble_outlined_tail_v1@2x.png
View file
File renamed without changes
0 ...dle/Images/bubble_outlined_tail_v1@3x.png → Assets/Images/bubble_outlined_tail_v1@3x.png
View file
File renamed without changes
0 ...bundle/Images/bubble_outlined_tail_v2.png → Assets/Images/bubble_outlined_tail_v2.png
View file
File renamed without changes
0 ...dle/Images/bubble_outlined_tail_v2@2x.png → Assets/Images/bubble_outlined_tail_v2@2x.png
View file
File renamed without changes
0 ...dle/Images/bubble_outlined_tail_v2@3x.png → Assets/Images/bubble_outlined_tail_v2@3x.png
View file
File renamed without changes
61 changes: 0 additions & 61 deletions Assets/MessageKitAssets.bundle/Root.plist
View file

This file was deleted.

Binary file removed Assets/MessageKitAssets.bundle/en.lproj/Root.strings
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions MessageKit.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'MessageKit'
s.version = '0.7.0'
s.version = '0.7.1'
s.license = { :type => "MIT", :file => "LICENSE.md" }

s.summary = 'An elegant messages UI library for iOS.'
Expand All @@ -10,12 +10,13 @@ Pod::Spec.new do |s|

s.source = { :git => 'https://github.com/MessageKit/MessageKit.git', :tag => s.version }
s.source_files = 'Sources/*.swift'

s.pod_target_xcconfig = {
"SWIFT_VERSION" => "3.0",
}

s.ios.deployment_target = '9.0'
s.ios.resource_bundle = { 'MessageKitAssets' => 'Assets/Images/*.png' }

s.requires_arc = true
end
84 changes: 80 additions & 4 deletions MessageKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@
88916B401CF0DF5100469F91 /* MessageKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 88916B3E1CF0DF5100469F91 /* MessageKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
88916B451CF0DF5900469F91 /* MessageKitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88916B431CF0DF5900469F91 /* MessageKitTests.swift */; };
88916B471CF0DFE600469F91 /* MessageType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88916B461CF0DFE600469F91 /* MessageType.swift */; };
989BBFEF1F6682FD0068D79A /* bubble_full.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFDD1F6682FD0068D79A /* bubble_full.png */; };
989BBFF01F6682FD0068D79A /* bubble_full@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFDE1F6682FD0068D79A /* bubble_full@2x.png */; };
989BBFF11F6682FD0068D79A /* bubble_full@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFDF1F6682FD0068D79A /* bubble_full@3x.png */; };
989BBFF21F6682FD0068D79A /* bubble_full_tail_v1.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE01F6682FD0068D79A /* bubble_full_tail_v1.png */; };
989BBFF31F6682FD0068D79A /* bubble_full_tail_v1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE11F6682FD0068D79A /* bubble_full_tail_v1@2x.png */; };
989BBFF41F6682FD0068D79A /* bubble_full_tail_v1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE21F6682FD0068D79A /* bubble_full_tail_v1@3x.png */; };
989BBFF51F6682FD0068D79A /* bubble_full_tail_v2.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE31F6682FD0068D79A /* bubble_full_tail_v2.png */; };
989BBFF61F6682FD0068D79A /* bubble_full_tail_v2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE41F6682FD0068D79A /* bubble_full_tail_v2@2x.png */; };
989BBFF71F6682FD0068D79A /* bubble_full_tail_v2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE51F6682FD0068D79A /* bubble_full_tail_v2@3x.png */; };
989BBFF81F6682FD0068D79A /* bubble_outlined.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE61F6682FD0068D79A /* bubble_outlined.png */; };
989BBFF91F6682FD0068D79A /* bubble_outlined@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE71F6682FD0068D79A /* bubble_outlined@2x.png */; };
989BBFFA1F6682FD0068D79A /* bubble_outlined@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE81F6682FD0068D79A /* bubble_outlined@3x.png */; };
989BBFFB1F6682FD0068D79A /* bubble_outlined_tail_v1.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFE91F6682FD0068D79A /* bubble_outlined_tail_v1.png */; };
989BBFFC1F6682FD0068D79A /* bubble_outlined_tail_v1@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFEA1F6682FD0068D79A /* bubble_outlined_tail_v1@2x.png */; };
989BBFFD1F6682FD0068D79A /* bubble_outlined_tail_v1@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFEB1F6682FD0068D79A /* bubble_outlined_tail_v1@3x.png */; };
989BBFFE1F6682FD0068D79A /* bubble_outlined_tail_v2.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFEC1F6682FD0068D79A /* bubble_outlined_tail_v2.png */; };
989BBFFF1F6682FD0068D79A /* bubble_outlined_tail_v2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFED1F6682FD0068D79A /* bubble_outlined_tail_v2@2x.png */; };
989BC0001F6682FD0068D79A /* bubble_outlined_tail_v2@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 989BBFEE1F6682FD0068D79A /* bubble_outlined_tail_v2@3x.png */; };
B01280F31F4E8798004BCD3E /* MessageLabelDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B01280F21F4E8798004BCD3E /* MessageLabelDelegate.swift */; };
B0147C831F5BE9220035B36E /* Bundle+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0147C821F5BE9220035B36E /* Bundle+Extensions.swift */; };
B0147C901F5ED0810035B36E /* MessageDateHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0147C8F1F5ED0810035B36E /* MessageDateHeaderView.swift */; };
Expand All @@ -32,7 +50,6 @@
B015E8191F24623D007EDFB6 /* MessagesCollectionViewLayoutAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = B015E8181F24623D007EDFB6 /* MessagesCollectionViewLayoutAttributes.swift */; };
B015E81F1F259D8E007EDFB6 /* MessageInputBarDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B015E81E1F259D8E007EDFB6 /* MessageInputBarDelegate.swift */; };
B01E2DD81F5BBDB800E4FA1C /* MessageStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = B01E2DD71F5BBDB800E4FA1C /* MessageStyle.swift */; };
B01E2DDB1F5BC10000E4FA1C /* MessageKitAssets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = B01E2DDA1F5BC10000E4FA1C /* MessageKitAssets.bundle */; };
B03FF9AF1F31BB1200754FE5 /* MessageCellDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B03FF9AE1F31BB1200754FE5 /* MessageCellDelegate.swift */; };
B05530B51F493CFA008BB420 /* DetectorType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B05530B41F493CFA008BB420 /* DetectorType.swift */; };
B0655A2A1F23D77200542A83 /* Sender.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0655A291F23D77200542A83 /* Sender.swift */; };
Expand Down Expand Up @@ -84,6 +101,24 @@
88916B421CF0DF5900469F91 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
88916B431CF0DF5900469F91 /* MessageKitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageKitTests.swift; sourceTree = "<group>"; };
88916B461CF0DFE600469F91 /* MessageType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageType.swift; sourceTree = "<group>"; };
989BBFDD1F6682FD0068D79A /* bubble_full.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_full.png; sourceTree = "<group>"; };
989BBFDE1F6682FD0068D79A /* bubble_full@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_full@2x.png"; sourceTree = "<group>"; };
989BBFDF1F6682FD0068D79A /* bubble_full@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_full@3x.png"; sourceTree = "<group>"; };
989BBFE01F6682FD0068D79A /* bubble_full_tail_v1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_full_tail_v1.png; sourceTree = "<group>"; };
989BBFE11F6682FD0068D79A /* bubble_full_tail_v1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_full_tail_v1@2x.png"; sourceTree = "<group>"; };
989BBFE21F6682FD0068D79A /* bubble_full_tail_v1@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_full_tail_v1@3x.png"; sourceTree = "<group>"; };
989BBFE31F6682FD0068D79A /* bubble_full_tail_v2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_full_tail_v2.png; sourceTree = "<group>"; };
989BBFE41F6682FD0068D79A /* bubble_full_tail_v2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_full_tail_v2@2x.png"; sourceTree = "<group>"; };
989BBFE51F6682FD0068D79A /* bubble_full_tail_v2@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_full_tail_v2@3x.png"; sourceTree = "<group>"; };
989BBFE61F6682FD0068D79A /* bubble_outlined.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_outlined.png; sourceTree = "<group>"; };
989BBFE71F6682FD0068D79A /* bubble_outlined@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_outlined@2x.png"; sourceTree = "<group>"; };
989BBFE81F6682FD0068D79A /* bubble_outlined@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_outlined@3x.png"; sourceTree = "<group>"; };
989BBFE91F6682FD0068D79A /* bubble_outlined_tail_v1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_outlined_tail_v1.png; sourceTree = "<group>"; };
989BBFEA1F6682FD0068D79A /* bubble_outlined_tail_v1@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_outlined_tail_v1@2x.png"; sourceTree = "<group>"; };
989BBFEB1F6682FD0068D79A /* bubble_outlined_tail_v1@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_outlined_tail_v1@3x.png"; sourceTree = "<group>"; };
989BBFEC1F6682FD0068D79A /* bubble_outlined_tail_v2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bubble_outlined_tail_v2.png; sourceTree = "<group>"; };
989BBFED1F6682FD0068D79A /* bubble_outlined_tail_v2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_outlined_tail_v2@2x.png"; sourceTree = "<group>"; };
989BBFEE1F6682FD0068D79A /* bubble_outlined_tail_v2@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "bubble_outlined_tail_v2@3x.png"; sourceTree = "<group>"; };
B01280F21F4E8798004BCD3E /* MessageLabelDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageLabelDelegate.swift; sourceTree = "<group>"; };
B0147C821F5BE9220035B36E /* Bundle+Extensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Bundle+Extensions.swift"; sourceTree = "<group>"; };
B0147C8F1F5ED0810035B36E /* MessageDateHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageDateHeaderView.swift; sourceTree = "<group>"; };
Expand All @@ -93,7 +128,6 @@
B015E8181F24623D007EDFB6 /* MessagesCollectionViewLayoutAttributes.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessagesCollectionViewLayoutAttributes.swift; sourceTree = "<group>"; };
B015E81E1F259D8E007EDFB6 /* MessageInputBarDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageInputBarDelegate.swift; sourceTree = "<group>"; };
B01E2DD71F5BBDB800E4FA1C /* MessageStyle.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageStyle.swift; sourceTree = "<group>"; };
B01E2DDA1F5BC10000E4FA1C /* MessageKitAssets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = MessageKitAssets.bundle; sourceTree = "<group>"; };
B03FF9AE1F31BB1200754FE5 /* MessageCellDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageCellDelegate.swift; sourceTree = "<group>"; };
B05530B41F493CFA008BB420 /* DetectorType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetectorType.swift; sourceTree = "<group>"; };
B0655A291F23D77200542A83 /* Sender.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sender.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -188,10 +222,35 @@
path = Tests;
sourceTree = SOURCE_ROOT;
};
989BBFDC1F6682FD0068D79A /* Images */ = {
isa = PBXGroup;
children = (
989BBFDD1F6682FD0068D79A /* bubble_full.png */,
989BBFDE1F6682FD0068D79A /* bubble_full@2x.png */,
989BBFDF1F6682FD0068D79A /* bubble_full@3x.png */,
989BBFE01F6682FD0068D79A /* bubble_full_tail_v1.png */,
989BBFE11F6682FD0068D79A /* bubble_full_tail_v1@2x.png */,
989BBFE21F6682FD0068D79A /* bubble_full_tail_v1@3x.png */,
989BBFE31F6682FD0068D79A /* bubble_full_tail_v2.png */,
989BBFE41F6682FD0068D79A /* bubble_full_tail_v2@2x.png */,
989BBFE51F6682FD0068D79A /* bubble_full_tail_v2@3x.png */,
989BBFE61F6682FD0068D79A /* bubble_outlined.png */,
989BBFE71F6682FD0068D79A /* bubble_outlined@2x.png */,
989BBFE81F6682FD0068D79A /* bubble_outlined@3x.png */,
989BBFE91F6682FD0068D79A /* bubble_outlined_tail_v1.png */,
989BBFEA1F6682FD0068D79A /* bubble_outlined_tail_v1@2x.png */,
989BBFEB1F6682FD0068D79A /* bubble_outlined_tail_v1@3x.png */,
989BBFEC1F6682FD0068D79A /* bubble_outlined_tail_v2.png */,
989BBFED1F6682FD0068D79A /* bubble_outlined_tail_v2@2x.png */,
989BBFEE1F6682FD0068D79A /* bubble_outlined_tail_v2@3x.png */,
);
path = Images;
sourceTree = "<group>";
};
B01E2DCC1F5BA34700E4FA1C /* Assets */ = {
isa = PBXGroup;
children = (
B01E2DDA1F5BC10000E4FA1C /* MessageKitAssets.bundle */,
989BBFDC1F6682FD0068D79A /* Images */,
);
name = Assets;
path = ../Assets;
Expand Down Expand Up @@ -378,7 +437,24 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
B01E2DDB1F5BC10000E4FA1C /* MessageKitAssets.bundle in Resources */,
989BBFEF1F6682FD0068D79A /* bubble_full.png in Resources */,
989BC0001F6682FD0068D79A /* bubble_outlined_tail_v2@3x.png in Resources */,
989BBFFC1F6682FD0068D79A /* bubble_outlined_tail_v1@2x.png in Resources */,
989BBFF11F6682FD0068D79A /* bubble_full@3x.png in Resources */,
989BBFF51F6682FD0068D79A /* bubble_full_tail_v2.png in Resources */,
989BBFFA1F6682FD0068D79A /* bubble_outlined@3x.png in Resources */,
989BBFF01F6682FD0068D79A /* bubble_full@2x.png in Resources */,
989BBFFB1F6682FD0068D79A /* bubble_outlined_tail_v1.png in Resources */,
989BBFFF1F6682FD0068D79A /* bubble_outlined_tail_v2@2x.png in Resources */,
989BBFF71F6682FD0068D79A /* bubble_full_tail_v2@3x.png in Resources */,
989BBFFD1F6682FD0068D79A /* bubble_outlined_tail_v1@3x.png in Resources */,
989BBFF31F6682FD0068D79A /* bubble_full_tail_v1@2x.png in Resources */,
989BBFF61F6682FD0068D79A /* bubble_full_tail_v2@2x.png in Resources */,
989BBFF21F6682FD0068D79A /* bubble_full_tail_v1.png in Resources */,
989BBFF41F6682FD0068D79A /* bubble_full_tail_v1@3x.png in Resources */,
989BBFFE1F6682FD0068D79A /* bubble_outlined_tail_v2.png in Resources */,
989BBFF91F6682FD0068D79A /* bubble_outlined@2x.png in Resources */,
989BBFF81F6682FD0068D79A /* bubble_outlined.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
14 changes: 11 additions & 3 deletions Sources/Bundle+Extensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,17 @@ import Foundation
extension Bundle {

static func messageKitAssetBundle() -> Bundle {
let bundle = Bundle(for: MessagesViewController.self)
let resourceUrl = bundle.resourceURL!.appendingPathComponent("MessageKitAssets.bundle")
return Bundle(url: resourceUrl)!
let podBundle = Bundle(for: MessagesViewController.self)

guard let resourceBundleUrl = podBundle.url(forResource: "MessageKitAssets", withExtension: "bundle") else {
fatalError("MessageKit: Could not create path to the assets bundle")
}

guard let resourceBundle = Bundle(url: resourceBundleUrl) else {
fatalError("MessageKit: Could not load the assets bundle")
}

return resourceBundle
}

}

0 comments on commit 3f634c1

Please sign in to comment.