File tree Expand file tree Collapse file tree 7 files changed +26
-12
lines changed
Networking/Networking.xcodeproj
Storage/Storage.xcodeproj
Yosemite/Yosemite.xcodeproj Expand file tree Collapse file tree 7 files changed +26
-12
lines changed Original file line number Diff line number Diff line change 871871 SDKROOT = iphoneos;
872872 SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
873873 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
874+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
874875 VERSIONING_SYSTEM = "apple-generic";
875876 VERSION_INFO_PREFIX = "";
876877 };
928929 SWIFT_COMPILATION_MODE = wholemodule;
929930 SWIFT_OPTIMIZATION_LEVEL = "-O";
930931 VALIDATE_PRODUCT = YES;
932+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
931933 VERSIONING_SYSTEM = "apple-generic";
932934 VERSION_INFO_PREFIX = "";
933935 };
Original file line number Diff line number Diff line change @@ -111,17 +111,29 @@ target 'Storage' do
111111end
112112
113113
114- # Workaround: Set SWIFT_VERSION = 4.0 in dependencies that do not have an explicit setting.
115- # Xcode is bumping them up to 4.2, and the project just won't build.
116- #
117- # TODO: Remove as soon as the dependencies get updated!
114+
115+ # Workarounds:
116+ # ============
118117#
119118post_install do |installer |
119+
120+ # Workaround: SWIFT_VERSION = 4.0 in dependencies that need it
121+ # ============================================================
122+ #
123+ # TODO: Remove as soon as the dependencies get updated!
124+ #
120125 installer . pods_project . targets . each do |target |
121126 if [ 'XLPagerTabStrip' ] . include? target . name
122127 target . build_configurations . each do |config |
123128 config . build_settings [ 'SWIFT_VERSION' ] = '4.0'
124129 end
125130 end
126131 end
132+
133+ # Workaround: Drop 32 Bit Architectures
134+ # =====================================
135+ #
136+ installer . pods_project . build_configuration_list . build_configurations . each do |configuration |
137+ configuration . build_settings [ 'VALID_ARCHS' ] = '$(ARCHS_STANDARD_64_BIT)'
138+ end
127139end
Original file line number Diff line number Diff line change @@ -142,6 +142,6 @@ SPEC CHECKSUMS:
142142 wpxmlrpc: bfc572f62ce7ee897f6f38b098d2ba08732ecef4
143143 XLPagerTabStrip: c908b17cbf42fcd2598ee1adfc49bae25444d88a
144144
145- PODFILE CHECKSUM: 981be965167cc86fe91da27bdad699c37a296081
145+ PODFILE CHECKSUM: 8f65818d967811f7366275f2d16515dd15ac0f9e
146146
147147COCOAPODS: 1.5.3
Original file line number Diff line number Diff line change 568568 SDKROOT = iphoneos;
569569 SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
570570 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
571+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
571572 VERSIONING_SYSTEM = "apple-generic";
572573 VERSION_INFO_PREFIX = "";
573574 };
625626 SWIFT_COMPILATION_MODE = wholemodule;
626627 SWIFT_OPTIMIZATION_LEVEL = "-O";
627628 VALIDATE_PRODUCT = YES;
629+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
628630 VERSIONING_SYSTEM = "apple-generic";
629631 VERSION_INFO_PREFIX = "";
630632 };
Original file line number Diff line number Diff line change 7070 <string >Main </string >
7171 <key >UIRequiredDeviceCapabilities </key >
7272 <array >
73- <string >armv7 </string >
73+ <string >arm64 </string >
7474 </array >
7575 <key >UISupportedInterfaceOrientations </key >
7676 <array >
Original file line number Diff line number Diff line change 14261426 SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
14271427 SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WooCommerce-Bridging-Header.h";
14281428 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1429- VALID_ARCHS = "$(inherited )";
1429+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT )";
14301430 };
14311431 name = Debug;
14321432 };
14801480 SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WooCommerce-Bridging-Header.h";
14811481 SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
14821482 VALIDATE_PRODUCT = YES;
1483- VALID_ARCHS = "$(inherited )";
1483+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT )";
14841484 };
14851485 name = Release;
14861486 };
15061506 SWIFT_VERSION = 4.2;
15071507 TARGETED_DEVICE_FAMILY = "1,2";
15081508 USER_HEADER_SEARCH_PATHS = "";
1509- VALID_ARCHS = "$(inherited)";
15101509 };
15111510 name = Debug;
15121511 };
15321531 SWIFT_VERSION = 4.2;
15331532 TARGETED_DEVICE_FAMILY = "1,2";
15341533 USER_HEADER_SEARCH_PATHS = "";
1535- VALID_ARCHS = "$(inherited)";
15361534 };
15371535 name = Release;
15381536 };
Original file line number Diff line number Diff line change 674674 SDKROOT = iphoneos;
675675 SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
676676 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
677+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
677678 VERSIONING_SYSTEM = "apple-generic";
678679 VERSION_INFO_PREFIX = "";
679680 };
731732 SWIFT_COMPILATION_MODE = wholemodule;
732733 SWIFT_OPTIMIZATION_LEVEL = "-O";
733734 VALIDATE_PRODUCT = YES;
735+ VALID_ARCHS = "$(ARCHS_STANDARD_64_BIT)";
734736 VERSIONING_SYSTEM = "apple-generic";
735737 VERSION_INFO_PREFIX = "";
736738 };
760762 SKIP_INSTALL = YES;
761763 SWIFT_VERSION = 4.2;
762764 TARGETED_DEVICE_FAMILY = "1,2";
763- VALID_ARCHS = "$(inherited)";
764765 };
765766 name = Debug;
766767 };
788789 SKIP_INSTALL = YES;
789790 SWIFT_VERSION = 4.2;
790791 TARGETED_DEVICE_FAMILY = "1,2";
791- VALID_ARCHS = "$(inherited)";
792792 };
793793 name = Release;
794794 };
You can’t perform that action at this time.
0 commit comments