Skip to content

Commit 31f63e5

Browse files
committed
changed !XCODE_BUILD condition to SWIFT_PACKACE; fixed broken swift test
1 parent d2ff462 commit 31f63e5

File tree

10 files changed

+11
-16
lines changed

10 files changed

+11
-16
lines changed

Abstract.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,6 @@
860860
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
861861
MTL_ENABLE_DEBUG_INFO = YES;
862862
ONLY_ACTIVE_ARCH = YES;
863-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
864863
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
865864
PRODUCT_NAME = Abstract;
866865
SDKROOT = iphoneos;
@@ -921,7 +920,6 @@
921920
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
922921
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
923922
MTL_ENABLE_DEBUG_INFO = NO;
924-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
925923
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
926924
PRODUCT_NAME = Abstract;
927925
SDKROOT = iphoneos;
@@ -1109,7 +1107,6 @@
11091107
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11101108
MTL_ENABLE_DEBUG_INFO = YES;
11111109
ONLY_ACTIVE_ARCH = YES;
1112-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
11131110
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
11141111
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
11151112
PRODUCT_NAME = Abstract;
@@ -1178,7 +1175,6 @@
11781175
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11791176
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11801177
MTL_ENABLE_DEBUG_INFO = NO;
1181-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
11821178
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
11831179
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
11841180
PRODUCT_NAME = Abstract;
@@ -1375,7 +1371,6 @@
13751371
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
13761372
MTL_ENABLE_DEBUG_INFO = YES;
13771373
ONLY_ACTIVE_ARCH = YES;
1378-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
13791374
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
13801375
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
13811376
PRODUCT_NAME = Abstract;
@@ -1444,7 +1439,6 @@
14441439
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
14451440
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
14461441
MTL_ENABLE_DEBUG_INFO = NO;
1447-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
14481442
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
14491443
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
14501444
PRODUCT_NAME = Abstract;
@@ -1522,7 +1516,6 @@
15221516
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
15231517
MTL_ENABLE_DEBUG_INFO = YES;
15241518
ONLY_ACTIVE_ARCH = YES;
1525-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
15261519
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
15271520
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
15281521
SDKROOT = macosx;
@@ -1591,7 +1584,6 @@
15911584
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
15921585
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
15931586
MTL_ENABLE_DEBUG_INFO = NO;
1594-
OTHER_SWIFT_FLAGS = "-DXCODE_BUILD";
15951587
PRODUCT_BUNDLE_IDENTIFIER = com.typelift.Abstract;
15961588
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
15971589
SDKROOT = macosx;

Sources/Abstract/BoundedSemilattice.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A Bounded Semilattice is a Commutative Monoid in which the operation is idempote
66
a <> b <> b = a <> b
77
*/
88

9-
#if !XCODE_BUILD
9+
#if SWIFT_PACKAGE
1010
import Operadics
1111
#endif
1212

Sources/Abstract/CommutativeMonoid.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A Commutative Monoid is a Monoid in which the operation is commutative, thus:
66
a <> b = b <> a
77
*/
88

9-
#if !XCODE_BUILD
9+
#if SWIFT_PACKAGE
1010
import Operadics
1111
#endif
1212

Sources/Abstract/Homomorphism.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !XCODE_BUILD
1+
#if SWIFT_PACKAGE
22
import Operadics
33
#endif
44

Sources/Abstract/Magma.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Technically, to prove this, we could test the operation with a large number of r
1212
So let's keep it on word (for now).
1313
*/
1414

15-
#if !XCODE_BUILD
15+
#if SWIFT_PACKAGE
1616
import Operadics
1717
#endif
1818

Sources/Abstract/Monoid.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The empty element (let's called it `e`) has to be neutral to the operation both
88
a <> e = e <> a = a
99
*/
1010

11-
#if !XCODE_BUILD
11+
#if SWIFT_PACKAGE
1212
import Operadics
1313
#endif
1414

Sources/Abstract/Semigroup.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A Semigroup is a Magma where the composition operation is associative, which mea
66
To put it simply: (a <> b) <> c = a <> (b <> c)
77
*/
88

9-
#if !XCODE_BUILD
9+
#if SWIFT_PACKAGE
1010
import Operadics
1111
#endif
1212

Sources/Abstract/Semiring.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ In addition to the basic requirements for the underlying types (Commutative Mono
1313
- the `zero` element must "annihilate" an instance if applied with the multiplication operation, both left and right:
1414
- zero <>* a = a <>* zero = zero
1515
*/
16-
#if !XCODE_BUILD
16+
#if SWIFT_PACKAGE
1717
import Operadics
1818
#endif
1919

Sources/Abstract/Utilities/Collections.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Becuase we have a way to generically "compose" things, we can derive a bunch of interesting operations on collections of such things.
55
*/
66

7-
#if !XCODE_BUILD
7+
#if SWIFT_PACKAGE
88
import Operadics
99
#endif
1010

Tests/AbstractTests/Utility/CustomArbitraryTypes.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import XCTest
22
@testable import Abstract
33
import SwiftCheck
4+
#if SWIFT_PACKAGE
5+
import Operadics
6+
#endif
47

58
struct TestStructure: Arbitrary, BoundedSemilattice, Equatable {
69
let get: Max<Int>

0 commit comments

Comments
 (0)