From 3b5fb06cc003df41c55e6c8f847a28b72e9dfe71 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Sun, 23 Jul 2017 21:00:02 +0200 Subject: [PATCH] fix boolean build settings --- .../spec.xcodeproj/project.pbxproj | 16 +++---- setting_groups/base.yml | 42 +++++++++---------- setting_groups/configs/debug.yml | 10 ++--- setting_groups/configs/release.yml | 8 ++-- setting_groups/platforms/watchOS.yml | 2 +- ...ple.product-type.application.watchapp2.yml | 2 +- .../com.apple.product-type.application.yml | 2 +- .../com.apple.product-type.framework.yml | 6 +-- ...om.apple.product-type.tv-app-extension.yml | 2 +- .../products/watchkit2-extension.yml | 2 +- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Fixtures/TestProject/spec.xcodeproj/project.pbxproj b/Fixtures/TestProject/spec.xcodeproj/project.pbxproj index 541cf2d5..6cbb8e15 100644 --- a/Fixtures/TestProject/spec.xcodeproj/project.pbxproj +++ b/Fixtures/TestProject/spec.xcodeproj/project.pbxproj @@ -31,14 +31,14 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - OBJECT_11 /* FrameworkFile.swift */ = {isa = PBXFileReference; name = FrameworkFile.swift; path = FrameworkFile.swift; sourceTree = ""; }; - OBJECT_12 /* Info.plist */ = {isa = PBXFileReference; name = Info.plist; path = Info.plist; sourceTree = ""; }; - OBJECT_13 /* MyFramework.h */ = {isa = PBXFileReference; name = MyFramework.h; path = MyFramework.h; sourceTree = ""; }; - OBJECT_25 /* AppDelegate.swift */ = {isa = PBXFileReference; name = AppDelegate.swift; path = AppDelegate.swift; sourceTree = ""; }; - OBJECT_26 /* Assets.xcassets */ = {isa = PBXFileReference; name = Assets.xcassets; path = Assets.xcassets; sourceTree = ""; }; - OBJECT_27 /* Base.lproj */ = {isa = PBXFileReference; name = Base.lproj; path = Base.lproj; sourceTree = ""; }; - OBJECT_28 /* Info.plist */ = {isa = PBXFileReference; name = Info.plist; path = Info.plist; sourceTree = ""; }; - OBJECT_29 /* ViewController.swift */ = {isa = PBXFileReference; name = ViewController.swift; path = ViewController.swift; sourceTree = ""; }; + OBJECT_11 /* FrameworkFile.swift */ = {isa = PBXFileReference; path = FrameworkFile.swift; sourceTree = ""; }; + OBJECT_12 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = ""; }; + OBJECT_13 /* MyFramework.h */ = {isa = PBXFileReference; path = MyFramework.h; sourceTree = ""; }; + OBJECT_25 /* AppDelegate.swift */ = {isa = PBXFileReference; path = AppDelegate.swift; sourceTree = ""; }; + OBJECT_26 /* Assets.xcassets */ = {isa = PBXFileReference; path = Assets.xcassets; sourceTree = ""; }; + OBJECT_27 /* Base.lproj */ = {isa = PBXFileReference; path = Base.lproj; sourceTree = ""; }; + OBJECT_28 /* Info.plist */ = {isa = PBXFileReference; path = Info.plist; sourceTree = ""; }; + OBJECT_29 /* ViewController.swift */ = {isa = PBXFileReference; path = ViewController.swift; sourceTree = ""; }; OBJECT_6 /* MyFramework.framework */ = {isa = PBXFileReference; explicitFileType = framework; includeInIndex = 0; path = MyFramework.framework; sourceTree = BUILT_PRODUCTS_DIR; }; OBJECT_9 /* TestProject.app */ = {isa = PBXFileReference; explicitFileType = app; includeInIndex = 0; path = TestProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ diff --git a/setting_groups/base.yml b/setting_groups/base.yml index f96b9efc..3601514f 100644 --- a/setting_groups/base.yml +++ b/setting_groups/base.yml @@ -1,30 +1,30 @@ --- -ALWAYS_SEARCH_USER_PATHS: NO -CLANG_ANALYZER_NONNULL: YES +ALWAYS_SEARCH_USER_PATHS: 'NO' +CLANG_ANALYZER_NONNULL: 'YES' CLANG_CXX_LANGUAGE_STANDARD: gnu++0x CLANG_CXX_LIBRARY: libc++ -CLANG_ENABLE_MODULES: YES -CLANG_ENABLE_OBJC_ARC: YES -CLANG_WARN_BOOL_CONVERSION: YES -CLANG_WARN_CONSTANT_CONVERSION: YES +CLANG_ENABLE_MODULES: 'YES' +CLANG_ENABLE_OBJC_ARC: 'YES' +CLANG_WARN_BOOL_CONVERSION: 'YES' +CLANG_WARN_CONSTANT_CONVERSION: 'YES' CLANG_WARN_DIRECT_OBJC_ISA_USAGE: YES_ERROR -CLANG_WARN_DOCUMENTATION_COMMENTS: YES -CLANG_WARN_EMPTY_BODY: YES -CLANG_WARN_ENUM_CONVERSION: YES -CLANG_WARN_INFINITE_RECURSION: YES -CLANG_WARN_INT_CONVERSION: YES +CLANG_WARN_DOCUMENTATION_COMMENTS: 'YES' +CLANG_WARN_EMPTY_BODY: 'YES' +CLANG_WARN_ENUM_CONVERSION: 'YES' +CLANG_WARN_INFINITE_RECURSION: 'YES' +CLANG_WARN_INT_CONVERSION: 'YES' CLANG_WARN_OBJC_ROOT_CLASS: YES_ERROR -CLANG_WARN_SUSPICIOUS_MOVES: YES -CLANG_WARN_UNREACHABLE_CODE: YES -CLANG_WARN__DUPLICATE_METHOD_MATCH: YES -GCC_WARN_64_TO_32_BIT_CONVERSION: YES +CLANG_WARN_SUSPICIOUS_MOVES: 'YES' +CLANG_WARN_UNREACHABLE_CODE: 'YES' +CLANG_WARN__DUPLICATE_METHOD_MATCH: 'YES' +GCC_WARN_64_TO_32_BIT_CONVERSION: 'YES' GCC_WARN_ABOUT_RETURN_TYPE: YES_ERROR -GCC_WARN_UNDECLARED_SELECTOR: YES +GCC_WARN_UNDECLARED_SELECTOR: 'YES' GCC_WARN_UNINITIALIZED_AUTOS: YES_AGGRESSIVE -GCC_WARN_UNUSED_FUNCTION: YES -GCC_WARN_UNUSED_VARIABLE: YES -COPY_PHASE_STRIP: NO +GCC_WARN_UNUSED_FUNCTION: 'YES' +GCC_WARN_UNUSED_VARIABLE: 'YES' +COPY_PHASE_STRIP: 'NO' GCC_C_LANGUAGE_STANDARD: gnu99 -GCC_NO_COMMON_BLOCKS: YES -ENABLE_STRICT_OBJC_MSGSEND: YES +GCC_NO_COMMON_BLOCKS: 'YES' +ENABLE_STRICT_OBJC_MSGSEND: 'YES' CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Developer diff --git a/setting_groups/configs/debug.yml b/setting_groups/configs/debug.yml index e848c0cc..6d1dc758 100644 --- a/setting_groups/configs/debug.yml +++ b/setting_groups/configs/debug.yml @@ -1,13 +1,13 @@ --- DEBUG_INFORMATION_FORMAT: dwarf SWIFT_OPTIMIZATION_LEVEL: "-Onone" -COPY_PHASE_STRIP: YES -ENABLE_TESTABILITY: YES -GCC_DYNAMIC_NO_PIC: NO +COPY_PHASE_STRIP: 'YES' +ENABLE_TESTABILITY: 'YES' +GCC_DYNAMIC_NO_PIC: 'NO' GCC_OPTIMIZATION_LEVEL: '0' -ONLY_ACTIVE_ARCH: YES +ONLY_ACTIVE_ARCH: 'YES' SWIFT_ACTIVE_COMPILATION_CONDITIONS: DEBUG -CLANG_WARN_SUSPICIOUS_MOVE: YES +CLANG_WARN_SUSPICIOUS_MOVE: 'YES' GCC_PREPROCESSOR_DEFINITIONS: - DEBUG=1 - "$(inherited)" diff --git a/setting_groups/configs/release.yml b/setting_groups/configs/release.yml index 1e3cc7e5..14bc02a6 100644 --- a/setting_groups/configs/release.yml +++ b/setting_groups/configs/release.yml @@ -1,8 +1,8 @@ --- DEBUG_INFORMATION_FORMAT: dwarf-with-dsym SWIFT_OPTIMIZATION_LEVEL: "-Owholemodule" -COPY_PHASE_STRIP: NO -ENABLE_NS_ASSERTIONS: NO +COPY_PHASE_STRIP: 'NO' +ENABLE_NS_ASSERTIONS: 'NO' GCC_OPTIMIZATION_LEVEL: s -VALIDATE_PRODUCT: YES -CLANG_WARN_SUSPICIOUS_MOVE: YES +VALIDATE_PRODUCT: 'YES' +CLANG_WARN_SUSPICIOUS_MOVE: 'YES' diff --git a/setting_groups/platforms/watchOS.yml b/setting_groups/platforms/watchOS.yml index 099cb449..88beaade 100644 --- a/setting_groups/platforms/watchOS.yml +++ b/setting_groups/platforms/watchOS.yml @@ -1,5 +1,5 @@ --- SDKROOT: watchos -SKIP_INSTALL: YES +SKIP_INSTALL: 'YES' TARGETED_DEVICE_FAMILY: 4 WATCHOS_DEPLOYMENT_TARGET: 3.1 \ No newline at end of file diff --git a/setting_groups/products/com.apple.product-type.application.watchapp2.yml b/setting_groups/products/com.apple.product-type.application.watchapp2.yml index 378216f6..55c8781f 100644 --- a/setting_groups/products/com.apple.product-type.application.watchapp2.yml +++ b/setting_groups/products/com.apple.product-type.application.watchapp2.yml @@ -2,4 +2,4 @@ ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon PRODUCT_NAME: "$(TARGET_NAME)" SWIFT_VERSION: '3.0' -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: "YES" +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' diff --git a/setting_groups/products/com.apple.product-type.application.yml b/setting_groups/products/com.apple.product-type.application.yml index 378216f6..55c8781f 100644 --- a/setting_groups/products/com.apple.product-type.application.yml +++ b/setting_groups/products/com.apple.product-type.application.yml @@ -2,4 +2,4 @@ ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon PRODUCT_NAME: "$(TARGET_NAME)" SWIFT_VERSION: '3.0' -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: "YES" +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' diff --git a/setting_groups/products/com.apple.product-type.framework.yml b/setting_groups/products/com.apple.product-type.framework.yml index 814de19f..4ac57386 100644 --- a/setting_groups/products/com.apple.product-type.framework.yml +++ b/setting_groups/products/com.apple.product-type.framework.yml @@ -1,9 +1,9 @@ --- PRODUCT_NAME: "$(TARGET_NAME)" SWIFT_VERSION: '3.0' -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: "YES" -ENABLE_TESTABILITY: "YES" +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' +ENABLE_TESTABILITY: 'YES' CURRENT_PROJECT_VERSION: 1 -DEFINES_MODULE: "YES" +DEFINES_MODULE: 'YES' VERSIONING_SYSTEM: "apple-generic" INSTALL_PATH: "$(LOCAL_LIBRARY_DIR)/Frameworks" diff --git a/setting_groups/products/com.apple.product-type.tv-app-extension.yml b/setting_groups/products/com.apple.product-type.tv-app-extension.yml index b9f5212b..49f421af 100644 --- a/setting_groups/products/com.apple.product-type.tv-app-extension.yml +++ b/setting_groups/products/com.apple.product-type.tv-app-extension.yml @@ -1,5 +1,5 @@ --- PRODUCT_NAME: "$(TARGET_NAME)" SWIFT_VERSION: '3.0' -SKIP_INSTALL: YES +SKIP_INSTALL: 'YES' LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" \ No newline at end of file diff --git a/setting_groups/products/watchkit2-extension.yml b/setting_groups/products/watchkit2-extension.yml index 7df205b4..170e0cce 100644 --- a/setting_groups/products/watchkit2-extension.yml +++ b/setting_groups/products/watchkit2-extension.yml @@ -1,6 +1,6 @@ --- PRODUCT_NAME: "$(TARGET_NAME)" SWIFT_VERSION: '3.0' -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: "YES" +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" ASSETCATALOG_COMPILER_COMPLICATION_NAME: Complication \ No newline at end of file