From e078c62e20094dfe25526831ac183704f7343bea Mon Sep 17 00:00:00 2001 From: sonny-park Date: Thu, 1 Jun 2023 15:24:51 +0900 Subject: [PATCH] Revert "Merge pull request #221 from lukewakeford/fix/swift_package_flag" This reverts commit 467793644461b0c64bff072d56f073772793cb2a, reversing changes made to 1c9b64a6a8b577fbcfc693c6c99d0875d52893d2. --- Sources/Swift/FlexLayout.swift | 2 +- Sources/Swift/Impl/FlexLayout+Enum.swift | 2 +- Sources/Swift/Impl/FlexLayout+Private.swift | 2 +- Sources/Swift/YGLayoutExtensions.swift | 2 +- Sources/YogaKit/include/YogaKit/YGLayout+Private.h | 2 +- Sources/YogaKit/include/YogaKit/YGLayout.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/Swift/FlexLayout.swift b/Sources/Swift/FlexLayout.swift index 69cd8c49..374831b7 100644 --- a/Sources/Swift/FlexLayout.swift +++ b/Sources/Swift/FlexLayout.swift @@ -13,7 +13,7 @@ // Created by Luc Dion on 2017-06-19. import UIKit -#if FLEXLAYOUT_SWIFT_PACKAGE || SWIFT_PACKAGE +#if FLEXLAYOUT_SWIFT_PACKAGE import FlexLayoutYogaKit #endif diff --git a/Sources/Swift/Impl/FlexLayout+Enum.swift b/Sources/Swift/Impl/FlexLayout+Enum.swift index 295ea1e4..6969fac9 100644 --- a/Sources/Swift/Impl/FlexLayout+Enum.swift +++ b/Sources/Swift/Impl/FlexLayout+Enum.swift @@ -14,7 +14,7 @@ import UIKit -#if FLEXLAYOUT_SWIFT_PACKAGE || SWIFT_PACKAGE +#if FLEXLAYOUT_SWIFT_PACKAGE import FlexLayoutYoga extension YGFlexDirection { diff --git a/Sources/Swift/Impl/FlexLayout+Private.swift b/Sources/Swift/Impl/FlexLayout+Private.swift index af55be0c..f2aabbae 100644 --- a/Sources/Swift/Impl/FlexLayout+Private.swift +++ b/Sources/Swift/Impl/FlexLayout+Private.swift @@ -7,7 +7,7 @@ // import UIKit -#if FLEXLAYOUT_SWIFT_PACKAGE || SWIFT_PACKAGE +#if FLEXLAYOUT_SWIFT_PACKAGE import FlexLayoutYoga #endif diff --git a/Sources/Swift/YGLayoutExtensions.swift b/Sources/Swift/YGLayoutExtensions.swift index ea3021a4..d51e3c12 100644 --- a/Sources/Swift/YGLayoutExtensions.swift +++ b/Sources/Swift/YGLayoutExtensions.swift @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#if FLEXLAYOUT_SWIFT_PACKAGE || SWIFT_PACKAGE +#if FLEXLAYOUT_SWIFT_PACKAGE import CoreGraphics import FlexLayoutYoga #endif diff --git a/Sources/YogaKit/include/YogaKit/YGLayout+Private.h b/Sources/YogaKit/include/YogaKit/YGLayout+Private.h index 70cfe402..07aad0c8 100644 --- a/Sources/YogaKit/include/YogaKit/YGLayout+Private.h +++ b/Sources/YogaKit/include/YogaKit/YGLayout+Private.h @@ -6,7 +6,7 @@ */ #import "YGLayout.h" -#if FLEXLAYOUT_SWIFT_PACKAGE || SWIFT_PACKAGE +#if FLEXLAYOUT_SWIFT_PACKAGE #import #else #import "Yoga.h" diff --git a/Sources/YogaKit/include/YogaKit/YGLayout.h b/Sources/YogaKit/include/YogaKit/YGLayout.h index a963fab1..8faa3e82 100644 --- a/Sources/YogaKit/include/YogaKit/YGLayout.h +++ b/Sources/YogaKit/include/YogaKit/YGLayout.h @@ -7,7 +7,7 @@ #import -#if FLEXLAYOUT_SWIFT_PACKAGE || SWIFT_PACKAGE +#if FLEXLAYOUT_SWIFT_PACKAGE #import #import #import