Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4a1ec96

Browse files
author
ignacio
committed
Merge branch 'hankbao-carthage-support-fix'
2 parents 8cacad1 + 391431e commit 4a1ec96

8 files changed

Lines changed: 22 additions & 4 deletions

File tree

Examples/Builder/SlackTextViewController.xcodeproj/project.pbxproj renamed to Carthage/SlackTextViewController.xcodeproj/project.pbxproj

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
48C64A351ABA222C00021C91 /* SlackTextViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 48C64A211ABA222C00021C91 /* SlackTextViewController.h */; };
10+
48C64A351ABA222C00021C91 /* SlackTextViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 48C64A211ABA222C00021C91 /* SlackTextViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
11+
4F2252CC1B0CFC6800902E58 /* UIResponder+SLKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2252CA1B0CFC6800902E58 /* UIResponder+SLKAdditions.h */; settings = {ATTRIBUTES = (Private, ); }; };
12+
4F2252CD1B0CFC6800902E58 /* UIResponder+SLKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F2252CB1B0CFC6800902E58 /* UIResponder+SLKAdditions.m */; };
1113
4F8B71541ABC9189006594B9 /* SLKTextView+SLKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8B71421ABC9189006594B9 /* SLKTextView+SLKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
1214
4F8B71551ABC9189006594B9 /* SLKTextView+SLKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F8B71431ABC9189006594B9 /* SLKTextView+SLKAdditions.m */; };
13-
4F8B71561ABC9189006594B9 /* SLKUIConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8B71441ABC9189006594B9 /* SLKUIConstants.h */; };
15+
4F8B71561ABC9189006594B9 /* SLKUIConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8B71441ABC9189006594B9 /* SLKUIConstants.h */; settings = {ATTRIBUTES = (Public, ); }; };
1416
4F8B71571ABC9189006594B9 /* UIScrollView+SLKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8B71451ABC9189006594B9 /* UIScrollView+SLKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
1517
4F8B71581ABC9189006594B9 /* UIScrollView+SLKAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4F8B71461ABC9189006594B9 /* UIScrollView+SLKAdditions.m */; };
1618
4F8B71591ABC9189006594B9 /* UIView+SLKAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F8B71471ABC9189006594B9 /* UIView+SLKAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -44,6 +46,8 @@
4446
48C64A031ABA215600021C91 /* SlackTextViewController.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SlackTextViewController.framework; sourceTree = BUILT_PRODUCTS_DIR; };
4547
48C64A1F1ABA221E00021C91 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SlackTextViewController/Info.plist; sourceTree = SOURCE_ROOT; };
4648
48C64A211ABA222C00021C91 /* SlackTextViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SlackTextViewController.h; path = SlackTextViewController/SlackTextViewController.h; sourceTree = SOURCE_ROOT; };
49+
4F2252CA1B0CFC6800902E58 /* UIResponder+SLKAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIResponder+SLKAdditions.h"; sourceTree = "<group>"; };
50+
4F2252CB1B0CFC6800902E58 /* UIResponder+SLKAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIResponder+SLKAdditions.m"; sourceTree = "<group>"; };
4751
4F8B71421ABC9189006594B9 /* SLKTextView+SLKAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SLKTextView+SLKAdditions.h"; sourceTree = "<group>"; };
4852
4F8B71431ABC9189006594B9 /* SLKTextView+SLKAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SLKTextView+SLKAdditions.m"; sourceTree = "<group>"; };
4953
4F8B71441ABC9189006594B9 /* SLKUIConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SLKUIConstants.h; sourceTree = "<group>"; };
@@ -131,7 +135,7 @@
131135
4F8B71491ABC9189006594B9 /* Classes */,
132136
);
133137
name = Source;
134-
path = ../../Source;
138+
path = ../Source;
135139
sourceTree = SOURCE_ROOT;
136140
};
137141
4F8B71411ABC9189006594B9 /* Additions */ = {
@@ -144,6 +148,8 @@
144148
4F8B71461ABC9189006594B9 /* UIScrollView+SLKAdditions.m */,
145149
4F8B71471ABC9189006594B9 /* UIView+SLKAdditions.h */,
146150
4F8B71481ABC9189006594B9 /* UIView+SLKAdditions.m */,
151+
4F2252CA1B0CFC6800902E58 /* UIResponder+SLKAdditions.h */,
152+
4F2252CB1B0CFC6800902E58 /* UIResponder+SLKAdditions.m */,
147153
);
148154
path = Additions;
149155
sourceTree = "<group>";
@@ -203,6 +209,7 @@
203209
4F8B71591ABC9189006594B9 /* UIView+SLKAdditions.h in Headers */,
204210
4F8B71541ABC9189006594B9 /* SLKTextView+SLKAdditions.h in Headers */,
205211
4F8B715F1ABC9189006594B9 /* SLKTextView.h in Headers */,
212+
4F2252CC1B0CFC6800902E58 /* UIResponder+SLKAdditions.h in Headers */,
206213
48C64A351ABA222C00021C91 /* SlackTextViewController.h in Headers */,
207214
4F8B71611ABC9189006594B9 /* SLKTextViewController.h in Headers */,
208215
4F8B715D1ABC9189006594B9 /* SLKTextInputbar.h in Headers */,
@@ -313,6 +320,7 @@
313320
4F8B71601ABC9189006594B9 /* SLKTextView.m in Sources */,
314321
4F8B71551ABC9189006594B9 /* SLKTextView+SLKAdditions.m in Sources */,
315322
4F8B715C1ABC9189006594B9 /* SLKInputAccessoryView.m in Sources */,
323+
4F2252CD1B0CFC6800902E58 /* UIResponder+SLKAdditions.m in Sources */,
316324
4F8B715E1ABC9189006594B9 /* SLKTextInputbar.m in Sources */,
317325
);
318326
runOnlyForDeploymentPostprocessing = 0;

Examples/Builder/SlackTextViewController.xcodeproj/xcshareddata/xcschemes/SlackTextViewController.xcscheme renamed to Carthage/SlackTextViewController.xcodeproj/xcshareddata/xcschemes/SlackTextViewController.xcscheme

File renamed without changes.

Examples/Builder/SlackTextViewController.xcworkspace/contents.xcworkspacedata renamed to Carthage/SlackTextViewController.xcworkspace/contents.xcworkspacedata

File renamed without changes.

Examples/Builder/SlackTextViewController.xcworkspace/xcshareddata/SlackTextViewController.xccheckout renamed to Carthage/SlackTextViewController.xcworkspace/xcshareddata/SlackTextViewController.xccheckout

File renamed without changes.

Examples/Builder/SlackTextViewController/Info.plist renamed to Carthage/SlackTextViewController/Info.plist

File renamed without changes.

Examples/Builder/SlackTextViewController/SlackTextViewController.h renamed to Carthage/SlackTextViewController/SlackTextViewController.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,14 @@
1717
#import <UIKit/UIKit.h>
1818

1919
FOUNDATION_EXPORT double SlackTextViewControllerVersionNumber;
20-
FOUNDATION_EXPORT const unsigned char SlackTextViewControllerVersionString[];
20+
FOUNDATION_EXPORT const unsigned char SlackTextViewControllerVersionString[];
21+
22+
#import <SlackTextViewController/SLKUIConstants.h>
23+
#import <SlackTextViewController/SLKTextViewController.h>
24+
#import <SlackTextViewController/SLKTextView.h>
25+
#import <SlackTextViewController/SLKTextInputbar.h>
26+
#import <SlackTextViewController/SLKInputAccessoryView.h>
27+
#import <SlackTextViewController/SLKTypingIndicatorView.h>
28+
#import <SlackTextViewController/UIView+SLKAdditions.h>
29+
#import <SlackTextViewController/UIScrollView+SLKAdditions.h>
30+
#import <SlackTextViewController/SLKTextView+SLKAdditions.h>

Examples/Builder/SlackTextViewControllerTests/Info.plist renamed to Carthage/SlackTextViewControllerTests/Info.plist

File renamed without changes.

Examples/Builder/SlackTextViewControllerTests/SlackTextViewControllerTests.m renamed to Carthage/SlackTextViewControllerTests/SlackTextViewControllerTests.m

File renamed without changes.

0 commit comments

Comments
 (0)