Skip to content

Commit

Permalink
Use EmojiKit
Browse files Browse the repository at this point in the history
  • Loading branch information
@dasmer
dasmer committed Dec 30, 2015
1 parent a80f916 commit 4cf3665
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 7,945 deletions.
1 change: 1 addition & 0 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "dasmer/EmojiKit" "master"
github "TransitApp/SVProgressHUD" "2.0-beta"
github "mixpanel/mixpanel-iphone" ~> 2.9
github "nicklockwood/iRate" "fbd607ae6410da3056f7a35146b32073935943c2"
1 change: 1 addition & 0 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "dasmer/EmojiKit" "63972beefb8dd4f79f2184c3aca108449fd3e178"
github "TransitApp/SVProgressHUD" "2.0-beta"
github "nicklockwood/iRate" "fbd607ae6410da3056f7a35146b32073935943c2"
github "mixpanel/mixpanel-iphone" "v2.9.1"
21 changes: 5 additions & 16 deletions Paste.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/* Begin PBXBuildFile section */
2F5B143A1C32377300461390 /* iRate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F5B14391C32377300461390 /* iRate.framework */; };
2F5B143C1C32395000461390 /* RateReminder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F5B143B1C32395000461390 /* RateReminder.swift */; };
3A267D5D1C28C50C0000D8B1 /* AllEmoji.json in Resources */ = {isa = PBXBuildFile; fileRef = 3A267D5C1C28C50C0000D8B1 /* AllEmoji.json */; };
2FD740A61C3443C20059751B /* EmojiKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2FD740A51C3443C20059751B /* EmojiKit.framework */; };
3A457AC01C28CBAD00C35867 /* Mixpanel.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A457ABF1C28CBAD00C35867 /* Mixpanel.framework */; };
3A457AC21C28CD5200C35867 /* Analytics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A457AC11C28CD5200C35867 /* Analytics.swift */; };
3A8F5EDF1C27285E00F394CA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8F5EDE1C27285E00F394CA /* AppDelegate.swift */; };
Expand All @@ -18,17 +18,14 @@
3A8F5EE91C27285E00F394CA /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3A8F5EE71C27285E00F394CA /* LaunchScreen.storyboard */; };
3A8F5EF11C272A8300F394CA /* SearchTextFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A8F5EF01C272A8300F394CA /* SearchTextFieldView.swift */; };
3A8F5EF61C27363D00F394CA /* SVProgressHUD.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3A8F5EF51C27363D00F394CA /* SVProgressHUD.framework */; };
3AE7CF691C2A146600485FB2 /* DictionarySerialization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE7CF681C2A146600485FB2 /* DictionarySerialization.swift */; };
3AE7CF6B1C2A161D00485FB2 /* Store.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE7CF6A1C2A161D00485FB2 /* Store.swift */; };
3AF144BD1C2770F900BA2089 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AF144BC1C2770F900BA2089 /* Emoji.swift */; };
3AF144BF1C27716500BA2089 /* EmojiFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AF144BE1C27716500BA2089 /* EmojiFetcher.swift */; };
845CA7BC1C31D4CD00BF8F77 /* Key.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845CA7BB1C31D4CD00BF8F77 /* Key.swift */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
2F5B14391C32377300461390 /* iRate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iRate.framework; path = Carthage/Build/iOS/iRate.framework; sourceTree = SOURCE_ROOT; };
2F5B143B1C32395000461390 /* RateReminder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RateReminder.swift; sourceTree = "<group>"; };
3A267D5C1C28C50C0000D8B1 /* AllEmoji.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = AllEmoji.json; sourceTree = "<group>"; };
2FD740A51C3443C20059751B /* EmojiKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EmojiKit.framework; path = Carthage/Build/iOS/EmojiKit.framework; sourceTree = SOURCE_ROOT; };
3A457ABF1C28CBAD00C35867 /* Mixpanel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Mixpanel.framework; path = ../Carthage/Build/iOS/Mixpanel.framework; sourceTree = "<group>"; };
3A457AC11C28CD5200C35867 /* Analytics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Analytics.swift; sourceTree = "<group>"; };
3A8F5EDB1C27285E00F394CA /* Paste.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Paste.app; sourceTree = BUILT_PRODUCTS_DIR; };
Expand All @@ -39,10 +36,7 @@
3A8F5EEA1C27285E00F394CA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3A8F5EF01C272A8300F394CA /* SearchTextFieldView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchTextFieldView.swift; sourceTree = "<group>"; };
3A8F5EF51C27363D00F394CA /* SVProgressHUD.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SVProgressHUD.framework; path = ../Carthage/Build/iOS/SVProgressHUD.framework; sourceTree = "<group>"; };
3AE7CF681C2A146600485FB2 /* DictionarySerialization.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DictionarySerialization.swift; sourceTree = "<group>"; };
3AE7CF6A1C2A161D00485FB2 /* Store.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Store.swift; sourceTree = "<group>"; };
3AF144BC1C2770F900BA2089 /* Emoji.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Emoji.swift; sourceTree = "<group>"; };
3AF144BE1C27716500BA2089 /* EmojiFetcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmojiFetcher.swift; sourceTree = "<group>"; };
845CA7BB1C31D4CD00BF8F77 /* Key.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Key.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand All @@ -54,6 +48,7 @@
2F5B143A1C32377300461390 /* iRate.framework in Frameworks */,
3A457AC01C28CBAD00C35867 /* Mixpanel.framework in Frameworks */,
3A8F5EF61C27363D00F394CA /* SVProgressHUD.framework in Frameworks */,
2FD740A61C3443C20059751B /* EmojiKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -82,14 +77,10 @@
3A8F5EDE1C27285E00F394CA /* AppDelegate.swift */,
3A8F5EE01C27285E00F394CA /* SearchViewController.swift */,
3A8F5EF01C272A8300F394CA /* SearchTextFieldView.swift */,
3AF144BC1C2770F900BA2089 /* Emoji.swift */,
3AE7CF6A1C2A161D00485FB2 /* Store.swift */,
3AF144BE1C27716500BA2089 /* EmojiFetcher.swift */,
3A457AC11C28CD5200C35867 /* Analytics.swift */,
2F5B143B1C32395000461390 /* RateReminder.swift */,
3AE7CF681C2A146600485FB2 /* DictionarySerialization.swift */,
845CA7BB1C31D4CD00BF8F77 /* Key.swift */,
3A267D5C1C28C50C0000D8B1 /* AllEmoji.json */,
3A8F5EE51C27285E00F394CA /* Assets.xcassets */,
3A8F5EE71C27285E00F394CA /* LaunchScreen.storyboard */,
3A8F5EEA1C27285E00F394CA /* Info.plist */,
Expand All @@ -101,6 +92,7 @@
3A8F5EF71C27364300F394CA /* Frameworks */ = {
isa = PBXGroup;
children = (
2FD740A51C3443C20059751B /* EmojiKit.framework */,
2F5B14391C32377300461390 /* iRate.framework */,
3A457ABF1C28CBAD00C35867 /* Mixpanel.framework */,
3A8F5EF51C27363D00F394CA /* SVProgressHUD.framework */,
Expand Down Expand Up @@ -168,7 +160,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3A267D5D1C28C50C0000D8B1 /* AllEmoji.json in Resources */,
3A8F5EE91C27285E00F394CA /* LaunchScreen.storyboard in Resources */,
3A8F5EE61C27285E00F394CA /* Assets.xcassets in Resources */,
);
Expand All @@ -186,6 +177,7 @@
"$(SRCROOT)/Carthage/Build/iOS/SVProgressHUD.framework",
"$(SRCROOT)/Carthage/Build/iOS/Mixpanel.framework",
"$(SRCROOT)/Carthage/Build/iOS/iRate.framework",
"$(SRCROOT)/Carthage/Build/iOS/EmojiKit.framework",
);
name = "Carthage Copy Frameworks";
outputPaths = (
Expand All @@ -207,9 +199,6 @@
2F5B143C1C32395000461390 /* RateReminder.swift in Sources */,
3A457AC21C28CD5200C35867 /* Analytics.swift in Sources */,
3AE7CF6B1C2A161D00485FB2 /* Store.swift in Sources */,
3AE7CF691C2A146600485FB2 /* DictionarySerialization.swift in Sources */,
3AF144BD1C2770F900BA2089 /* Emoji.swift in Sources */,
3AF144BF1C27716500BA2089 /* EmojiFetcher.swift in Sources */,
3A8F5EDF1C27285E00F394CA /* AppDelegate.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
Loading

0 comments on commit 4cf3665

Please sign in to comment.