Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CI to 2024 #2106

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci-master-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-pull-requests-only.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions AsyncDisplayKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2616,6 +2616,7 @@
"$(inherited)",
);
INFOPLIST_FILE = Tests/TestHost/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -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.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
Expand Down Expand Up @@ -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.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AsyncDisplayKitTestHost.app/AsyncDisplayKitTestHost";
Expand All @@ -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.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AsyncDisplayKitTestHost.app/AsyncDisplayKitTestHost";
Expand All @@ -2813,6 +2817,7 @@
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Source/AsyncDisplayKit.modulemap;
MTL_ENABLE_DEBUG_INFO = YES;
Expand Down Expand Up @@ -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.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Source/AsyncDisplayKit.modulemap;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down Expand Up @@ -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.4;
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AsyncDisplayKitTestHost.app/AsyncDisplayKitTestHost";
Expand All @@ -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.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -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.4;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MODULEMAP_FILE = Source/AsyncDisplayKit.modulemap;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down
4 changes: 2 additions & 2 deletions CI/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
q#!/bin/bash
set -eo pipefail

./build.sh all
./build.sh all
5 changes: 3 additions & 2 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
source 'https://cdn.cocoapods.org/'
platform :ios, '9.0'
platform :ios, '13.0'
ios_deployment_target = Gem::Version.new('13.4')

target :'AsyncDisplayKitTests' do
platform :ios, '10.0'
platform :ios, ios_deployment_target
use_frameworks!
pod 'OCMock', '~>3.6'
pod 'iOSSnapshotTestCase/Core', '~> 6.2'
Expand Down
4 changes: 2 additions & 2 deletions Source/ASDisplayNode+Yoga.mm
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions SubspecWorkspaces/ASDKListKit/Podfile
Original file line number Diff line number Diff line change
@@ -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

30 changes: 20 additions & 10 deletions Texture.podspec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ios_deployment_target = '13.4'

Pod::Spec.new do |spec|
spec.name = 'Texture'
spec.version = '3.1.0'
Expand All @@ -11,8 +13,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 = ios_deployment_target
spec.tvos.deployment_target = ios_deployment_target

# Subspecs
spec.subspec 'Core' do |core|
Expand All @@ -28,61 +30,69 @@ 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.ios.deployment_target = ios_deployment_target
pin.dependency 'PINRemoteImage/iOS', '~> 3.0.0'
pin.dependency 'PINRemoteImage/PINCache'
pin.dependency 'Texture/Core'
end

spec.subspec 'IGListKit' do |igl|
igl.ios.deployment_target = ios_deployment_target
igl.dependency 'IGListKit', '~> 4.0'
igl.dependency 'IGListDiffKit', '~> 4.0'
igl.dependency 'Texture/Core'
end

spec.subspec 'Yoga' do |yoga|
yoga.ios.deployment_target = ios_deployment_target
yoga.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) YOGA=1' }
yoga.dependency 'Yoga', '1.6.0'
yoga.dependency 'Yoga', '2.0.1'
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.ios.deployment_target = ios_deployment_target
text_node.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_ENABLE_TEXTNODE=0' }
text_node.dependency 'Texture/Core'
end

spec.subspec 'Video' do |video|
video.ios.deployment_target = ios_deployment_target
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.ios.deployment_target = ios_deployment_target
map.frameworks = ['CoreLocation', 'MapKit']
map.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_MAPKIT=1' }
map.dependency 'Texture/Core'
end

spec.subspec 'Photos' do |photos|
photos.ios.deployment_target = ios_deployment_target
photos.frameworks = 'Photos'
photos.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_PHOTOS=1' }
photos.dependency 'Texture/Core'
end

spec.subspec 'AssetsLibrary' do |assetslib|
assetslib.ios.deployment_target = ios_deployment_target
assetslib.ios.frameworks = 'AssetsLibrary'
assetslib.ios.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) AS_USE_ASSETS_LIBRARY=1' }
assetslib.dependency 'Texture/Core'
Expand All @@ -97,6 +107,6 @@ Pod::Spec.new do |spec|
spec.pod_target_xcconfig = {
'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11',
'CLANG_CXX_LIBRARY' => 'libc++'
}
}

end
Loading
Loading