Remove branches for iOS < 7 code

CHANGELOG.md

@@ -2,6 +2,7 @@
 * Add your own contributions to the next release on the line below this with your name.
 - [iOS11] Fix warnings [#428](https://github.com/pinterest/PINRemoteImage/pull/428) [Eke](https://github.com/Eke)
 - [new] Add support for higher frame rate devices to animated images. [#417](https://github.com/pinterest/PINRemoteImage/pull/417) [garrettmoon](https://github.com/garrettmoon)
+- Remove unused code that supported iOS < 7. [#435](https://github.com/pinterest/PINRemoteImage/pull/435) [Adlai-Holler](https://github.com/Adlai-Holler)
 
 ## 3.0.0 Beta 13
 - [new] Support for webp and improved support for GIFs. [#411](https://github.com/pinterest/PINRemoteImage/pull/411) [garrettmoon](https://github.com/garrettmoon)

Carthage/Checkouts/PINCache/Source/PINDiskCache.m

@@ -297,22 +297,12 @@ - (PINDiskCacheKeyEncoderBlock)defaultKeyEncoder
             return @"";
         }
 
-        if (@available(macOS 10.9, iOS 7.0, tvOS 9.0, watchOS 2.0, *)) {
-            NSString *encodedString = [decodedKey stringByAddingPercentEncodingWithAllowedCharacters:[[NSCharacterSet characterSetWithCharactersInString:@".:/%"] invertedSet]];
-            return encodedString;
-        } else {
-            CFStringRef static const charsToEscape = CFSTR(".:/%");
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-            CFStringRef escapedString = CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault,
-                                                                                (__bridge CFStringRef)decodedKey,
-                                                                                NULL,
-                                                                                charsToEscape,
-                                                                                kCFStringEncodingUTF8);
-#pragma clang diagnostic pop
-
-            return (__bridge_transfer NSString *)escapedString;
-        }
+        static NSCharacterSet *allowedChars;
+        static dispatch_once_t onceToken;
+        dispatch_once(&onceToken, ^{
+            allowedChars = [NSCharacterSet characterSetWithCharactersInString:@".:/%"].invertedSet;
+        });
+        return [decodedKey stringByAddingPercentEncodingWithAllowedCharacters:allowedChars];
     };
 }
 
@@ -323,18 +313,7 @@ - (PINDiskCacheKeyEncoderBlock)defaultKeyDecoder
             return @"";
         }
 
-        if (@available(macOS 10.9, iOS 7.0, tvOS 9.0, watchOS 2.0, *)) {
-            return [encodedKey stringByRemovingPercentEncoding];
-        } else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-            CFStringRef unescapedString = CFURLCreateStringByReplacingPercentEscapesUsingEncoding(kCFAllocatorDefault,
-                                                                                                  (__bridge CFStringRef)encodedKey,
-                                                                                                  CFSTR(""),
-                                                                                                  kCFStringEncodingUTF8);
-#pragma clang diagnostic pop
-            return (__bridge_transfer NSString *)unescapedString;
-        }
+        return [encodedKey stringByRemovingPercentEncoding];
     };
 }