From 1d65db04e29f59e2d503014827ad6a60121dfcff Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Thu, 4 Jul 2019 19:48:47 -0700 Subject: [PATCH] Update Yoga version to latest --- Source/ASDisplayNode+Yoga.mm | 2 +- Texture.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/ASDisplayNode+Yoga.mm b/Source/ASDisplayNode+Yoga.mm index 619f5a78..4c847e64 100644 --- a/Source/ASDisplayNode+Yoga.mm +++ b/Source/ASDisplayNode+Yoga.mm @@ -305,7 +305,7 @@ 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 = !YGNodeHasMeasureFunc(yogaNode); if (needsTemporaryMeasureFunc) { ASDisplayNodeAssert(self.yogaLayoutInProgress == NO, @"shouldHaveYogaMeasureFunc == YES, and inside a layout pass, but no measure func pointer! %@", self); diff --git a/Texture.podspec b/Texture.podspec index 8f4de927..99f8ef80 100644 --- a/Texture.podspec +++ b/Texture.podspec @@ -51,7 +51,7 @@ Pod::Spec.new do |spec| spec.subspec 'Yoga' do |yoga| yoga.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) YOGA=1' } - yoga.dependency 'Yoga', '1.6.0' + yoga.dependency 'Yoga', '1.14.0' yoga.dependency 'Texture/Core' end