Update CI to 2024

TextureGroup · May 7, 2024 · 678f196 · 678f196
1 parent 923901a
commit 678f196
Show file tree

Hide file tree

Showing 9 changed files with 113 additions and 236 deletions.
diff --git a/.github/workflows/ci-master-only.yml b/.github/workflows/ci-master-only.yml
@@ -7,8 +7,8 @@ on:
 
 jobs:
   cocoapods-lint:
-    env: 
-        DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+    env:
+        DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
     name: Verify that podspec lints
     runs-on: macOS-latest
     steps:

diff --git a/.github/workflows/ci-pull-requests-only.yml b/.github/workflows/ci-pull-requests-only.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   buildsh:
     env:
-        DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
     strategy:
       matrix:
         mode: [cocoapods-lint-default-subspecs, cocoapods-lint-other-subspecs]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,10 +5,10 @@ on: [push, pull_request]
 jobs:
   buildsh:
     env:
-        DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+        DEVELOPER_DIR: /Applications/Xcode_15.3.app/Contents/Developer
     strategy:
       matrix:
-        mode: [tests, framework, life-without-cocoapods, carthage, examples-pt1, examples-pt2, examples-pt3, examples-pt4]
+        mode: [tests, framework, life-without-cocoapods, carthage
         include:
           - mode: tests
             name: Build and run tests
@@ -18,14 +18,6 @@ jobs:
             name: Build Texture as a static library
           - mode: carthage
             name: Verify that Carthage works
-          - mode: examples-pt1
-            name: Build examples (examples-pt1)
-          - mode: examples-pt2
-            name: Build examples (examples-pt2)
-          - mode: examples-pt3
-            name: Build examples (examples-pt3)
-          - mode: examples-pt4
-            name: Build examples (examples-pt4)
     name: ${{ matrix.name }}
     runs-on: macOS-latest
     steps:

diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj
@@ -2616,6 +2616,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/TestHost/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
@@ -2633,6 +2634,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				INFOPLIST_FILE = Tests/TestHost/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
@@ -2766,6 +2768,7 @@
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				INFOPLIST_FILE = "Tests/AsyncDisplayKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AsyncDisplayKitTestHost.app/AsyncDisplayKitTestHost";
@@ -2789,6 +2792,7 @@
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				INFOPLIST_FILE = "Tests/AsyncDisplayKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AsyncDisplayKitTestHost.app/AsyncDisplayKitTestHost";
@@ -2813,6 +2817,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = Source/AsyncDisplayKit.modulemap;
 				MTL_ENABLE_DEBUG_INFO = YES;
@@ -2845,6 +2850,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = Source/AsyncDisplayKit.modulemap;
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -2925,6 +2931,7 @@
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
 				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
 				INFOPLIST_FILE = "Tests/AsyncDisplayKitTests-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AsyncDisplayKitTestHost.app/AsyncDisplayKitTestHost";
@@ -2942,6 +2949,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
 				INFOPLIST_FILE = Tests/TestHost/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
@@ -2967,6 +2975,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "PROFILE=1";
 				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MODULEMAP_FILE = Source/AsyncDisplayKit.modulemap;
 				MTL_ENABLE_DEBUG_INFO = NO;

diff --git a/Podfile b/Podfile
@@ -1,8 +1,8 @@
 source 'https://cdn.cocoapods.org/'
-platform :ios, '9.0'
+platform :ios, '13.0'
 
 target :'AsyncDisplayKitTests' do
-  platform :ios, '10.0'
+  platform :ios, '13.0'
   use_frameworks!
   pod 'OCMock', '~>3.6'
   pod 'iOSSnapshotTestCase/Core', '~> 6.2'

diff --git a/Source/ASDisplayNode+Yoga.mm b/Source/ASDisplayNode+Yoga.mm
@@ -305,7 +305,7 @@ - (void)invalidateCalculatedYogaLayout
   YGNodeRef yogaNode = self.style.yogaNode;
   if (yogaNode && [self shouldHaveYogaMeasureFunc]) {
     // Yoga internally asserts that MarkDirty() may only be called on nodes with a measurement function.
-    BOOL needsTemporaryMeasureFunc = (YGNodeGetMeasureFunc(yogaNode) == NULL);
+    BOOL needsTemporaryMeasureFunc = !YGNodeGetMeasureFunc(yogaNode);
     if (needsTemporaryMeasureFunc) {
       ASDisplayNodeAssert(self.yogaLayoutInProgress == NO,
                           @"shouldHaveYogaMeasureFunc == YES, and inside a layout pass, but no measure func pointer! %@", self);
@@ -378,7 +378,7 @@ - (void)calculateLayoutFromYogaRoot:(ASSizeRange)rootConstrainedSize willApply:(
   // Prepare all children for the layout pass with the current Yoga tree configuration.
   ASDisplayNodePerformBlockOnEveryYogaChild(self, ^(ASDisplayNode *_Nonnull node) {
     node.yogaLayoutInProgress = YES;
-    ASDisplayNode *yogaParent = node.yogaParent; 
+    ASDisplayNode *yogaParent = node.yogaParent;
     if (yogaParent) {
       node.style.parentAlignStyle = yogaParent.style.alignItems;
     } else {

diff --git a/SubspecWorkspaces/ASDKListKit/Podfile b/SubspecWorkspaces/ASDKListKit/Podfile
@@ -1,9 +1,8 @@
 source 'https://cdn.cocoapods.org/'
 
-platform :ios, '9.0'
+platform :ios, '13.0'
 target 'ASDKListKitTests' do
   pod 'Texture/IGListKit', :path => '../..'
   pod 'OCMock', '~> 3.4'
   pod 'JGMethodSwizzler', :git => 'https://github.com/JonasGessner/JGMethodSwizzler', :branch => 'master'
 end
-
diff --git a/Texture.podspec b/Texture.podspec
@@ -11,8 +11,8 @@ Pod::Spec.new do |spec|
 
   spec.documentation_url = 'http://texturegroup.org/appledoc/'
 
-  spec.ios.deployment_target = '9.0'
-  spec.tvos.deployment_target = '9.0'
+  spec.ios.deployment_target = '13.4'
+  spec.tvos.deployment_target = '13.4'
 
   # Subspecs
   spec.subspec 'Core' do |core|
@@ -28,18 +28,18 @@ Pod::Spec.new do |spec|
       'Source/TextExperiment/Component/*.h',
       'Source/TextExperiment/String/ASTextAttribute.h',
     ]
-    
+
     core.source_files = [
       'Source/**/*.{h,mm}',
-      
+
       # Most TextKit components are not public because the C++ content
       # in the headers will cause build errors when using
       # `use_frameworks!` on 0.39.0 & Swift 2.1.
       # See https://github.com/facebook/AsyncDisplayKit/issues/1153
       'Source/TextKit/*.h',
     ]
   end
-  
+
   spec.subspec 'PINRemoteImage' do |pin|
     pin.dependency 'PINRemoteImage/iOS', '~> 3.0.0'
     pin.dependency 'PINRemoteImage/PINCache'
@@ -53,11 +53,12 @@ Pod::Spec.new do |spec|
   end
 
   spec.subspec 'Yoga' do |yoga|
+    yoga.ios.deployment_target = '13.4'
     yoga.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) YOGA=1' }
     yoga.dependency 'Yoga', '1.6.0'
     yoga.dependency 'Texture/Core'
   end
-  
+
   # If flag is enabled the old TextNode with all dependencies will be compiled out
   spec.subspec 'TextNode2' do |text_node|
     text_node.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_ENABLE_TEXTNODE=0' }
@@ -68,7 +69,7 @@ Pod::Spec.new do |spec|
     video.frameworks = ['AVFoundation', 'CoreMedia']
     video.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_VIDEO=1' }
     video.dependency 'Texture/Core'
-  end 
+  end
 
   spec.subspec 'MapKit' do |map|
     map.frameworks = ['CoreLocation', 'MapKit']
@@ -98,5 +99,5 @@ Pod::Spec.new do |spec|
     'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
     'CLANG_CXX_LIBRARY' => 'libc++'
    }
-   
+
 end