Skip to content

Commit f8d9181

Browse files
rgnnsrgnns
authored
Make ASInternalHelpers public (#2114)
1 parent 9b2b01a commit f8d9181

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

‎AsyncDisplayKit.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
34566CB31BC1213700715E6B /* ASPhotosFrameworkImageRequest.mm in Sources */ = {isa = PBXBuildFile; fileRef = CC7FD9DD1BB5E962005CCB2B /* ASPhotosFrameworkImageRequest.mm */; };
7474
34EFC75B1B701BAF00AD841F /* ASDimension.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED071B17843500DA7C62 /* ASDimension.h */; settings = {ATTRIBUTES = (Public, ); }; };
7575
34EFC75C1B701BD200AD841F /* ASDimension.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED081B17843500DA7C62 /* ASDimension.mm */; };
76-
34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */; settings = {ATTRIBUTES = (Private, ); }; };
77-
34EFC75E1B701BF000AD841F /* ASInternalHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.mm */; };
7876
34EFC75F1B701C8600AD841F /* ASInsetLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED091B17843500DA7C62 /* ASInsetLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
7977
34EFC7601B701C8B00AD841F /* ASInsetLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = ACF6ED0A1B17843500DA7C62 /* ASInsetLayoutSpec.mm */; };
8078
34EFC7611B701C9C00AD841F /* ASBackgroundLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = ACF6ED011B17843500DA7C62 /* ASBackgroundLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -111,6 +109,8 @@
111109
509E68651B3AEDC5009B9150 /* CoreGraphics+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CoreGraphics+ASConvenience.h */; settings = {ATTRIBUTES = (Public, ); }; };
112110
636EA1A41C7FF4EC00EE152F /* NSArray+Diffing.mm in Sources */ = {isa = PBXBuildFile; fileRef = DBC452DA1C5BF64600B16017 /* NSArray+Diffing.mm */; };
113111
636EA1A51C7FF4EF00EE152F /* ASDefaultPlayButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = AEB7B0191C5962EA00662EF4 /* ASDefaultPlayButton.mm */; };
112+
677D627E2C599F3800A78C05 /* ASInternalHelpers.mm in Sources */ = {isa = PBXBuildFile; fileRef = 677D627C2C599F3700A78C05 /* ASInternalHelpers.mm */; };
113+
677D627F2C599F3800A78C05 /* ASInternalHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 677D627D2C599F3800A78C05 /* ASInternalHelpers.h */; settings = {ATTRIBUTES = (Public, ); }; };
114114
67A75CA42C5412F1003AFD51 /* ASCollectionView+Undeprecated.h in Headers */ = {isa = PBXBuildFile; fileRef = 67A75CA32C5412F1003AFD51 /* ASCollectionView+Undeprecated.h */; settings = {ATTRIBUTES = (Public, ); }; };
115115
680346941CE4052A0009FEB4 /* ASDKNavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = 68FC85DC1CE29AB700EDD713 /* ASDKNavigationController.h */; settings = {ATTRIBUTES = (Public, ); }; };
116116
68355B341CB579B9001D4E68 /* ASImageNode+AnimatedImage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 68355B2E1CB5799E001D4E68 /* ASImageNode+AnimatedImage.mm */; };
@@ -689,6 +689,8 @@
689689
471D04B0224CB98600649215 /* ASImageNodeBackingSizeTests.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ASImageNodeBackingSizeTests.mm; sourceTree = "<group>"; };
690690
4E9127681F64157600499623 /* ASRunLoopQueueTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASRunLoopQueueTests.mm; sourceTree = "<group>"; };
691691
5039B74209A895E07057081C /* Pods_AsyncDisplayKitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AsyncDisplayKitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
692+
677D627C2C599F3700A78C05 /* ASInternalHelpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASInternalHelpers.mm; sourceTree = "<group>"; };
693+
677D627D2C599F3800A78C05 /* ASInternalHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASInternalHelpers.h; sourceTree = "<group>"; };
692694
67A75CA32C5412F1003AFD51 /* ASCollectionView+Undeprecated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ASCollectionView+Undeprecated.h"; sourceTree = "<group>"; };
693695
68355B2E1CB5799E001D4E68 /* ASImageNode+AnimatedImage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "ASImageNode+AnimatedImage.mm"; sourceTree = "<group>"; };
694696
68355B361CB57A5A001D4E68 /* ASPINRemoteImageDownloader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASPINRemoteImageDownloader.mm; sourceTree = "<group>"; };
@@ -848,8 +850,6 @@
848850
ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASStackLayoutSpec.mm; sourceTree = "<group>"; };
849851
ACF6ED181B17843500DA7C62 /* ASAbsoluteLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASAbsoluteLayoutSpec.h; sourceTree = "<group>"; };
850852
ACF6ED191B17843500DA7C62 /* ASAbsoluteLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASAbsoluteLayoutSpec.mm; sourceTree = "<group>"; };
851-
ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASInternalHelpers.h; sourceTree = "<group>"; };
852-
ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASInternalHelpers.mm; sourceTree = "<group>"; };
853853
ACF6ED531B178DC700DA7C62 /* ASCenterLayoutSpecSnapshotTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASCenterLayoutSpecSnapshotTests.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
854854
ACF6ED541B178DC700DA7C62 /* ASDimensionTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = ASDimensionTests.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
855855
ACF6ED551B178DC700DA7C62 /* ASInsetLayoutSpecSnapshotTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASInsetLayoutSpecSnapshotTests.mm; sourceTree = "<group>"; };
@@ -1239,6 +1239,8 @@
12391239
058D09DD195D050800B7D73C /* ASImageNode.h */,
12401240
058D09DE195D050800B7D73C /* ASImageNode.mm */,
12411241
68355B2E1CB5799E001D4E68 /* ASImageNode+AnimatedImage.mm */,
1242+
677D627D2C599F3800A78C05 /* ASInternalHelpers.h */,
1243+
677D627C2C599F3700A78C05 /* ASInternalHelpers.mm */,
12421244
CCF1FF5D20C4785000AAD8FC /* ASLocking.h */,
12431245
CCBDDD0320C62A2D00CBA922 /* ASMainThreadDeallocation.h */,
12441246
CCBDDD0420C62A2D00CBA922 /* ASMainThreadDeallocation.mm */,
@@ -1562,8 +1564,6 @@
15621564
058D0A0D195D050800B7D73C /* ASImageNode+CGExtras.h */,
15631565
058D0A0E195D050800B7D73C /* ASImageNode+CGExtras.mm */,
15641566
6900C5F31E8072DA00BCD75C /* ASImageNode+Private.h */,
1565-
ACF6ED431B17847A00DA7C62 /* ASInternalHelpers.h */,
1566-
ACF6ED441B17847A00DA7C62 /* ASInternalHelpers.mm */,
15671567
CCA282C21E9EAE630037E8B7 /* ASLayerBackingTipProvider.h */,
15681568
CCA282C31E9EAE630037E8B7 /* ASLayerBackingTipProvider.mm */,
15691569
E52405B41C8FEF16004DC8E7 /* ASLayoutTransition.h */,
@@ -2014,6 +2014,7 @@
20142014
CC0F88631E4281E700576FED /* ASSupplementaryNodeSource.h in Headers */,
20152015
254C6B771BF94DF4003EC431 /* ASTextKitAttributes.h in Headers */,
20162016
254C6B7D1BF94DF4003EC431 /* ASTextKitShadower.h in Headers */,
2017+
677D627F2C599F3800A78C05 /* ASInternalHelpers.h in Headers */,
20172018
690ED58E1E36BCA6000627C0 /* ASLayoutElementStylePrivate.h in Headers */,
20182019
CC55A70D1E529FA200594372 /* UIResponder+AsyncDisplayKit.h in Headers */,
20192020
254C6B731BF94DF4003EC431 /* ASTextKitCoreTextAdditions.h in Headers */,
@@ -2051,7 +2052,6 @@
20512052
CCA282BC1E9EABDD0037E8B7 /* ASTipProvider.h in Headers */,
20522053
6977965F1D8AC8D3007E93D7 /* ASLayoutSpec+Subclasses.h in Headers */,
20532054
692BE8D71E36B65B00C86D87 /* ASLayoutSpecPrivate.h in Headers */,
2054-
34EFC75D1B701BE900AD841F /* ASInternalHelpers.h in Headers */,
20552055
9C0BA4AA2582CE35001C293B /* NSAttributedString+ASText.h in Headers */,
20562056
DEC146B71C37A16A004A0EE7 /* ASCollectionInternal.h in Headers */,
20572057
68B8A4E21CBDB958007E4543 /* ASWeakProxy.h in Headers */,
@@ -2499,6 +2499,7 @@
24992499
CC3B208C1C3F7A5400798563 /* ASWeakSet.mm in Sources */,
25002500
B350621C1B010EFD0018CF92 /* ASTableLayoutController.mm in Sources */,
25012501
B350621E1B010EFD0018CF92 /* ASHighlightOverlayLayer.mm in Sources */,
2502+
677D627E2C599F3800A78C05 /* ASInternalHelpers.mm in Sources */,
25022503
9CC606651D24DF9E006581A0 /* NSIndexSet+ASHelpers.mm in Sources */,
25032504
CC0F885F1E4280B800576FED /* _ASCollectionViewCell.mm in Sources */,
25042505
CC2F65EF1E5FFB1600DA57C9 /* ASMutableElementMap.mm in Sources */,
@@ -2513,7 +2514,6 @@
25132514
34EFC7601B701C8B00AD841F /* ASInsetLayoutSpec.mm in Sources */,
25142515
AC6145441D8AFD4F003D62A2 /* ASSection.mm in Sources */,
25152516
E5775AFE1F13CF7400CAC9BC /* _ASCollectionGalleryLayoutItem.mm in Sources */,
2516-
34EFC75E1B701BF000AD841F /* ASInternalHelpers.mm in Sources */,
25172517
34EFC7681B701CDE00AD841F /* ASLayout.mm in Sources */,
25182518
DECBD6EA1BE56E1900CF4905 /* ASButtonNode.mm in Sources */,
25192519
CCEDDDD1200C488000FFCD0A /* ASConfiguration.mm in Sources */,

Source/Private/ASInternalHelpers.h renamed to Source/ASInternalHelpers.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
88
//
99

10-
#import "ASAvailability.h"
11-
1210
#import <UIKit/UIKit.h>
1311

12+
#import <AsyncDisplayKit/ASAvailability.h>
1413
#import <AsyncDisplayKit/ASBaseDefines.h>
1514
#import <AsyncDisplayKit/ASDisplayNodeExtras.h>
1615
#import <AsyncDisplayKit/ASImageProtocols.h>

Source/Private/ASInternalHelpers.mm renamed to Source/ASInternalHelpers.mm

File renamed without changes.

‎Source/AsyncDisplayKit.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
#import <AsyncDisplayKit/ASImageProtocols.h>
6060
#import <AsyncDisplayKit/ASInsetLayoutSpec.h>
6161
#import <AsyncDisplayKit/ASIntegerMap.h>
62+
#import <AsyncDisplayKit/ASInternalHelpers.h>
6263
#import <AsyncDisplayKit/ASLayout+IGListDiffKit.h>
6364
#import <AsyncDisplayKit/ASLayout.h>
6465
#import <AsyncDisplayKit/ASLayoutController.h>

‎Texture.podspec‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ Pod::Spec.new do |spec|
1010
spec.header_dir = 'AsyncDisplayKit'
1111

1212
spec.documentation_url = 'http://texturegroup.org/appledoc/'
13-
13+
1414
ios_deployment_target = '14.0'
1515
tvos_deployment_target = '14.0'
1616
spec.ios.deployment_target = ios_deployment_target
1717
spec.tvos.deployment_target = tvos_deployment_target
18-
18+
1919
# Subspecs
2020
spec.subspec 'Core' do |core|
2121
core.ios.deployment_target = ios_deployment_target
@@ -33,18 +33,18 @@ Pod::Spec.new do |spec|
3333
'Source/TextExperiment/Component/*.h',
3434
'Source/TextExperiment/String/ASTextAttribute.h',
3535
]
36-
36+
3737
core.source_files = [
3838
'Source/**/*.{h,mm}',
39-
39+
4040
# Most TextKit components are not public because the C++ content
4141
# in the headers will cause build errors when using
4242
# `use_frameworks!` on 0.39.0 & Swift 2.1.
4343
# See https://github.com/facebook/AsyncDisplayKit/issues/1153
4444
'Source/TextKit/*.h',
4545
]
4646
end
47-
47+
4848
spec.subspec 'PINRemoteImage' do |pin|
4949
pin.ios.deployment_target = ios_deployment_target
5050
pin.tvos.deployment_target = tvos_deployment_target
@@ -67,7 +67,7 @@ Pod::Spec.new do |spec|
6767
yoga.dependency 'Yoga', '~> 2.0'
6868
yoga.dependency 'Texture/Core'
6969
end
70-
70+
7171
# If flag is enabled the old TextNode with all dependencies will be compiled out
7272
spec.subspec 'TextNode2' do |text_node|
7373
text_node.ios.deployment_target = ios_deployment_target
@@ -82,7 +82,7 @@ Pod::Spec.new do |spec|
8282
video.frameworks = ['AVFoundation', 'CoreMedia']
8383
video.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_VIDEO=1' }
8484
video.dependency 'Texture/Core'
85-
end
85+
end
8686

8787
spec.subspec 'MapKit' do |map|
8888
map.ios.deployment_target = ios_deployment_target
@@ -118,5 +118,5 @@ Pod::Spec.new do |spec|
118118
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
119119
'CLANG_CXX_LIBRARY' => 'libc++'
120120
}
121-
121+
122122
end

0 commit comments

Comments
 (0)