From a9775cd86a57018ee3eb55170ab0313c55d91be8 Mon Sep 17 00:00:00 2001 From: Yonas Kolb Date: Sun, 23 Jul 2017 21:08:58 +0200 Subject: [PATCH] clean setting_presets --- setting_groups/base.yml | 3 +++ setting_groups/configs/debug.yml | 1 - setting_groups/configs/release.yml | 1 - setting_groups/platforms/iOS.yml | 1 - setting_groups/platforms/macOS.yml | 1 - setting_groups/platforms/tvOS.yml | 3 +-- setting_groups/platforms/watchOS.yml | 3 +-- .../com.apple.product-type.application.watchapp2.yml | 4 ---- .../products/com.apple.product-type.application.yml | 3 --- .../products/com.apple.product-type.bundle.ui-testing.yml | 3 --- .../products/com.apple.product-type.bundle.unit-test.yml | 2 -- setting_groups/products/com.apple.product-type.framework.yml | 3 --- .../products/com.apple.product-type.tv-app-extension.yml | 4 +--- setting_groups/products/watchkit2-extension.yml | 5 +---- 14 files changed, 7 insertions(+), 30 deletions(-) diff --git a/setting_groups/base.yml b/setting_groups/base.yml index 3601514f..ea41747d 100644 --- a/setting_groups/base.yml +++ b/setting_groups/base.yml @@ -1,4 +1,7 @@ --- +PRODUCT_NAME: '$(TARGET_NAME)' +SWIFT_VERSION: '3.0' +ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' ALWAYS_SEARCH_USER_PATHS: 'NO' CLANG_ANALYZER_NONNULL: 'YES' CLANG_CXX_LANGUAGE_STANDARD: gnu++0x diff --git a/setting_groups/configs/debug.yml b/setting_groups/configs/debug.yml index 6d1dc758..f01d2146 100644 --- a/setting_groups/configs/debug.yml +++ b/setting_groups/configs/debug.yml @@ -1,4 +1,3 @@ ---- DEBUG_INFORMATION_FORMAT: dwarf SWIFT_OPTIMIZATION_LEVEL: "-Onone" COPY_PHASE_STRIP: 'YES' diff --git a/setting_groups/configs/release.yml b/setting_groups/configs/release.yml index 14bc02a6..385e6276 100644 --- a/setting_groups/configs/release.yml +++ b/setting_groups/configs/release.yml @@ -1,4 +1,3 @@ ---- DEBUG_INFORMATION_FORMAT: dwarf-with-dsym SWIFT_OPTIMIZATION_LEVEL: "-Owholemodule" COPY_PHASE_STRIP: 'NO' diff --git a/setting_groups/platforms/iOS.yml b/setting_groups/platforms/iOS.yml index 3944a84b..fcdb458e 100644 --- a/setting_groups/platforms/iOS.yml +++ b/setting_groups/platforms/iOS.yml @@ -1,4 +1,3 @@ ---- LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" SDKROOT: iphoneos IPHONEOS_DEPLOYMENT_TARGET: '10.2' diff --git a/setting_groups/platforms/macOS.yml b/setting_groups/platforms/macOS.yml index ec84d81e..ca145511 100644 --- a/setting_groups/platforms/macOS.yml +++ b/setting_groups/platforms/macOS.yml @@ -1,4 +1,3 @@ ---- LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/../Frameworks" SDKROOT: macosx MACOSX_DEPLOYMENT_TARGET: '10.12' diff --git a/setting_groups/platforms/tvOS.yml b/setting_groups/platforms/tvOS.yml index aadf7239..e13afb8d 100644 --- a/setting_groups/platforms/tvOS.yml +++ b/setting_groups/platforms/tvOS.yml @@ -1,5 +1,4 @@ ---- TARGETED_DEVICE_FAMILY: 3 SDKROOT: 'appletvos' TVOS_DEPLOYMENT_TARGET: '10.1' -LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" \ No newline at end of file +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks" diff --git a/setting_groups/platforms/watchOS.yml b/setting_groups/platforms/watchOS.yml index 88beaade..a735bc1e 100644 --- a/setting_groups/platforms/watchOS.yml +++ b/setting_groups/platforms/watchOS.yml @@ -1,5 +1,4 @@ ---- SDKROOT: watchos SKIP_INSTALL: 'YES' TARGETED_DEVICE_FAMILY: 4 -WATCHOS_DEPLOYMENT_TARGET: 3.1 \ No newline at end of file +WATCHOS_DEPLOYMENT_TARGET: 3.1 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 55c8781f..3430484e 100644 --- a/setting_groups/products/com.apple.product-type.application.watchapp2.yml +++ b/setting_groups/products/com.apple.product-type.application.watchapp2.yml @@ -1,5 +1 @@ ---- -ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon -PRODUCT_NAME: "$(TARGET_NAME)" -SWIFT_VERSION: '3.0' 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 55c8781f..a6a47511 100644 --- a/setting_groups/products/com.apple.product-type.application.yml +++ b/setting_groups/products/com.apple.product-type.application.yml @@ -1,5 +1,2 @@ ---- ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon -PRODUCT_NAME: "$(TARGET_NAME)" -SWIFT_VERSION: '3.0' ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' diff --git a/setting_groups/products/com.apple.product-type.bundle.ui-testing.yml b/setting_groups/products/com.apple.product-type.bundle.ui-testing.yml index 95734dd0..4ac6dcc6 100644 --- a/setting_groups/products/com.apple.product-type.bundle.ui-testing.yml +++ b/setting_groups/products/com.apple.product-type.bundle.ui-testing.yml @@ -1,6 +1,3 @@ --- -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' BUNDLE_LOADER: $(TEST_HOST) LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks -PRODUCT_NAME: $(TARGET_NAME) -SWIFT_VERSION: '3.0' \ No newline at end of file diff --git a/setting_groups/products/com.apple.product-type.bundle.unit-test.yml b/setting_groups/products/com.apple.product-type.bundle.unit-test.yml index 95734dd0..c600651e 100644 --- a/setting_groups/products/com.apple.product-type.bundle.unit-test.yml +++ b/setting_groups/products/com.apple.product-type.bundle.unit-test.yml @@ -2,5 +2,3 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' BUNDLE_LOADER: $(TEST_HOST) LD_RUNPATH_SEARCH_PATHS: $(inherited) @executable_path/Frameworks @loader_path/Frameworks -PRODUCT_NAME: $(TARGET_NAME) -SWIFT_VERSION: '3.0' \ No newline at end of file diff --git a/setting_groups/products/com.apple.product-type.framework.yml b/setting_groups/products/com.apple.product-type.framework.yml index 4ac57386..3fd060f0 100644 --- a/setting_groups/products/com.apple.product-type.framework.yml +++ b/setting_groups/products/com.apple.product-type.framework.yml @@ -1,7 +1,4 @@ --- -PRODUCT_NAME: "$(TARGET_NAME)" -SWIFT_VERSION: '3.0' -ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: 'YES' ENABLE_TESTABILITY: 'YES' CURRENT_PROJECT_VERSION: 1 DEFINES_MODULE: 'YES' 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 49f421af..f8301e41 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,3 @@ --- -PRODUCT_NAME: "$(TARGET_NAME)" -SWIFT_VERSION: '3.0' SKIP_INSTALL: 'YES' -LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" \ No newline at end of file +LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks" diff --git a/setting_groups/products/watchkit2-extension.yml b/setting_groups/products/watchkit2-extension.yml index 170e0cce..3390d69a 100644 --- a/setting_groups/products/watchkit2-extension.yml +++ b/setting_groups/products/watchkit2-extension.yml @@ -1,6 +1,3 @@ --- -PRODUCT_NAME: "$(TARGET_NAME)" -SWIFT_VERSION: '3.0' -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 +ASSETCATALOG_COMPILER_COMPLICATION_NAME: Complication