Rename NSString+RKLink to NSString+RKHTML to prevent conflicts.

Fixes issue #71.
samsymons · Aug 3, 2015 · 0100501 · 0100501
1 parent 10315fd
commit 0100501
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Classes/Categories/NSString+HTML.h → Classes/Categories/NSString+RKHTML.h b/Classes/Categories/NSString+HTML.h → Classes/Categories/NSString+RKHTML.h
@@ -21,7 +21,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface NSString (HTML)
+@interface NSString (RKHTML)
 
 - (NSString *)stringByUnescapingHTMLEntities;
 

diff --git a/Classes/Categories/NSString+HTML.m → Classes/Categories/NSString+RKHTML.m b/Classes/Categories/NSString+HTML.m → Classes/Categories/NSString+RKHTML.m
@@ -19,9 +19,9 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#import "NSString+HTML.h"
+#import "NSString+RKHTML.h"
 
-@implementation NSString (HTML)
+@implementation NSString (RKHTML)
 
 - (NSString *)stringByUnescapingHTMLEntities
 {

diff --git a/Classes/Model/RKLink.m b/Classes/Model/RKLink.m
@@ -21,7 +21,7 @@
 // THE SOFTWARE.
 
 #import "RKLink.h"
-#import "NSString+HTML.h"
+#import "NSString+RKHTML.h"
 #import "RKLinkEmbeddedMedia.h"
 
 @implementation RKLink

diff --git a/Tests/Podfile.lock b/Tests/Podfile.lock
@@ -36,13 +36,13 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   RedditKit:
-    :path: ../
+    :path: "../"
 
 SPEC CHECKSUMS:
   AFNetworking: e1d86c2a96bb5d2e7408da36149806706ee122fe
   Expecta: 78b4e8b0c8291fa4524d7f74016b6065c2e391ec
   Mantle: 60acd0cd363e27d945bda0a6b8e90577112d28f3
-  RedditKit: b7310047b97c4ec40cd32c8380ad441b1d901a73
+  RedditKit: a08a7d7b722e61f6669c63ccd92aa709acb09607
   Specta: eb90708ed77569bbda089f8ead10bb99b8e9489e
 
-COCOAPODS: 0.35.0
+COCOAPODS: 0.38.0