Skip to content

Commit

Permalink
Update to Xcode 12.2 recommended settings (#742)
Browse files Browse the repository at this point in the history
* Update to Xcode 12.2 recommended settings

Actually, decline most of the suggestions and just update the
LastUpgradeCheck so that Xcode stops nagging us for updates.

  - Keep building "arm64e" architecture for iOS.

    Xcode 12 wants to set ARCHS -- the architectures to build for --
    to just $(ARCHS_STANDARD). However, keep building the arm64e slice
    contrary to Xcode suggestions.

    arm64e is an architecture for Apple A12 chips which supports
    'pointer authentication' [1]. Keep building Themis for this
    architecture to ensure that it is supported.

    This architecture is only supported on the real iOS devices,
    iOS Simulator does not support it (even on Apple Silicon).
    It is also not supported on macOS.

    [1]: https://developer.apple.com/documentation/security/preparing_your_app_to_work_with_pointer_authentication

  - Build for all architectures only in Release mode.

    Xcode 12.2 suggests enabling ONLY_ACTIVE_ARCH in Debug mode in order
    to improve build times. Release builds -- such as when archiving --
    will still build all architectures.

    However, make sure that arm64 builds are disabled for iOS Simulator
    in test targets too, just like they are disabled in the framework.

  - Ignore warnings about quotes includes in framework headers.

    Set CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER to NO. This
    new warning (enabled by default since Xcode 12) is known to break
    umbrella headers of frameworks. CocoaPods currently disables it [2].
    We do this as well since all those

        #import "objcthemis.h"

    in "src/wrappers/themis/Obj-C/Themis/themis.h" are causing this
    warning. Apparently, Xcode wants this to be changed to this:

        #import <objcthemis.h>

    but then in fails due to a missing file because the framework is not
    in the search path for itself. We *do intend* to include a header
    file from the current directory -- the framework header directory.
    It's not clear what Xcode wants from us here, so just follow the
    CocoaPods guidance for now and disable the warning. This does not
    affect compilation and later use of the framework in apps.

    [2]: CocoaPods/CocoaPods#9902

  - Keep iOS target at 10.0.

    Xcode 12 suggests to update the minimum supported iOS to 12.0, but
    we'll still support iOS 10 for this release so keep the old value.

  - Keep Swift 4 in tests for Swift 4.

    Do not upgrade SWIFT_VERSION in the targets which test Swift 4
    compatibility specifically, in spite Xcode wanting to do this.

* Move common settings to project level

A lot of Xcode settings for targets are actually shared by all of them.
Having common settings specified for individual targets makes it hard
to update them as you can easily forget to update them everywhere. Let's
move all shared settings to the project level so that they can be easily
updated everywhere at once. Leave per-target overrides where necessary.

  - Build for iOS and iPadOS simultaneously.

    Keep TARGETED_DEVICE_FAMILY for iOS framework as "1,2" which marks
    both iOS and iPadOS as supported by default for all targets.

  - Use common versioning.

    Instead of iOS and macOS frameworks using separate versions, move
    the version variables to the project level: CURRENT_PROJECT_VERSION
    and MARKETING_VERSION. We also have no use for VERSION_INFO_PREFIX.

    Since we release iOS and macOS frameworks simultaneously, their
    versions should be updated simultaneously as well.

  - Use common warning settings.

    Move some of the additional compiler warnings to the project level
    so that they are enabled for all targets by default.

    This includes the "treat warnings as errors" policy which is now
    enabled for all targets.

  - Use common Swift compiler settings.

    All our targets use the same Swift compiler settings (except for
    Swift version). Move all of them to the project level, but keep
    the test targets using SWIFT_VERSION.

  - Use default code signing settings.

    Since we're building a framework here, it's not normally signed.
    The signature is applied only when archiving the complete app.
    Default settings use ad-hoc signing for integrity protection,
    but we should not hardcode development teams, etc.

  - Enable bitcode by default.

    Make sure that bitcode is enabled for all (iOS) targets by default.
    However, keep it disabled for tests. Test targets are built as
    bundles and they are not compatible with bitcode, causing ld errors:
    "-bundle and -bitcode_bundle (Xcode setting ENABLE_BITCODE=YES)
    cannot be used together".

  - Move miscellaneous settings to project level.

    Such as CLANG_ENABLE_MODULES. We don't really use Clang modules
    in our source code, but system headers use them and this somewhat
    speeds up compilation.

* Drop deprecated settings

Remove the settings which we don't really need.

  - Ignore high-DPI images.

    Remove COMBINE_HIDPI_IMAGES as none of our frameworks contains any
    image resources whatsoever. Xcode's default is fine for us.

  - Ignore user paths.

    Remove ALWAYS_SEARCH_USER_PATHS as it's marked deprecated since
    Xcode 8 and may be removed. It has no effect on out builds.

  - Remove unused Metal settings.

    Older Xcodes insisted on including MTL_ENABLE_DEBUG_INFO and
    MTL_FAST_MATH into new projects, but Themis does not use Metal
    so we don't really need those settings.

* Suppress non-null warnings in tests

Since now all warnings are treated as errors, those warnings in tests
are no longer tolerated. The tests intentionally pass NULL values to
parameters marked as "nonnull". Suppress the warnings here to test this
invalid behavior.
  • Loading branch information
ilammy committed Nov 5, 2020
1 parent d854c61 commit 665db31
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 88 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ _Code:_

- Updated Objective-C examples (iOS and macOS, Carthage and CocoaPods) to showcase usage of the newest Secure Cell API: generating symmetric keys and using Secure Cell with Passphrase ([#688](https://github.com/cossacklabs/themis/pull/688)) and to use latest Themis 0.13.4 ([#701](https://github.com/cossacklabs/themis/pull/701), [#703](https://github.com/cossacklabs/themis/pull/703), [#706](https://github.com/cossacklabs/themis/pull/706), [#723](https://github.com/cossacklabs/themis/pull/723), [#724](https://github.com/cossacklabs/themis/pull/724), [#726](https://github.com/cossacklabs/themis/pull/726), [#740](https://github.com/cossacklabs/themis/pull/740)).
- `TSSession` initializer now returns an error (`nil`) when given incorrect key type ([#710](https://github.com/cossacklabs/themis/pull/710)).
- Improved compatibility with Xcode 12 ([#742](https://github.com/cossacklabs/themis/pull/742)).

- **PHP**

Expand All @@ -47,6 +48,7 @@ _Code:_

- Updated Swift examples (iOS and macOS, Carthage and CocoaPods) to showcase usage of the newest Secure Cell API: generating symmetric keys and using Secure Cell with Passphrase ([#688](https://github.com/cossacklabs/themis/pull/688)) and to use latest Themis 0.13.4 ([#701](https://github.com/cossacklabs/themis/pull/701), [#703](https://github.com/cossacklabs/themis/pull/703), [#706](https://github.com/cossacklabs/themis/pull/706), [#740](https://github.com/cossacklabs/themis/pull/740)).
- `TSSession` initializer now returns an error (`nil`) when given incorrect key type ([#710](https://github.com/cossacklabs/themis/pull/710)).
- Improved compatibility with Xcode 12 ([#742](https://github.com/cossacklabs/themis/pull/742)).

_Infrastructure:_

Expand Down
127 changes: 46 additions & 81 deletions Themis.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@
738B81062239809D00A9947C /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1120;
LastUpgradeCheck = 1220;
ORGANIZATIONNAME = "Cossack Labs";
TargetAttributes = {
9F00E8D6223C197900EC1EF3 = {
Expand Down Expand Up @@ -1343,7 +1343,6 @@
738B81152239809D00A9947C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand All @@ -1366,15 +1365,15 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 4;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
Expand All @@ -1387,6 +1386,9 @@
"DEBUG=1",
"$(inherited)",
);
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -1395,20 +1397,19 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
MARKETING_VERSION = 0.13.4;
ONLY_ACTIVE_ARCH = YES;
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = 1;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Debug;
};
738B81162239809D00A9947C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
Expand All @@ -1431,21 +1432,24 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 4;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
Expand All @@ -1454,25 +1458,19 @@
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MACOSX_DEPLOYMENT_TARGET = 10.11;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
MARKETING_VERSION = 0.13.4;
SUPPORTS_MACCATALYST = NO;
TARGETED_DEVICE_FAMILY = 1;
SWIFT_COMPILATION_MODE = wholemodule;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
name = Release;
};
9F00E8DC223C197A00EC1EF3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand All @@ -1482,9 +1480,6 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/src",
"$(PROJECT_DIR)/src/wrappers/themis/Obj-C",
Expand All @@ -1496,7 +1491,6 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 0.13.4;
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
PRODUCT_MODULE_NAME = themis;
PRODUCT_NAME = themis;
Expand All @@ -1509,12 +1503,7 @@
9F00E8DD223C197A00EC1EF3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
Expand All @@ -1524,9 +1513,6 @@
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/src",
"$(PROJECT_DIR)/src/wrappers/themis/Obj-C",
Expand All @@ -1538,7 +1524,6 @@
"@executable_path/../Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 0.13.4;
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
PRODUCT_MODULE_NAME = themis;
PRODUCT_NAME = themis;
Expand All @@ -1555,25 +1540,17 @@
"$(ARCHS_STANDARD)",
arm64e,
);
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 arm64e";
EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/wrappers/themis/Obj-C/exported.symbols";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/src",
"$(PROJECT_DIR)/src/wrappers/themis/Obj-C",
Expand All @@ -1585,17 +1562,12 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 0.13.4;
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
PRODUCT_MODULE_NAME = themis;
PRODUCT_NAME = themis;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = "-Wno-documentation";
};
name = Debug;
Expand All @@ -1607,25 +1579,17 @@
"$(ARCHS_STANDARD)",
arm64e,
);
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 arm64e";
EXPORTED_SYMBOLS_FILE = "$(PROJECT_DIR)/src/wrappers/themis/Obj-C/exported.symbols";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = (
"$(PROJECT_DIR)/src",
"$(PROJECT_DIR)/src/wrappers/themis/Obj-C",
Expand All @@ -1637,28 +1601,20 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 0.13.4;
PRODUCT_BUNDLE_IDENTIFIER = com.cossacklabs.themis;
PRODUCT_MODULE_NAME = themis;
PRODUCT_NAME = themis;
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
SUPPORTS_MACCATALYST = NO;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
WARNING_CFLAGS = "-Wno-documentation";
};
name = Release;
};
9F70B2C5241D0FEC009CB629 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
Expand All @@ -1674,18 +1630,14 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_OBJC_BRIDGING_HEADER = "tests/objcthemis/objthemis/objthemis-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
9F70B2C6241D0FEC009CB629 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
Expand All @@ -1708,7 +1660,12 @@
9F70B2F0241D17A3009CB629 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
ARCHS = (
"$(ARCHS_STANDARD)",
arm64e,
);
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 arm64e";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
Expand All @@ -1731,7 +1688,12 @@
9F70B2F1241D17A3009CB629 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
ARCHS = (
"$(ARCHS_STANDARD)",
arm64e,
);
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 arm64e";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
Expand All @@ -1754,7 +1716,12 @@
9F70B3172420E16E009CB629 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
ARCHS = (
"$(ARCHS_STANDARD)",
arm64e,
);
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 arm64e";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
Expand All @@ -1777,7 +1744,12 @@
9F70B3182420E16E009CB629 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
ARCHS = (
"$(ARCHS_STANDARD)",
arm64e,
);
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 arm64e";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/iOS",
Expand All @@ -1800,10 +1772,7 @@
9F70B32F2420E176009CB629 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
Expand All @@ -1819,18 +1788,14 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_OBJC_BRIDGING_HEADER = "tests/objcthemis/objthemis/objthemis-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.0;
};
name = Debug;
};
9F70B3302420E176009CB629 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
Expand Down
Loading

0 comments on commit 665db31

Please sign in to comment.