Add TARGET_OS_UIKITFORMAC conditional code

- Still no project support for Mac yet
- Update build to xcode 10.2

Author: NSProgrammer

.travis.yml

@@ -1,4 +1,4 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
 script:
   ./build.sh

Extended/TIPXWebPCodec.h

@@ -6,6 +6,10 @@
 //  Copyright © 2016 Twitter. All rights reserved.
 //
 
+#include <TargetConditionals.h>
+
+#if !TARGET_OS_UIKITFORMAC
+
 #import <TwitterImagePipeline/TIPImageCodecs.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -27,3 +31,5 @@ FOUNDATION_EXTERN NSString * const TIPXImageTypeWebP;
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif // #if !TARGET_OS_UIKITFORMAC

Extended/TIPXWebPCodec.m

@@ -6,6 +6,10 @@
 //  Copyright © 2016 Twitter. All rights reserved.
 //
 
+#include <TargetConditionals.h>
+
+#if !TARGET_OS_UIKITFORMAC
+
 #import <Accelerate/Accelerate.h>
 #import <TwitterImagePipeline/TwitterImagePipeline.h>
 #import <WebP/decode.h>
@@ -583,3 +587,5 @@ static BOOL TIPXWebPCreateRGBADataForImage(CGImageRef sourceImage,
 }
 
 NS_ASSUME_NONNULL_END
+
+#endif // #if !TARGET_OS_UIKITFORMAC

GraphicsRendererSpeed/ViewController.m

@@ -226,10 +226,20 @@ - (NSTimeInterval)_q_scaleSpeedCheckWithImage:(UIImage *)image dimensions:(CGSiz
                     format = [UIGraphicsImageRendererFormat defaultFormat];
                 }
                 format.opaque = !hasAlpha;
-                if (RenderBehaviorModernForcePrefersWideColorNo == behavior) {
-                    format.prefersExtendedRange = NO;
-                } else if (RenderBehaviorModernForcePrefersWideColorYes == behavior) {
-                    format.prefersExtendedRange = YES;
+                if (@available(iOS 12, *)) {
+                    if (RenderBehaviorModernForcePrefersWideColorNo == behavior) {
+                        format.preferredRange = UIGraphicsImageRendererFormatRangeStandard;
+                    } else if (RenderBehaviorModernForcePrefersWideColorYes == behavior) {
+                        format.preferredRange = UIGraphicsImageRendererFormatRangeExtended;
+                    }
+#if !TARGET_OS_UIKITFORMAC
+                } else {
+                    if (RenderBehaviorModernForcePrefersWideColorNo == behavior) {
+                        format.prefersExtendedRange = NO;
+                    } else if (RenderBehaviorModernForcePrefersWideColorYes == behavior) {
+                        format.prefersExtendedRange = YES;
+                    }
+#endif
                 }
                 format.scale = scale;
             }

ImageSpeedComparison/AppDelegate.m

@@ -22,7 +22,9 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
     [TIPGlobalConfiguration sharedInstance].logger = self;
+#if !TARGET_OS_UIKITFORMAC
     [TIPImageCodecCatalogue sharedInstance][TIPXImageTypeWebP] = [[TIPXWebPCodec alloc] init];
+#endif
     return YES;
 }
 

TIP Sample App/AppDelegate.m

@@ -40,7 +40,9 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     [TIPGlobalConfiguration sharedInstance].serializeCGContextAccess = YES;
     [TIPGlobalConfiguration sharedInstance].clearMemoryCachesOnApplicationBackgroundEnabled = YES;
     [[TIPGlobalConfiguration sharedInstance] addImagePipelineObserver:self];
+#if !TARGET_OS_UIKITFORMAC
     [[TIPImageCodecCatalogue sharedInstance] setCodec:[[TIPXWebPCodec alloc] init] forImageType:TIPXImageTypeWebP];
+#endif
     _imagePipeline = [[TIPImagePipeline alloc] initWithIdentifier:@"Twitter.Example"];
     _imagePipeline.additionalCaches = @[self];
     [TwitterAPI sharedInstance].delegate = self;
@@ -88,14 +90,18 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 - (void)_private_incrementNetworkOperations
 {
     if ((++_opCount) > 0) {
+#if !TARGET_OS_UIKITFORMAC
         [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
+#endif
     }
 }
 
 - (void)_private_decrementNetworkOperations
 {
     if ((--_opCount) <= 0) {
+#if !TARGET_OS_UIKITFORMAC
         [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+#endif
     }
 }
 

TIP Sample App/TwitterAPI.m

@@ -80,13 +80,11 @@ - (void)_api_loadAccount:(dispatch_block_t)complete
         return;
     }
 
-    NSInteger iOSMajorVersion = NSProcessInfo.processInfo.operatingSystemVersion.majorVersion;
-    if (iOSMajorVersion >= 11) { // for when assertions are disabled
-        NSString *reason = [NSString stringWithFormat:@"\n\n=== iOS %ld not supported ==="
-                                                       "\nThis TIP Sample App has not yet been upgraded to run on iOS 11 or later;"
-                                                       "\nit requires iOS Accounts.frameowrk access, which was removed in iOS 11."
-                                                       "\n===\n\n",
-                                                      (long)iOSMajorVersion];
+    if (@available(iOS 11, *)) { // for when assertions are disabled
+        NSString *reason = @"\n\n=== Current iOS not supported ==="
+                            "\nThis TIP Sample App has not yet been upgraded to run on iOS 11 or later;"
+                            "\nit requires iOS Accounts.framework access, which was removed in iOS 11."
+                            "\n===\n\n";
         @throw [NSException exceptionWithName:@"TIPSampleAppRunningOnUnsupportedOSVersion"
                                        reason:reason
                                      userInfo:@{@"OSVersion": NSProcessInfo.processInfo.operatingSystemVersionString}];
@@ -151,7 +149,10 @@ - (void)_api_searchForTerm:(NSString *)term count:(NSUInteger)count complete:(vo
                                  @"adc" : @"phone",
                                  @"q" : term,
                                  };
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
         SLRequest *request = [SLRequest requestForServiceType:SLServiceTypeTwitter requestMethod:SLRequestMethodGET URL:requestURL parameters:params];
+#pragma clang diagnostic pop
         request.account = _account;
         preparedRequest = request.preparedURLRequest;
     }

TIP Sample App/TwitterSearchViewController.m

@@ -115,8 +115,24 @@ - (void)updateSearchResultsForSearchController:(UISearchController *)searchContr
 {
 }
 
+#if TARGET_OS_UIKITFORMAC
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText
+{
+    [NSObject cancelPreviousPerformRequestsWithTarget:self];
+    [self performSelector:@selector(_triggerSearch)
+               withObject:nil
+               afterDelay:0.5];
+}
+#endif
+
 - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar
 {
+    [self _triggerSearch];
+}
+
+- (void)_triggerSearch
+{
+    UISearchBar *searchBar = self.searchController.searchBar;
     NSString *search = searchBar.text;
     _term = search;
     _searchController.active = NO;

TIP Swift Sample App/AppDelegate.swift

@@ -52,8 +52,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, TIPImagePipelineObserver,
         tipConfig.isClearMemoryCachesOnApplicationBackgroundEnabled = true
         tipConfig.add(self)
 
+#if !targetEnvironment(UIKitForMac)
         let catalogue = TIPImageCodecCatalogue.sharedInstance()
         catalogue.setCodec(TIPXWebPCodec.init(), forImageType: TIPXImageTypeWebP)
+#endif
 
         self.imagePipeline = TIPImagePipeline(identifier: "Twitter.Example")
         self.imagePipeline?.additionalCaches = [self]

TIP Swift Sample App/TwitterSearchViewController.swift

@@ -260,8 +260,28 @@ class TwitterSearchViewController: UIViewController, UISearchResultsUpdating, UI
     {
     }
 
+#if targetEnvironment(UIKitForMac)
+    func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String)
+    {
+        NSObject.cancelPreviousPerformRequests(withTarget: self)
+        self.perform(#selector(_triggerSearch),
+                     with: nil,
+                     afterDelay: 0.5)
+    }
+#endif
+
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar)
     {
+        self._triggerSearch()
+    }
+
+    @objc
+    func _triggerSearch()
+    {
+        guard let searchBar = self.searchController?.searchBar else {
+            return
+        }
+
         let search = searchBar.text
         self.term = search
         self.searchController!.isActive = false

TwitterImagePipeline/TIPImageTypes.h

@@ -99,6 +99,7 @@ FOUNDATION_EXTERN NSString * const TIPImageTypeAVCI;
  PICT (QuickDraw image)
  Not supported by __TIP__ by default,
  a custom `TIPImageCodec` would be required to add support.
+ @note PICT images _ARE_ supported on UIKitForMac
  */
 FOUNDATION_EXTERN NSString * const TIPImageTypePICT;
 /**

TwitterImagePipeline/TIPImageUtils.m

@@ -40,7 +40,11 @@ - (instancetype)initWithRendererFormat:(UIGraphicsImageRendererFormat *)format
         if (tip_available_ios_12) {
             _prefersExtendedRange = (format.preferredRange == UIGraphicsImageRendererFormatRangeExtended);
         } else {
+#if TARGET_OS_UIKITFORMAC
+            TIPAssertNever();
+#else
             _prefersExtendedRange = format.prefersExtendedRange;
+#endif
         }
         _opaque = format.opaque;
         _scale = format.scale;
@@ -454,9 +458,14 @@ TIPImageRenderBlock __attribute__((noescape)) renderBlock)
             }
             if (tip_available_ios_12) {
                 format.preferredRange = (formatInternal.prefersExtendedRange) ? UIGraphicsImageRendererFormatRangeExtended : UIGraphicsImageRendererFormatRangeStandard;
-                format.prefersExtendedRange = formatInternal.prefersExtendedRange;
+#if !TARGET_OS_UIKITFORMAC
+                if (tip_available_ios_13) {
+                } else {
+                    format.prefersExtendedRange = formatInternal.prefersExtendedRange;
+                }
             } else {
                 format.prefersExtendedRange = formatInternal.prefersExtendedRange;
+#endif
             }
             if (format.scale != formatInternal.scale) {
                 format.scale = (formatInternal.scale == 0.0) ? [UIScreen mainScreen].scale : formatInternal.scale;

TwitterImagePipelineTests/TIPImageTest.m

@@ -313,7 +313,7 @@ - (void)runSpeedTest:(NSString *)type options:(TIPImageEncodingOptions)options
     for (NSUInteger i = 0; i < 5; i++) {
         @autoreleasepool {
             float quality = 1.0f - ((i % 10) / 10.0f);
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_UIKITFORMAC
             if (type == TIPXImageTypeWebP && quality > .99f) {
                 // Lossless WebP is super slow,
                 // drop down to 99% in order to give WebP a fighting chance
@@ -676,7 +676,11 @@ - (void)testSavePICT
 
 - (void)testXLoadPICT
 {
+#if TARGET_OS_UIKITFORMAC
+    [self runLoadTestForReadOnlyFormat:@"pict" imageType:TIPImageTypePICT];
+#else
     [self runLoadTestForUnreadableFormat:@"pict"];
+#endif
 }
 
 - (void)testSpeedPICT
@@ -763,7 +767,7 @@ - (void)testSpeedRAW
     // unsupported with read only format
 }
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_UIKITFORMAC
 - (void)testSaveWebP
 {
     XCTAssertNil([[TIPImageCodecCatalogue sharedInstance] codecForImageType:TIPXImageTypeWebP]);
@@ -779,7 +783,7 @@ - (void)testSaveWebP
 }
 #endif
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_UIKITFORMAC
 - (void)testXLoadWebP
 {
     [self runLoadTestForUnreadableFormat:@"webp"];
@@ -795,7 +799,7 @@ - (void)testXLoadWebP
 }
 #endif
 
-#if TARGET_OS_IOS
+#if TARGET_OS_IOS && !TARGET_OS_UIKITFORMAC
 - (void)testSpeedWebP
 {
     XCTAssertNil([[TIPImageCodecCatalogue sharedInstance] codecForImageType:@"webp"]);
@@ -1029,7 +1033,11 @@ - (void)testImageType
     XCTAssertFalse(TIPImageTypeCanReadWithImageIO(@"com.canon.cr2-raw-image"));
 #endif
 
+#if TARGET_OS_UIKITFORMAC
+    XCTAssertTrue(TIPImageTypeCanReadWithImageIO(TIPImageTypePICT));
+#else
     XCTAssertFalse(TIPImageTypeCanReadWithImageIO(TIPImageTypePICT));
+#endif
     XCTAssertFalse(TIPImageTypeCanReadWithImageIO(TIPImageTypeQTIF));
     XCTAssertFalse(TIPImageTypeCanReadWithImageIO(TIPImageTypeRAW));
 

TwitterImagePipelineTests/TIPTests.m

@@ -47,10 +47,13 @@ Class TIPTestsImageFetchDownloadProviderOverrideClass()
             for (NSBundle *innerBundle in [NSBundle allBundles]) {
                 if ([innerBundle.bundlePath hasSuffix:@".xctest"]) {
                     bundle = [NSBundle bundleWithPath:[innerBundle.bundlePath stringByAppendingPathComponent:@"TIPTestsResources.bundle"]];
-                    if (bundle) {
-                        break;
+                    if (!bundle) {
+                        bundle = [NSBundle bundleWithPath:[innerBundle.resourcePath stringByAppendingPathComponent:@"TIPTestsResources.bundle"]];
                     }
                 }
+                if (bundle) {
+                    break;
+                }
             }
         }
         sBundle = bundle;