Convert the codebase to Objective-C++ (#1206)

* Convert the codebase to Objective-C++ throughout. One language is better than two.

* Put it back

* Fix linker

* Point explicitly to updated Weaver to unblock build

* Revert "Point explicitly to updated Weaver to unblock build"

This reverts commit fdc25296e8794d4e6e56c35f5fe6da2be3f71dbc.

* Revert "Fix linker"

This reverts commit 7be25f91519b8497ef42de79f115bcfbdb965c39.

* Add in the frameworks

* no message

* Address spec lint warnings

* Fix tvos build

* Put that back

* Address Michael's review

* Add comment to kick CI

CHANGELOG.md

@@ -70,6 +70,7 @@
 - Correct linePositionModifier behavior [Michael Schneider](https://github.com/maicki)[#1192] (https://github.com/TextureGroup/Texture/pull/1192)
 - Tweak a11y label aggregation behavior to enable container label overrides [Michael Schneider](https://github.com/maicki)[#1199] (https://github.com/TextureGroup/Texture/pull/1199)
 - Fix logic cleaning data if delegate / dataSource changes and bring over logic to ASTableView [Michael Schneider](https://github.com/maicki)[#1200] (https://github.com/TextureGroup/Texture/pull/1200)
+- Standardize the code base on Objective-C++. We will still not leak any C++ into public headers, however. [Adlai Holler](https://github.com/Adlai-Holler)
 
 ## 2.7
 - Fix pager node for interface coalescing. [Max Wang](https://github.com/wsdwsd0829) [#877](https://github.com/TextureGroup/Texture/pull/877)

Source/ASCGImageBuffer.mm

@@ -1,5 +1,5 @@
 //
-//  ASCGImageBuffer.m
+//  ASCGImageBuffer.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/ASCollections.mm

@@ -1,12 +1,12 @@
 //
-//  ASCollections.m
+//  ASCollections.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASCollections.h"
+#import <AsyncDisplayKit/ASCollections.h>
 
 /**
  * A private allocator that signals to our retain callback to skip the retain.

Source/ASConfiguration.mm

@@ -1,5 +1,5 @@
 //
-//  ASConfiguration.m
+//  ASConfiguration.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/ASConfigurationInternal.mm

@@ -1,5 +1,5 @@
 //
-//  ASConfigurationInternal.m
+//  ASConfigurationInternal.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/ASDisplayNode+Convenience.mm

@@ -1,5 +1,5 @@
 //
-//  ASDisplayNode+Convenience.m
+//  ASDisplayNode+Convenience.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/ASExperimentalFeatures.mm

@@ -1,5 +1,5 @@
 //
-//  ASExperimentalFeatures.m
+//  ASExperimentalFeatures.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/ASNavigationController.mm

@@ -1,5 +1,5 @@
 //
-//  ASNavigationController.m
+//  ASNavigationController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/ASNetworkImageLoadInfo.mm

@@ -1,5 +1,5 @@
 //
-//  ASNetworkImageLoadInfo.m
+//  ASNetworkImageLoadInfo.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/ASPagerFlowLayout.mm

@@ -1,5 +1,5 @@
 //
-//  ASPagerFlowLayout.m
+//  ASPagerFlowLayout.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/ASPagerNode.mm

@@ -1,5 +1,5 @@
 //
-//  ASPagerNode.m
+//  ASPagerNode.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/ASTabBarController.mm

@@ -1,5 +1,5 @@
 //
-//  ASTabBarController.m
+//  ASTabBarController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/ASVideoPlayerNode.h

@@ -216,4 +216,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 NS_ASSUME_NONNULL_END
-#endif
+#endif  // TARGET_OS_IOS

Source/ASVisibilityProtocols.mm

@@ -1,5 +1,5 @@
 //
-//  ASVisibilityProtocols.m
+//  ASVisibilityProtocols.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Base/ASAssert.mm

@@ -1,5 +1,5 @@
 //
-//  ASAssert.m
+//  ASAssert.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
@@ -39,19 +39,19 @@ static pthread_key_t ASMainThreadAssertionsDisabledKey() {
 }
 
 BOOL ASMainThreadAssertionsAreDisabled() {
-  return (pthread_getspecific(ASMainThreadAssertionsDisabledKey()) > 0);
+  return (nullptr != pthread_getspecific(ASMainThreadAssertionsDisabledKey()));
 }
 
 void ASPushMainThreadAssertionsDisabled() {
   let key = ASMainThreadAssertionsDisabledKey();
-  let oldVal = pthread_getspecific(key);
+  let oldVal = (intptr_t)pthread_getspecific(key);
-  pthread_setspecific(key, oldVal + 1);
+  pthread_setspecific(key, (void *)(oldVal + 1));
 }
 
 void ASPopMainThreadAssertionsDisabled() {
   let key = ASMainThreadAssertionsDisabledKey();
-  let oldVal = pthread_getspecific(key);
+  let oldVal = (intptr_t)pthread_getspecific(key);
-  pthread_setspecific(key, oldVal - 1);
+  pthread_setspecific(key, (void *)(oldVal - 1));
   ASDisplayNodeCAssert(oldVal > 0, @"Attempt to pop thread assertion-disabling without corresponding push.");
 }
 

Source/Base/ASBaseDefines.h

@@ -12,6 +12,7 @@
 #define AS_EXTERN FOUNDATION_EXTERN
 #define unowned __unsafe_unretained
 
+// TODO: Remove these now that we're all-C++.
 #if defined(__cplusplus)
 # define var auto
 # define let const auto

Source/Base/ASDisplayNode+Ancestry.mm

@@ -1,5 +1,5 @@
 //
-//  ASDisplayNode+Ancestry.m
+//  ASDisplayNode+Ancestry.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Base/ASLog.mm

@@ -1,5 +1,5 @@
 //
-//  ASLog.m
+//  ASLog.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Debug/AsyncDisplayKit+Debug.mm

@@ -1,5 +1,5 @@
 //
-//  AsyncDisplayKit+Debug.m
+//  AsyncDisplayKit+Debug.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Debug/AsyncDisplayKit+Tips.mm

@@ -1,5 +1,5 @@
 //
-//  AsyncDisplayKit+Tips.m
+//  AsyncDisplayKit+Tips.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "AsyncDisplayKit+Tips.h"
+#import <AsyncDisplayKit/AsyncDisplayKit+Tips.h>
 #import <AsyncDisplayKit/ASDisplayNode+Ancestry.h>
 
 @implementation ASDisplayNode (Tips)

Source/Details/ASBatchContext.mm

@@ -1,5 +1,5 @@
 //
-//  ASBatchContext.m
+//  ASBatchContext.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASCollectionFlowLayoutDelegate.mm

@@ -1,5 +1,5 @@
 //
-//  ASCollectionFlowLayoutDelegate.m
+//  ASCollectionFlowLayoutDelegate.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASCollectionLayoutContext.mm

@@ -1,5 +1,5 @@
 //
-//  ASCollectionLayoutContext.m
+//  ASCollectionLayoutContext.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Details/ASCollectionViewLayoutController.mm

@@ -1,5 +1,5 @@
 //
-//  ASCollectionViewLayoutController.m
+//  ASCollectionViewLayoutController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASCollectionViewLayoutInspector.mm

@@ -1,5 +1,5 @@
 //
-//  ASCollectionViewLayoutInspector.m
+//  ASCollectionViewLayoutInspector.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASDelegateProxy.mm

@@ -1,5 +1,5 @@
 //
-//  ASDelegateProxy.m
+//  ASDelegateProxy.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASElementMap.mm

@@ -1,5 +1,5 @@
 //
-//  ASElementMap.m
+//  ASElementMap.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASElementMap.h"
+#import <AsyncDisplayKit/ASElementMap.h>
 #import <UIKit/UIKit.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASTwoDimensionalArrayUtils.h>

Source/Details/ASGraphicsContext.mm

@@ -1,12 +1,12 @@
 //
-//  ASGraphicsContext.m
+//  ASGraphicsContext.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASGraphicsContext.h"
+#import <AsyncDisplayKit/ASGraphicsContext.h>
 #import <AsyncDisplayKit/ASCGImageBuffer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASConfigurationInternal.h>

Source/Details/ASHashing.mm

@@ -1,5 +1,5 @@
 //
-//  ASHashing.m
+//  ASHashing.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Details/ASImageContainerProtocolCategories.mm

@@ -1,5 +1,5 @@
 //
-//  ASImageContainerProtocolCategories.m
+//  ASImageContainerProtocolCategories.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASMutableAttributedStringBuilder.mm

@@ -1,5 +1,5 @@
 //
-//  ASMutableAttributedStringBuilder.m
+//  ASMutableAttributedStringBuilder.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASObjectDescriptionHelpers.mm

@@ -1,5 +1,5 @@
 //
-//  ASObjectDescriptionHelpers.m
+//  ASObjectDescriptionHelpers.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASPINRemoteImageDownloader.mm

@@ -1,5 +1,5 @@
 //
-//  ASPINRemoteImageDownloader.m
+//  ASPINRemoteImageDownloader.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASPageTable.mm

@@ -1,5 +1,5 @@
 //
-//  ASPageTable.m
+//  ASPageTable.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Details/ASPhotosFrameworkImageRequest.mm

@@ -1,5 +1,5 @@
 //
-//  ASPhotosFrameworkImageRequest.m
+//  ASPhotosFrameworkImageRequest.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASRecursiveUnfairLock.mm

@@ -1,5 +1,5 @@
 //
-//  ASRecursiveUnfairLock.m
+//  ASRecursiveUnfairLock.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Details/ASScrollDirection.mm

@@ -1,5 +1,5 @@
 //
-//  ASScrollDirection.m
+//  ASScrollDirection.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASTableLayoutController.mm

@@ -1,5 +1,5 @@
 //
-//  ASTableLayoutController.m
+//  ASTableLayoutController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASTraceEvent.mm

@@ -1,5 +1,5 @@
 //
-//  ASTraceEvent.m
+//  ASTraceEvent.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASTraitCollection.mm

@@ -1,5 +1,5 @@
 //
-//  ASTraitCollection.m
+//  ASTraitCollection.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASWeakProxy.mm

@@ -1,5 +1,5 @@
 //
-//  ASWeakProxy.m
+//  ASWeakProxy.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/ASWeakSet.mm

@@ -1,5 +1,5 @@
 //
-//  ASWeakSet.m
+//  ASWeakSet.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/CoreGraphics+ASConvenience.m

@@ -1,11 +0,0 @@
-//
-//  CoreGraphics+ASConvenience.m
-//  Texture
-//
-//  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
-//  Changes after 4/13/2017 are: Copyright (c) Pinterest, Inc.  All rights reserved.
-//  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
-//
-
-#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>
-

Source/Details/NSIndexSet+ASHelpers.mm

@@ -1,5 +1,5 @@
 //
-//  NSIndexSet+ASHelpers.m
+//  NSIndexSet+ASHelpers.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/NSMutableAttributedString+TextKitAdditions.mm

@@ -1,5 +1,5 @@
 //
-//  NSMutableAttributedString+TextKitAdditions.m
+//  NSMutableAttributedString+TextKitAdditions.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/Transactions/_ASAsyncTransactionContainer.mm

@@ -1,5 +1,5 @@
 //
-//  _ASAsyncTransactionContainer.m
+//  _ASAsyncTransactionContainer.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/Transactions/_ASAsyncTransactionGroup.mm

@@ -1,5 +1,5 @@
 //
-//  _ASAsyncTransactionGroup.m
+//  _ASAsyncTransactionGroup.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/UICollectionViewLayout+ASConvenience.mm

@@ -1,5 +1,5 @@
 //
-//  UICollectionViewLayout+ASConvenience.m
+//  UICollectionViewLayout+ASConvenience.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Details/_ASCollectionReusableView.mm

@@ -1,5 +1,5 @@
 //
-//  _ASCollectionReusableView.m
+//  _ASCollectionReusableView.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,8 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "_ASCollectionReusableView.h"
+#import <AsyncDisplayKit/_ASCollectionReusableView.h>
+
 #import <AsyncDisplayKit/ASCellNode+Internal.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 

Source/Details/_ASCollectionViewCell.mm

@@ -1,5 +1,5 @@
 //
-//  _ASCollectionViewCell.m
+//  _ASCollectionViewCell.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,8 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "_ASCollectionViewCell.h"
+#import <AsyncDisplayKit/_ASCollectionViewCell.h>
+
 #import <AsyncDisplayKit/ASCellNode+Internal.h>
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>

Source/IGListAdapter+AsyncDisplayKit.mm

@@ -1,5 +1,5 @@
 //
-//  IGListAdapter+AsyncDisplayKit.m
+//  IGListAdapter+AsyncDisplayKit.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -11,9 +11,9 @@
 
 #if AS_IG_LIST_KIT
 
-#import "IGListAdapter+AsyncDisplayKit.h"
+#import <AsyncDisplayKit/IGListAdapter+AsyncDisplayKit.h>
-#import "ASIGListAdapterBasedDataSource.h"
+#import <AsyncDisplayKit/ASIGListAdapterBasedDataSource.h>
-#import "ASAssert.h"
+#import <AsyncDisplayKit/ASAssert.h>
 #import <objc/runtime.h>
 
 @implementation IGListAdapter (AsyncDisplayKit)

Source/Layout/ASAsciiArtBoxCreator.mm

@@ -1,5 +1,5 @@
 //
-//  ASAsciiArtBoxCreator.m
+//  ASAsciiArtBoxCreator.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -10,7 +10,7 @@
 #import <AsyncDisplayKit/ASAsciiArtBoxCreator.h>
 
 #import <CoreGraphics/CoreGraphics.h>
-#import <tgmath.h>
+#import <cmath>
 
 static const NSUInteger kDebugBoxPadding = 2;
 

Source/Private/ASBatchFetching.mm

@@ -1,5 +1,5 @@
 //
-//  ASBatchFetching.m
+//  ASBatchFetching.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASCollectionLayoutDefines.mm

@@ -1,5 +1,5 @@
 //
-//  ASCollectionLayoutDefines.m
+//  ASCollectionLayoutDefines.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Private/ASCollectionViewFlowLayoutInspector.mm

@@ -1,5 +1,5 @@
 //
-//  ASCollectionViewFlowLayoutInspector.m
+//  ASCollectionViewFlowLayoutInspector.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASControlTargetAction.mm

@@ -1,5 +1,5 @@
 //
-//  ASControlTargetAction.m
+//  ASControlTargetAction.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASDefaultPlayButton.mm

@@ -1,5 +1,5 @@
 //
-//  ASDefaultPlayButton.m
+//  ASDefaultPlayButton.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASDefaultPlaybackButton.mm

@@ -1,5 +1,5 @@
 //
-//  ASDefaultPlaybackButton.m
+//  ASDefaultPlaybackButton.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASDispatch.mm

@@ -1,5 +1,5 @@
 //
-//  ASDispatch.m
+//  ASDispatch.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.
@@ -7,6 +7,8 @@
 //
 
 #import <AsyncDisplayKit/ASDispatch.h>
+
+// Prefer C atomics in this file because ObjC blocks can't capture C++ atomics well.
 #import <stdatomic.h>
 
 /**

Source/Private/ASDisplayNodeCornerLayerDelegate.mm

@@ -1,5 +1,5 @@
 //
-//  ASDisplayNodeCornerLayerDelegate.m
+//  ASDisplayNodeCornerLayerDelegate.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASDisplayNodeTipState.mm

@@ -1,5 +1,5 @@
 //
-//  ASDisplayNodeTipState.m
+//  ASDisplayNodeTipState.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASIGListAdapterBasedDataSource.mm

@@ -1,5 +1,5 @@
 //
-//  ASIGListAdapterBasedDataSource.m
+//  ASIGListAdapterBasedDataSource.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASImageNode+CGExtras.mm

@@ -1,5 +1,5 @@
 //
-//  ASImageNode+CGExtras.m
+//  ASImageNode+CGExtras.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -9,7 +9,7 @@
 
 #import <AsyncDisplayKit/ASImageNode+CGExtras.h>
 
-#import <tgmath.h>
+#import <cmath>
 
 // TODO rewrite these to be closer to the intended use -- take UIViewContentMode as param, CGRect destinationBounds, CGSize sourceSize.
 static CGSize _ASSizeFillWithAspectRatio(CGFloat aspectRatio, CGSize constraints);

Source/Private/ASInternalHelpers.mm

@@ -1,5 +1,5 @@
 //
-//  ASInternalHelpers.m
+//  ASInternalHelpers.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -12,7 +12,7 @@
 #import <UIKit/UIKit.h>
 
 #import <objc/runtime.h>
-#import <tgmath.h>
+#import <cmath>
 
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 #import <AsyncDisplayKit/ASRunLoopQueue.h>

Source/Private/ASLayerBackingTipProvider.mm

@@ -1,5 +1,5 @@
 //
-//  ASLayerBackingTipProvider.m
+//  ASLayerBackingTipProvider.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASMutableElementMap.mm

@@ -1,5 +1,5 @@
 //
-//  ASMutableElementMap.m
+//  ASMutableElementMap.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASMutableElementMap.h"
+#import <AsyncDisplayKit/ASMutableElementMap.h>
 
 #import <AsyncDisplayKit/ASCollectionElement.h>
 #import <AsyncDisplayKit/ASDataController.h>

Source/Private/ASResponderChainEnumerator.mm

@@ -1,5 +1,5 @@
 //
-//  ASResponderChainEnumerator.m
+//  ASResponderChainEnumerator.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASResponderChainEnumerator.h"
+#import <AsyncDisplayKit/ASResponderChainEnumerator.h>
 #import <AsyncDisplayKit/ASAssert.h>
 
 @implementation ASResponderChainEnumerator {

Source/Private/ASSection.mm

@@ -1,5 +1,5 @@
 //
-//  ASSection.m
+//  ASSection.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASTip.mm

@@ -1,5 +1,5 @@
 //
-//  ASTip.m
+//  ASTip.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASTip.h"
+#import <AsyncDisplayKit/ASTip.h>
 
 #if AS_ENABLE_TIPS
 

Source/Private/ASTipNode.mm

@@ -1,5 +1,5 @@
 //
-//  ASTipNode.m
+//  ASTipNode.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASTipProvider.mm

@@ -1,5 +1,5 @@
 //
-//  ASTipProvider.m
+//  ASTipProvider.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASTipProvider.h"
+#import <AsyncDisplayKit/ASTipProvider.h>
 
 #if AS_ENABLE_TIPS
 

Source/Private/ASTipsController.mm

@@ -1,5 +1,5 @@
 //
-//  ASTipsController.m
+//  ASTipsController.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASTipsController.h"
+#import <AsyncDisplayKit/ASTipsController.h>
 
 #if AS_ENABLE_TIPS
 

Source/Private/ASTipsWindow.mm

@@ -1,5 +1,5 @@
 //
-//  ASTipsWindow.m
+//  ASTipsWindow.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -7,7 +7,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASTipsWindow.h"
+#import <AsyncDisplayKit/ASTipsWindow.h>
 #if AS_ENABLE_TIPS
 
 #import <AsyncDisplayKit/ASDisplayNodeTipState.h>

Source/Private/ASTwoDimensionalArrayUtils.mm

@@ -1,5 +1,5 @@
 //
-//  ASTwoDimensionalArrayUtils.m
+//  ASTwoDimensionalArrayUtils.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/ASWeakMap.mm

@@ -1,5 +1,5 @@
 //
-//  ASWeakMap.m
+//  ASWeakMap.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/TextExperiment/Component/ASTextDebugOption.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextDebugOption.m
+//  ASTextDebugOption.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Private/TextExperiment/Component/ASTextInput.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextInput.m
+//  ASTextInput.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/TextExperiment/Component/ASTextLayout.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextLayout.m
+//  ASTextLayout.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/TextExperiment/Component/ASTextLine.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextLine.m
+//  ASTextLine.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/TextExperiment/String/ASTextAttribute.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextAttribute.m
+//  ASTextAttribute.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/Private/TextExperiment/String/ASTextRunDelegate.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextRunDelegate.m
+//  ASTextRunDelegate.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Private/TextExperiment/Utility/ASTextUtilities.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextUtilities.m
+//  ASTextUtilities.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Private/TextExperiment/Utility/NSAttributedString+ASText.mm

@@ -1,5 +1,5 @@
 //
-//  NSAttributedString+ASText.m
+//  NSAttributedString+ASText.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Private/TextExperiment/Utility/NSParagraphStyle+ASText.mm

@@ -1,5 +1,5 @@
 //
-//  NSParagraphStyle+ASText.m
+//  NSParagraphStyle+ASText.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/Private/_ASCollectionGalleryLayoutInfo.mm

@@ -1,5 +1,5 @@
 //
-//  _ASCollectionGalleryLayoutInfo.m
+//  _ASCollectionGalleryLayoutInfo.mm
 //  Texture
 //
 //  Copyright (c) Pinterest, Inc.  All rights reserved.

Source/TextKit/ASLayoutManager.mm

@@ -1,5 +1,5 @@
 //
-//  ASLayoutManager.m
+//  ASLayoutManager.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/TextKit/ASTextKitCoreTextAdditions.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextKitCoreTextAdditions.m
+//  ASTextKitCoreTextAdditions.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/TextKit/ASTextKitEntityAttribute.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextKitEntityAttribute.m
+//  ASTextKitEntityAttribute.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/TextKit/ASTextNodeWordKerner.mm

@@ -1,5 +1,5 @@
 //
-//  ASTextNodeWordKerner.m
+//  ASTextNodeWordKerner.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/UIImage+ASConvenience.mm

@@ -1,5 +1,5 @@
 //
-//  UIImage+ASConvenience.m
+//  UIImage+ASConvenience.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/_ASTransitionContext.mm

@@ -1,5 +1,5 @@
 //
-//  _ASTransitionContext.m
+//  _ASTransitionContext.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/tvOS/ASControlNode+tvOS.mm

@@ -1,5 +1,5 @@
 //
-//  ASControlNode+tvOS.m
+//  ASControlNode+tvOS.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Source/tvOS/ASImageNode+tvOS.mm

@@ -1,5 +1,5 @@
 //
-//  ASImageNode+tvOS.m
+//  ASImageNode+tvOS.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.
@@ -12,6 +12,7 @@
 #import <AsyncDisplayKit/ASImageNode.h>
 #import <AsyncDisplayKit/ASDisplayNode+Subclasses.h>
 
+// TODO: Remove this – we don't need to link GLKit just to convert degrees to radians.
 #import <GLKit/GLKit.h>
 #import <tgmath.h>
 

Tests/ASAbsoluteLayoutSpecSnapshotTests.mm

@@ -1,5 +1,5 @@
 //
-//  ASAbsoluteLayoutSpecSnapshotTests.m
+//  ASAbsoluteLayoutSpecSnapshotTests.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Tests/ASBasicImageDownloaderContextTests.mm

@@ -1,5 +1,5 @@
 //
-//  ASBasicImageDownloaderContextTests.m
+//  ASBasicImageDownloaderContextTests.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Tests/ASBasicImageDownloaderTests.mm

@@ -1,5 +1,5 @@
 //
-//  ASBasicImageDownloaderTests.m
+//  ASBasicImageDownloaderTests.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.

Tests/ASBatchFetchingTests.mm

@@ -1,5 +1,5 @@
 //
-//  ASBatchFetchingTests.m
+//  ASBatchFetchingTests.mm
 //  Texture
 //
 //  Copyright (c) Facebook, Inc. and its affiliates.  All rights reserved.