Skip to content

Commit 7988771

Browse files
author
Daniel Browne
committed
Remove 'WITH_ENCRYPTION' compiler flag from 'Consumption-Tests' project files
1 parent 15d5481 commit 7988771

File tree

12 files changed

+72
-180
lines changed

12 files changed

+72
-180
lines changed

Consumption-Tests/Carthage-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -539,10 +539,7 @@
539539
DEVELOPMENT_TEAM = H7FL434D9W;
540540
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
541541
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
542-
OTHER_CFLAGS = (
543-
"$(inherited)",
544-
"-DWITH_ENCRYPTION",
545-
);
542+
OTHER_CFLAGS = "$(inherited)";
546543
PRODUCT_NAME = "$(TARGET_NAME)";
547544
};
548545
name = Debug;
@@ -554,10 +551,7 @@
554551
DEVELOPMENT_TEAM = H7FL434D9W;
555552
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
556553
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
557-
OTHER_CFLAGS = (
558-
"$(inherited)",
559-
"-DWITH_ENCRYPTION",
560-
);
554+
OTHER_CFLAGS = "$(inherited)";
561555
PRODUCT_NAME = "$(TARGET_NAME)";
562556
};
563557
name = Release;
@@ -577,10 +571,7 @@
577571
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
578572
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
579573
MTL_FAST_MATH = YES;
580-
OTHER_CFLAGS = (
581-
"$(inherited)",
582-
"-DWITH_ENCRYPTION",
583-
);
574+
OTHER_CFLAGS = "$(inherited)";
584575
PRODUCT_NAME = "$(TARGET_NAME)";
585576
SDKROOT = macosx;
586577
};
@@ -600,10 +591,7 @@
600591
INFOPLIST_FILE = ../Shared/macOS/Info.plist;
601592
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
602593
MTL_FAST_MATH = YES;
603-
OTHER_CFLAGS = (
604-
"$(inherited)",
605-
"-DWITH_ENCRYPTION",
606-
);
594+
OTHER_CFLAGS = "$(inherited)";
607595
PRODUCT_NAME = "$(TARGET_NAME)";
608596
SDKROOT = macosx;
609597
};
@@ -624,10 +612,7 @@
624612
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
625613
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
626614
MTL_FAST_MATH = YES;
627-
OTHER_CFLAGS = (
628-
"$(inherited)",
629-
"-DWITH_ENCRYPTION",
630-
);
615+
OTHER_CFLAGS = "$(inherited)";
631616
PRODUCT_NAME = "$(TARGET_NAME)";
632617
SDKROOT = appletvos;
633618
TARGETED_DEVICE_FAMILY = 3;
@@ -648,10 +633,7 @@
648633
INFOPLIST_FILE = ../Shared/tvOS/Info.plist;
649634
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
650635
MTL_FAST_MATH = YES;
651-
OTHER_CFLAGS = (
652-
"$(inherited)",
653-
"-DWITH_ENCRYPTION",
654-
);
636+
OTHER_CFLAGS = "$(inherited)";
655637
PRODUCT_NAME = "$(TARGET_NAME)";
656638
SDKROOT = appletvos;
657639
TARGETED_DEVICE_FAMILY = 3;

Consumption-Tests/Carthage-Latest/Swift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
DEVELOPMENT_TEAM = H7FL434D9W;
527527
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
528528
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
529-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
529+
OTHER_SWIFT_FLAGS = "$(inherited)";
530530
PRODUCT_NAME = "$(TARGET_NAME)";
531531
PROVISIONING_PROFILE = "";
532532
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -544,7 +544,7 @@
544544
GCC_OPTIMIZATION_LEVEL = s;
545545
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
546546
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
547-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
547+
OTHER_SWIFT_FLAGS = "$(inherited)";
548548
PRODUCT_NAME = "$(TARGET_NAME)";
549549
PROVISIONING_PROFILE = "";
550550
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -568,7 +568,7 @@
568568
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
569569
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
570570
MTL_FAST_MATH = YES;
571-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
571+
OTHER_SWIFT_FLAGS = "$(inherited)";
572572
PRODUCT_NAME = "$(TARGET_NAME)";
573573
SDKROOT = macosx;
574574
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -591,7 +591,7 @@
591591
INFOPLIST_FILE = ../Shared/macOS/Info.plist;
592592
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
593593
MTL_FAST_MATH = YES;
594-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
594+
OTHER_SWIFT_FLAGS = "$(inherited)";
595595
PRODUCT_NAME = "$(TARGET_NAME)";
596596
SDKROOT = macosx;
597597
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -615,7 +615,7 @@
615615
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
616616
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
617617
MTL_FAST_MATH = YES;
618-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
618+
OTHER_SWIFT_FLAGS = "$(inherited)";
619619
PRODUCT_NAME = "$(TARGET_NAME)";
620620
SDKROOT = appletvos;
621621
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -639,7 +639,7 @@
639639
INFOPLIST_FILE = ../Shared/tvOS/Info.plist;
640640
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
641641
MTL_FAST_MATH = YES;
642-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
642+
OTHER_SWIFT_FLAGS = "$(inherited)";
643643
PRODUCT_NAME = "$(TARGET_NAME)";
644644
SDKROOT = appletvos;
645645
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Consumption-Tests/Carthage-Minimum/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -539,10 +539,7 @@
539539
DEVELOPMENT_TEAM = H7FL434D9W;
540540
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
541541
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
542-
OTHER_CFLAGS = (
543-
"$(inherited)",
544-
"-DWITH_ENCRYPTION",
545-
);
542+
OTHER_CFLAGS = "$(inherited)";
546543
PRODUCT_NAME = "$(TARGET_NAME)";
547544
};
548545
name = Debug;
@@ -554,10 +551,7 @@
554551
DEVELOPMENT_TEAM = H7FL434D9W;
555552
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
556553
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
557-
OTHER_CFLAGS = (
558-
"$(inherited)",
559-
"-DWITH_ENCRYPTION",
560-
);
554+
OTHER_CFLAGS = "$(inherited)";
561555
PRODUCT_NAME = "$(TARGET_NAME)";
562556
};
563557
name = Release;
@@ -577,10 +571,7 @@
577571
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
578572
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
579573
MTL_FAST_MATH = YES;
580-
OTHER_CFLAGS = (
581-
"$(inherited)",
582-
"-DWITH_ENCRYPTION",
583-
);
574+
OTHER_CFLAGS = "$(inherited)";
584575
PRODUCT_NAME = "$(TARGET_NAME)";
585576
SDKROOT = macosx;
586577
};
@@ -600,10 +591,7 @@
600591
INFOPLIST_FILE = ../Shared/macOS/Info.plist;
601592
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
602593
MTL_FAST_MATH = YES;
603-
OTHER_CFLAGS = (
604-
"$(inherited)",
605-
"-DWITH_ENCRYPTION",
606-
);
594+
OTHER_CFLAGS = "$(inherited)";
607595
PRODUCT_NAME = "$(TARGET_NAME)";
608596
SDKROOT = macosx;
609597
};
@@ -624,10 +612,7 @@
624612
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
625613
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
626614
MTL_FAST_MATH = YES;
627-
OTHER_CFLAGS = (
628-
"$(inherited)",
629-
"-DWITH_ENCRYPTION",
630-
);
615+
OTHER_CFLAGS = "$(inherited)";
631616
PRODUCT_NAME = "$(TARGET_NAME)";
632617
SDKROOT = appletvos;
633618
TARGETED_DEVICE_FAMILY = 3;
@@ -648,10 +633,7 @@
648633
INFOPLIST_FILE = ../Shared/tvOS/Info.plist;
649634
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
650635
MTL_FAST_MATH = YES;
651-
OTHER_CFLAGS = (
652-
"$(inherited)",
653-
"-DWITH_ENCRYPTION",
654-
);
636+
OTHER_CFLAGS = "$(inherited)";
655637
PRODUCT_NAME = "$(TARGET_NAME)";
656638
SDKROOT = appletvos;
657639
TARGETED_DEVICE_FAMILY = 3;

Consumption-Tests/Carthage-Minimum/Swift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
DEVELOPMENT_TEAM = H7FL434D9W;
527527
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
528528
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
529-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
529+
OTHER_SWIFT_FLAGS = "$(inherited)";
530530
PRODUCT_NAME = "$(TARGET_NAME)";
531531
PROVISIONING_PROFILE = "";
532532
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -544,7 +544,7 @@
544544
GCC_OPTIMIZATION_LEVEL = s;
545545
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
546546
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
547-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
547+
OTHER_SWIFT_FLAGS = "$(inherited)";
548548
PRODUCT_NAME = "$(TARGET_NAME)";
549549
PROVISIONING_PROFILE = "";
550550
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -568,7 +568,7 @@
568568
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
569569
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
570570
MTL_FAST_MATH = YES;
571-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
571+
OTHER_SWIFT_FLAGS = "$(inherited)";
572572
PRODUCT_NAME = "$(TARGET_NAME)";
573573
SDKROOT = macosx;
574574
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -591,7 +591,7 @@
591591
INFOPLIST_FILE = ../Shared/macOS/Info.plist;
592592
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
593593
MTL_FAST_MATH = YES;
594-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
594+
OTHER_SWIFT_FLAGS = "$(inherited)";
595595
PRODUCT_NAME = "$(TARGET_NAME)";
596596
SDKROOT = macosx;
597597
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -615,7 +615,7 @@
615615
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
616616
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
617617
MTL_FAST_MATH = YES;
618-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
618+
OTHER_SWIFT_FLAGS = "$(inherited)";
619619
PRODUCT_NAME = "$(TARGET_NAME)";
620620
SDKROOT = appletvos;
621621
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -639,7 +639,7 @@
639639
INFOPLIST_FILE = ../Shared/tvOS/Info.plist;
640640
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
641641
MTL_FAST_MATH = YES;
642-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
642+
OTHER_SWIFT_FLAGS = "$(inherited)";
643643
PRODUCT_NAME = "$(TARGET_NAME)";
644644
SDKROOT = appletvos;
645645
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Consumption-Tests/Cocoapods-Latest/ObjectiveC.xcodeproj/project.pbxproj

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -739,10 +739,7 @@
739739
DEVELOPMENT_TEAM = H7FL434D9W;
740740
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
741741
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
742-
OTHER_CFLAGS = (
743-
"$(inherited)",
744-
"-DWITH_ENCRYPTION",
745-
);
742+
OTHER_CFLAGS = "$(inherited)";
746743
PRODUCT_NAME = "$(TARGET_NAME)";
747744
};
748745
name = Debug;
@@ -755,10 +752,7 @@
755752
DEVELOPMENT_TEAM = H7FL434D9W;
756753
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
757754
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
758-
OTHER_CFLAGS = (
759-
"$(inherited)",
760-
"-DWITH_ENCRYPTION",
761-
);
755+
OTHER_CFLAGS = "$(inherited)";
762756
PRODUCT_NAME = "$(TARGET_NAME)";
763757
};
764758
name = Release;
@@ -779,10 +773,7 @@
779773
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
780774
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
781775
MTL_FAST_MATH = YES;
782-
OTHER_CFLAGS = (
783-
"$(inherited)",
784-
"-DWITH_ENCRYPTION",
785-
);
776+
OTHER_CFLAGS = "$(inherited)";
786777
PRODUCT_NAME = "$(TARGET_NAME)";
787778
SDKROOT = macosx;
788779
};
@@ -803,10 +794,7 @@
803794
INFOPLIST_FILE = ../Shared/macOS/Info.plist;
804795
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
805796
MTL_FAST_MATH = YES;
806-
OTHER_CFLAGS = (
807-
"$(inherited)",
808-
"-DWITH_ENCRYPTION",
809-
);
797+
OTHER_CFLAGS = "$(inherited)";
810798
PRODUCT_NAME = "$(TARGET_NAME)";
811799
SDKROOT = macosx;
812800
};
@@ -828,10 +816,7 @@
828816
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
829817
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
830818
MTL_FAST_MATH = YES;
831-
OTHER_CFLAGS = (
832-
"$(inherited)",
833-
"-DWITH_ENCRYPTION",
834-
);
819+
OTHER_CFLAGS = "$(inherited)";
835820
PRODUCT_NAME = "$(TARGET_NAME)";
836821
SDKROOT = appletvos;
837822
TARGETED_DEVICE_FAMILY = 3;
@@ -853,10 +838,7 @@
853838
INFOPLIST_FILE = ../Shared/tvOS/Info.plist;
854839
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
855840
MTL_FAST_MATH = YES;
856-
OTHER_CFLAGS = (
857-
"$(inherited)",
858-
"-DWITH_ENCRYPTION",
859-
);
841+
OTHER_CFLAGS = "$(inherited)";
860842
PRODUCT_NAME = "$(TARGET_NAME)";
861843
SDKROOT = appletvos;
862844
TARGETED_DEVICE_FAMILY = 3;

Consumption-Tests/Cocoapods-Latest/Swift.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@
726726
DEVELOPMENT_TEAM = H7FL434D9W;
727727
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
728728
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
729-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
729+
OTHER_SWIFT_FLAGS = "$(inherited)";
730730
PRODUCT_NAME = "$(TARGET_NAME)";
731731
PROVISIONING_PROFILE = "";
732732
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -745,7 +745,7 @@
745745
GCC_OPTIMIZATION_LEVEL = s;
746746
INFOPLIST_FILE = ../Shared/iOS/Info.plist;
747747
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
748-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
748+
OTHER_SWIFT_FLAGS = "$(inherited)";
749749
PRODUCT_NAME = "$(TARGET_NAME)";
750750
PROVISIONING_PROFILE = "";
751751
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -770,7 +770,7 @@
770770
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
771771
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
772772
MTL_FAST_MATH = YES;
773-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
773+
OTHER_SWIFT_FLAGS = "$(inherited)";
774774
PRODUCT_NAME = "$(TARGET_NAME)";
775775
SDKROOT = macosx;
776776
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -794,7 +794,7 @@
794794
INFOPLIST_FILE = ../Shared/macOS/Info.plist;
795795
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
796796
MTL_FAST_MATH = YES;
797-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
797+
OTHER_SWIFT_FLAGS = "$(inherited)";
798798
PRODUCT_NAME = "$(TARGET_NAME)";
799799
SDKROOT = macosx;
800800
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -819,7 +819,7 @@
819819
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
820820
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
821821
MTL_FAST_MATH = YES;
822-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
822+
OTHER_SWIFT_FLAGS = "$(inherited)";
823823
PRODUCT_NAME = "$(TARGET_NAME)";
824824
SDKROOT = appletvos;
825825
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -844,7 +844,7 @@
844844
INFOPLIST_FILE = ../Shared/tvOS/Info.plist;
845845
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
846846
MTL_FAST_MATH = YES;
847-
OTHER_SWIFT_FLAGS = "$(inherited) -DWITH_ENCRYPTION";
847+
OTHER_SWIFT_FLAGS = "$(inherited)";
848848
PRODUCT_NAME = "$(TARGET_NAME)";
849849
SDKROOT = appletvos;
850850
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

0 commit comments

Comments
 (0)