Fix all the warnings and re-enable on CI (#1872)

garrettmoon · garrettmoon · commit 06b7b7d236a7 · 2020-06-25T12:47:41.000-07:00
diff --git a/Source/ASControlNode.mm b/Source/ASControlNode.mm
@@ -15,6 +15,9 @@
 #import <AsyncDisplayKit/ASControlTargetAction.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASThread.h>
+#if TARGET_OS_TV
+#import <AsyncDisplayKit/ASControlNode+Private.h>
+#endif
 
 // UIControl allows dragging some distance outside of the control itself during
 // tracking. This value depends on the device idiom (25 or 70 points), so
diff --git a/Source/ASDisplayNode.mm b/Source/ASDisplayNode.mm
@@ -436,7 +436,7 @@ - (void)onDidLoad:(ASDisplayNodeDidLoadBlock)body
 
 - (void)asyncTraitCollectionDidChangeWithPreviousTraitCollection:(ASPrimitiveTraitCollection)previousTraitCollection
 {
-  if (@available(iOS 13.0, *)) {
+  if (@available(iOS 13.0, tvOS 10.0, *)) {
     // When changing between light and dark mode, often the entire node needs to re-render.
     // This change doesn't happen frequently so it's fairly safe to render nodes again
     __instanceLock__.lock();
diff --git a/Source/ASViewController.mm b/Source/ASViewController.mm
@@ -286,7 +286,7 @@ - (ASInterfaceState)interfaceState
 
 - (UIEdgeInsets)additionalSafeAreaInsets
 {
-  if (AS_AVAILABLE_IOS(11.0)) {
+  if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {
     return super.additionalSafeAreaInsets;
   }
 
@@ -295,7 +295,7 @@ - (UIEdgeInsets)additionalSafeAreaInsets
 
 - (void)setAdditionalSafeAreaInsets:(UIEdgeInsets)additionalSafeAreaInsets
 {
-  if (AS_AVAILABLE_IOS(11.0)) {
+  if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {
     [super setAdditionalSafeAreaInsets:additionalSafeAreaInsets];
   } else {
     _fallbackAdditionalSafeAreaInsets = additionalSafeAreaInsets;
diff --git a/Source/Details/ASGraphicsContext.mm b/Source/Details/ASGraphicsContext.mm
@@ -15,7 +15,7 @@
 
 #if AS_AT_LEAST_IOS13
 #define ASPerformBlockWithTraitCollection(work, traitCollection) \
-    if (@available(iOS 13.0, *)) { \
+    if (@available(iOS 13.0, tvOS 13.0, *)) { \
       UITraitCollection *uiTraitCollection = ASPrimitiveTraitCollectionToUITraitCollection(traitCollection); \
       [uiTraitCollection performAsCurrentTraitCollection:^{ \
         work(); \
diff --git a/Source/Details/ASRecursiveUnfairLock.mm b/Source/Details/ASRecursiveUnfairLock.mm
@@ -18,16 +18,19 @@
 #define rul_set_thread(l, t) atomic_store_explicit(&l->_thread, t, memory_order_relaxed)
 #define rul_get_thread(l) atomic_load_explicit(&l->_thread, memory_order_relaxed)
 
+OS_UNFAIR_LOCK_AVAILABILITY
 NS_INLINE void ASRecursiveUnfairLockDidAcquire(ASRecursiveUnfairLock *l, pthread_t tid) {
   NSCAssert(pthread_equal(rul_get_thread(l), NULL) && l->_count == 0, @"Unfair lock error");
   rul_set_thread(l, tid);
 }
 
+OS_UNFAIR_LOCK_AVAILABILITY
 NS_INLINE void ASRecursiveUnfairLockWillRelease(ASRecursiveUnfairLock *l) {
   NSCAssert(pthread_equal(rul_get_thread(l), pthread_self()) && l->_count == 0, @"Unfair lock error");
   rul_set_thread(l, NULL);
 }
 
+OS_UNFAIR_LOCK_AVAILABILITY
 NS_INLINE void ASRecursiveUnfairLockAssertHeld(ASRecursiveUnfairLock *l) {
   NSCAssert(pthread_equal(rul_get_thread(l), pthread_self()) && l->_count > 0, @"Unfair lock error");
 }
diff --git a/Source/Details/ASThread.h b/Source/Details/ASThread.h
@@ -159,7 +159,11 @@ namespace AS {
           success = os_unfair_lock_trylock(&_unfair);
           break;
         case RecursiveUnfair:
-          success = ASRecursiveUnfairLockTryLock(&_runfair);
+          if (@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)) {
+            success = ASRecursiveUnfairLockTryLock(&_runfair);
+          } else {
+            success = _recursive.try_lock();
+          }
           break;
       }
       if (success) {
@@ -180,7 +184,11 @@ namespace AS {
           os_unfair_lock_lock(&_unfair);
           break;
         case RecursiveUnfair:
-          ASRecursiveUnfairLockLock(&_runfair);
+          if (@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)) {
+            ASRecursiveUnfairLockLock(&_runfair);
+          } else {
+            _recursive.lock();
+          }
           break;
       }
       DidLock();
@@ -199,7 +207,11 @@ namespace AS {
           os_unfair_lock_unlock(&_unfair);
           break;
         case RecursiveUnfair:
-          ASRecursiveUnfairLockUnlock(&_runfair);
+          if (@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)) {
+            ASRecursiveUnfairLockUnlock(&_runfair);
+          } else {
+            _recursive.unlock();
+          }
           break;
       }
     }
@@ -225,7 +237,11 @@ namespace AS {
       if (recursive) {
         if (gMutex_unfair) {
           _type = RecursiveUnfair;
-          _runfair = AS_RECURSIVE_UNFAIR_LOCK_INIT;
+          if (@available(macOS 10.12, iOS 10.0, tvOS 10.0, watchOS 3.0, *)) {
+            _runfair = AS_RECURSIVE_UNFAIR_LOCK_INIT;
+          } else {
+            new (&_recursive) std::recursive_mutex();
+          }
         } else {
           _type = Recursive;
           new (&_recursive) std::recursive_mutex();
diff --git a/Source/Details/ASTraitCollection.mm b/Source/Details/ASTraitCollection.mm
@@ -33,7 +33,7 @@ ASPrimitiveTraitCollection ASPrimitiveTraitCollectionMakeDefault() {
   tc.horizontalSizeClass = UIUserInterfaceSizeClassUnspecified;
   tc.verticalSizeClass = UIUserInterfaceSizeClassUnspecified;
   tc.containerSize = CGSizeZero;
-  if (AS_AVAILABLE_IOS(10)) {
+  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
     tc.displayGamut = UIDisplayGamutUnspecified;
     tc.preferredContentSizeCategory = UIContentSizeCategoryUnspecified;
     tc.layoutDirection = UITraitEnvironmentLayoutDirectionUnspecified;
@@ -48,7 +48,7 @@ ASPrimitiveTraitCollection ASPrimitiveTraitCollectionMakeDefault() {
   }
 #endif
 
-  if (AS_AVAILABLE_IOS(13)) {
+  if (AS_AVAILABLE_IOS_TVOS(13, 13)) {
     tc.accessibilityContrast = UIAccessibilityContrastUnspecified;
     tc.legibilityWeight = UILegibilityWeightUnspecified;
   }
@@ -62,7 +62,7 @@ ASPrimitiveTraitCollection ASPrimitiveTraitCollectionFromUITraitCollection(UITra
   environmentTraitCollection.displayScale = traitCollection.displayScale;
   environmentTraitCollection.userInterfaceIdiom = traitCollection.userInterfaceIdiom;
   environmentTraitCollection.forceTouchCapability = traitCollection.forceTouchCapability;
-  if (AS_AVAILABLE_IOS(10)) {
+  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
     environmentTraitCollection.displayGamut = traitCollection.displayGamut;
     environmentTraitCollection.layoutDirection = traitCollection.layoutDirection;
 
@@ -79,7 +79,7 @@ ASPrimitiveTraitCollection ASPrimitiveTraitCollectionFromUITraitCollection(UITra
   }
 #endif
 
-  if (AS_AVAILABLE_IOS(13)) {
+  if (AS_AVAILABLE_IOS_TVOS(13, 13)) {
     environmentTraitCollection.accessibilityContrast = traitCollection.accessibilityContrast;
     environmentTraitCollection.legibilityWeight = traitCollection.legibilityWeight;
   }
@@ -95,7 +95,7 @@ ASPrimitiveTraitCollection ASPrimitiveTraitCollectionFromUITraitCollection(UITra
     [UITraitCollection traitCollectionWithForceTouchCapability:traitCollection.forceTouchCapability],
   ]];
   
-  if (AS_AVAILABLE_IOS(10)) {
+  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
     [collections addObject:[UITraitCollection traitCollectionWithDisplayGamut:traitCollection.displayGamut]];
     [collections addObject:[UITraitCollection traitCollectionWithLayoutDirection:traitCollection.layoutDirection]];
     [collections addObject:[UITraitCollection traitCollectionWithPreferredContentSizeCategory:traitCollection.preferredContentSizeCategory]];
@@ -191,8 +191,9 @@ BOOL ASPrimitiveTraitCollectionIsEqualToASPrimitiveTraitCollection(ASPrimitiveTr
   }
 }
 
+#if TARGET_OS_IOS
 // Named so as not to conflict with a hidden Apple function, in case compiler decides not to inline
-API_AVAILABLE(ios(13)) API_UNAVAILABLE(tvos)
+API_AVAILABLE(ios(13))
 ASDISPLAYNODE_INLINE NSString *AS_NSStringFromUITraitEnvironmentUserInterfaceLevel(UIUserInterfaceLevel userInterfaceLevel) {
   switch (userInterfaceLevel) {
     case UIUserInterfaceLevelBase:
@@ -203,6 +204,7 @@ BOOL ASPrimitiveTraitCollectionIsEqualToASPrimitiveTraitCollection(ASPrimitiveTr
       return @"Unspecified";
   }
 }
+#endif
 
 // Named so as not to conflict with a hidden Apple function, in case compiler decides not to inline
 API_AVAILABLE(ios(13))
@@ -242,7 +244,7 @@ BOOL ASPrimitiveTraitCollectionIsEqualToASPrimitiveTraitCollection(ASPrimitiveTr
   if (AS_AVAILABLE_IOS_TVOS(12, 10)) {
     [props addObject:@{ @"userInterfaceStyle": AS_NSStringFromUIUserInterfaceStyle(traits.userInterfaceStyle) }];
   }
-  if (AS_AVAILABLE_IOS(10)) {
+  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
     [props addObject:@{ @"layoutDirection": AS_NSStringFromUITraitEnvironmentLayoutDirection(traits.layoutDirection) }];
     if (traits.preferredContentSizeCategory != nil) {
       [props addObject:@{ @"preferredContentSizeCategory": traits.preferredContentSizeCategory }];
@@ -256,7 +258,7 @@ BOOL ASPrimitiveTraitCollectionIsEqualToASPrimitiveTraitCollection(ASPrimitiveTr
   }
 #endif
 
-  if (AS_AVAILABLE_IOS(13)) {
+  if (AS_AVAILABLE_IOS_TVOS(13, 13)) {
     [props addObject:@{ @"accessibilityContrast": AS_NSStringFromUITraitEnvironmentAccessibilityContrast(traits.accessibilityContrast) }];
     [props addObject:@{ @"legibilityWeight": AS_NSStringFromUITraitEnvironmentLegibilityWeight(traits.legibilityWeight) }];
   }
@@ -272,7 +274,7 @@ @implementation ASTraitCollection {
 
 + (ASTraitCollection *)traitCollectionWithASPrimitiveTraitCollection:(ASPrimitiveTraitCollection)traits NS_RETURNS_RETAINED {
   ASTraitCollection *tc = [[ASTraitCollection alloc] init];
-  if (AS_AVAILABLE_IOS(10)) {
+  if (AS_AVAILABLE_IOS_TVOS(10, 10)) {
     ASDisplayNodeCAssertPermanent(traits.preferredContentSizeCategory);
   }
   tc->_prim = traits;
diff --git a/Source/Private/ASDisplayNode+UIViewBridge.mm b/Source/Private/ASDisplayNode+UIViewBridge.mm
@@ -1005,7 +1005,7 @@ - (UIEdgeInsets)safeAreaInsets
 {
   _bridge_prologue_read;
 
-  if (AS_AVAILABLE_IOS(11.0)) {
+  if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {
     if (!_flags.layerBacked && _loaded(self)) {
       return self.view.safeAreaInsets;
     }
@@ -1029,7 +1029,7 @@ - (void)setInsetsLayoutMarginsFromSafeArea:(BOOL)insetsLayoutMarginsFromSafeArea
 
     _flags.fallbackInsetsLayoutMarginsFromSafeArea = insetsLayoutMarginsFromSafeArea;
 
-    if (AS_AVAILABLE_IOS(11.0)) {
+    if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {
       if (!_flags.layerBacked) {
         _setToViewOnly(insetsLayoutMarginsFromSafeArea, insetsLayoutMarginsFromSafeArea);
       }
@@ -1106,7 +1106,7 @@ - (void)setLayerMaskedCorners:(CACornerMask)newLayerMaskedCorners
 - (BOOL)_locked_insetsLayoutMarginsFromSafeArea
 {
   DISABLED_ASAssertLocked(__instanceLock__);
-  if (AS_AVAILABLE_IOS(11.0)) {
+  if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {
     if (!_flags.layerBacked) {
       return _getFromViewOnly(insetsLayoutMarginsFromSafeArea);
     }
diff --git a/Source/Private/ASIGListAdapterBasedDataSource.mm b/Source/Private/ASIGListAdapterBasedDataSource.mm
@@ -166,7 +166,7 @@ - (void)collectionNode:(ASCollectionNode *)collectionNode willDisplayItemWithNod
 {
   NSIndexPath *indexPath = [collectionNode.view indexPathForNode:node];
   UIView *contentView = node.view.superview;
-  UICollectionViewCell *cell = contentView.superview;
+  UICollectionViewCell *cell = (UICollectionViewCell *)contentView.superview;
 
   if (cell == nil || indexPath == nil) {
     return;
@@ -179,7 +179,7 @@ - (void)collectionNode:(ASCollectionNode *)collectionNode didEndDisplayingItemWi
 {
   NSIndexPath *indexPath = [collectionNode.view indexPathForNode:node];
   UIView *contentView = node.view.superview;
-  UICollectionViewCell *cell = contentView.superview;
+  UICollectionViewCell *cell = (UICollectionViewCell *)contentView.superview;
 
   if (cell == nil || indexPath == nil) {
     return;
diff --git a/Source/Private/_ASPendingState.mm b/Source/Private/_ASPendingState.mm
@@ -1182,7 +1182,7 @@ - (void)applyToView:(UIView *)view withSpecialPropertiesHandling:(BOOL)specialPr
   if (flags.setPreservesSuperviewLayoutMargins)
     view.preservesSuperviewLayoutMargins = _flags.preservesSuperviewLayoutMargins;
 
-  if (AS_AVAILABLE_IOS(11.0)) {
+  if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {
     if (flags.setInsetsLayoutMarginsFromSafeArea) {
       view.insetsLayoutMarginsFromSafeArea = _flags.insetsLayoutMarginsFromSafeArea;
     }
diff --git a/Source/UIImage+ASConvenience.mm b/Source/UIImage+ASConvenience.mm
@@ -30,7 +30,7 @@ @implementation UIImage (ASDKFastImageNamed)
     NSString *imageKey = imageName;
     if (traitCollection) {
       char imageKeyBuffer[256];
-      if (@available(iOS 12.0, *)) {
+      if (@available(iOS 12.0, tvOS 10.0, *)) {
         snprintf(imageKeyBuffer, sizeof(imageKeyBuffer), "%s|%ld|%ld|%ld", imageName.UTF8String, (long)traitCollection.horizontalSizeClass, (long)traitCollection.verticalSizeClass, (long)traitCollection.userInterfaceStyle);
       } else {
         // Fallback on earlier versions
diff --git a/Texture.podspec b/Texture.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
 
   # Subspecs
   spec.subspec 'Core' do |core|
-    core.compiler_flags = '-fno-exceptions -Wno-implicit-retain-self'
+    core.compiler_flags = '-fno-exceptions'
     core.public_header_files = [
       'Source/*.h',
       'Source/Details/**/*.h',
diff --git a/build.sh b/build.sh
@@ -66,7 +66,7 @@ function build_example {
 
 # Lint subspec
 function lint_subspec {
-    set -o pipefail && pod env && pod lib lint --allow-warnings --subspec="$1"
+    set -o pipefail && pod env && pod lib lint --subspec="$1"
 }
 
 function cleanup {
@@ -218,7 +218,7 @@ framework|all)
 cocoapods-lint|all)
     echo "Verifying that podspec lints."
 
-    set -o pipefail && pod env && pod lib lint --allow-warnings
+    set -o pipefail && pod env && pod lib lint
     success="1"
     ;;
 

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ - (void)onDidLoad:(ASDisplayNodeDidLoadBlock)body`
`436`	`436`
`437`	`437`	`- (void)asyncTraitCollectionDidChangeWithPreviousTraitCollection:(ASPrimitiveTraitCollection)previousTraitCollection`
`438`	`438`	`{`
`439`		`- if (@available(iOS 13.0, *)) {`
	`439`	`+ if (@available(iOS 13.0, tvOS 10.0, *)) {`
`440`	`440`	`// When changing between light and dark mode, often the entire node needs to re-render.`
`441`	`441`	`// This change doesn't happen frequently so it's fairly safe to render nodes again`
`442`	`442`	`__instanceLock__.lock();`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ - (ASInterfaceState)interfaceState`
`286`	`286`
`287`	`287`	`- (UIEdgeInsets)additionalSafeAreaInsets`
`288`	`288`	`{`
`289`		`- if (AS_AVAILABLE_IOS(11.0)) {`
	`289`	`+ if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {`
`290`	`290`	`return super.additionalSafeAreaInsets;`
`291`	`291`	`}`
`292`	`292`
`@@ -295,7 +295,7 @@ - (UIEdgeInsets)additionalSafeAreaInsets`
`295`	`295`
`296`	`296`	`- (void)setAdditionalSafeAreaInsets:(UIEdgeInsets)additionalSafeAreaInsets`
`297`	`297`	`{`
`298`		`- if (AS_AVAILABLE_IOS(11.0)) {`
	`298`	`+ if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {`
`299`	`299`	`[super setAdditionalSafeAreaInsets:additionalSafeAreaInsets];`
`300`	`300`	`} else {`
`301`	`301`	`_fallbackAdditionalSafeAreaInsets = additionalSafeAreaInsets;`
Original file line number	Diff line number	Diff line change
`@@ -18,16 +18,19 @@`
`18`	`18`	`#define rul_set_thread(l, t) atomic_store_explicit(&l->_thread, t, memory_order_relaxed)`
`19`	`19`	`#define rul_get_thread(l) atomic_load_explicit(&l->_thread, memory_order_relaxed)`
`20`	`20`
	`21`	`+OS_UNFAIR_LOCK_AVAILABILITY`
`21`	`22`	`NS_INLINE void ASRecursiveUnfairLockDidAcquire(ASRecursiveUnfairLock *l, pthread_t tid) {`
`22`	`23`	`NSCAssert(pthread_equal(rul_get_thread(l), NULL) && l->_count == 0, @"Unfair lock error");`
`23`	`24`	`rul_set_thread(l, tid);`
`24`	`25`	`}`
`25`	`26`
	`27`	`+OS_UNFAIR_LOCK_AVAILABILITY`
`26`	`28`	`NS_INLINE void ASRecursiveUnfairLockWillRelease(ASRecursiveUnfairLock *l) {`
`27`	`29`	`NSCAssert(pthread_equal(rul_get_thread(l), pthread_self()) && l->_count == 0, @"Unfair lock error");`
`28`	`30`	`rul_set_thread(l, NULL);`
`29`	`31`	`}`
`30`	`32`
	`33`	`+OS_UNFAIR_LOCK_AVAILABILITY`
`31`	`34`	`NS_INLINE void ASRecursiveUnfairLockAssertHeld(ASRecursiveUnfairLock *l) {`
`32`	`35`	`NSCAssert(pthread_equal(rul_get_thread(l), pthread_self()) && l->_count > 0, @"Unfair lock error");`
`33`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ - (UIEdgeInsets)safeAreaInsets`
`1005`	`1005`	`{`
`1006`	`1006`	`_bridge_prologue_read;`
`1007`	`1007`
`1008`		`- if (AS_AVAILABLE_IOS(11.0)) {`
	`1008`	`+ if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {`
`1009`	`1009`	`if (!_flags.layerBacked && _loaded(self)) {`
`1010`	`1010`	`return self.view.safeAreaInsets;`
`1011`	`1011`	`}`
`@@ -1029,7 +1029,7 @@ - (void)setInsetsLayoutMarginsFromSafeArea:(BOOL)insetsLayoutMarginsFromSafeArea`
`1029`	`1029`
`1030`	`1030`	`_flags.fallbackInsetsLayoutMarginsFromSafeArea = insetsLayoutMarginsFromSafeArea;`
`1031`	`1031`
`1032`		`- if (AS_AVAILABLE_IOS(11.0)) {`
	`1032`	`+ if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {`
`1033`	`1033`	`if (!_flags.layerBacked) {`
`1034`	`1034`	`_setToViewOnly(insetsLayoutMarginsFromSafeArea, insetsLayoutMarginsFromSafeArea);`
`1035`	`1035`	`}`
`@@ -1106,7 +1106,7 @@ - (void)setLayerMaskedCorners:(CACornerMask)newLayerMaskedCorners`
`1106`	`1106`	`- (BOOL)_locked_insetsLayoutMarginsFromSafeArea`
`1107`	`1107`	`{`
`1108`	`1108`	`DISABLED_ASAssertLocked(__instanceLock__);`
`1109`		`- if (AS_AVAILABLE_IOS(11.0)) {`
	`1109`	`+ if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {`
`1110`	`1110`	`if (!_flags.layerBacked) {`
`1111`	`1111`	`return _getFromViewOnly(insetsLayoutMarginsFromSafeArea);`
`1112`	`1112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1182,7 +1182,7 @@ - (void)applyToView:(UIView *)view withSpecialPropertiesHandling:(BOOL)specialPr`
`1182`	`1182`	`if (flags.setPreservesSuperviewLayoutMargins)`
`1183`	`1183`	`view.preservesSuperviewLayoutMargins = _flags.preservesSuperviewLayoutMargins;`
`1184`	`1184`
`1185`		`- if (AS_AVAILABLE_IOS(11.0)) {`
	`1185`	`+ if (AS_AVAILABLE_IOS_TVOS(11.0, 11.0)) {`
`1186`	`1186`	`if (flags.setInsetsLayoutMarginsFromSafeArea) {`
`1187`	`1187`	`view.insetsLayoutMarginsFromSafeArea = _flags.insetsLayoutMarginsFromSafeArea;`
`1188`	`1188`	`}`