diff --git a/SettingPresets/Platforms/iOS.yml b/SettingPresets/Platforms/iOS.yml index 623f44ca..c602faf1 100644 --- a/SettingPresets/Platforms/iOS.yml +++ b/SettingPresets/Platforms/iOS.yml @@ -2,4 +2,3 @@ LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"] SDKROOT: iphoneos IPHONEOS_DEPLOYMENT_TARGET: 10.0 TARGETED_DEVICE_FAMILY: '1,2' -ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/SettingPresets/Platforms/macOS.yml b/SettingPresets/Platforms/macOS.yml index e9f691c0..bfa3c8a4 100644 --- a/SettingPresets/Platforms/macOS.yml +++ b/SettingPresets/Platforms/macOS.yml @@ -2,4 +2,3 @@ LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/../Frameworks" SDKROOT: macosx MACOSX_DEPLOYMENT_TARGET: 10.12 COMBINE_HIDPI_IMAGES: 'YES' -ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/SettingPresets/Platforms/tvOS.yml b/SettingPresets/Platforms/tvOS.yml index 7afac189..a8636353 100644 --- a/SettingPresets/Platforms/tvOS.yml +++ b/SettingPresets/Platforms/tvOS.yml @@ -2,5 +2,3 @@ TARGETED_DEVICE_FAMILY: 3 LD_RUNPATH_SEARCH_PATHS: ["$(inherited)", "@executable_path/Frameworks"] SDKROOT: appletvos TVOS_DEPLOYMENT_TARGET: "10.0" -ASSETCATALOG_COMPILER_APPICON_NAME: App Icon & Top Shelf Image -ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME: LaunchImage diff --git a/SettingPresets/Platforms/watchOS.yml b/SettingPresets/Platforms/watchOS.yml index 914c6e24..0287fce1 100644 --- a/SettingPresets/Platforms/watchOS.yml +++ b/SettingPresets/Platforms/watchOS.yml @@ -2,4 +2,3 @@ SDKROOT: watchos SKIP_INSTALL: 'YES' TARGETED_DEVICE_FAMILY: 4 WATCHOS_DEPLOYMENT_TARGET: 3.0 -ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/SettingPresets/Product_Platform/application_iOS.yml b/SettingPresets/Product_Platform/application_iOS.yml index 72ab8af2..31225146 100644 --- a/SettingPresets/Product_Platform/application_iOS.yml +++ b/SettingPresets/Product_Platform/application_iOS.yml @@ -1 +1,2 @@ CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Developer +ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/SettingPresets/Product_Platform/application_macOS.yml b/SettingPresets/Product_Platform/application_macOS.yml new file mode 100644 index 00000000..e538b238 --- /dev/null +++ b/SettingPresets/Product_Platform/application_macOS.yml @@ -0,0 +1 @@ +ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/SettingPresets/Product_Platform/application_tvOS.yml b/SettingPresets/Product_Platform/application_tvOS.yml new file mode 100644 index 00000000..7681fa28 --- /dev/null +++ b/SettingPresets/Product_Platform/application_tvOS.yml @@ -0,0 +1,2 @@ +ASSETCATALOG_COMPILER_APPICON_NAME: App Icon & Top Shelf Image +ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME: LaunchImage diff --git a/SettingPresets/Product_Platform/application_watchOS.yml b/SettingPresets/Product_Platform/application_watchOS.yml new file mode 100644 index 00000000..e538b238 --- /dev/null +++ b/SettingPresets/Product_Platform/application_watchOS.yml @@ -0,0 +1 @@ +ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon diff --git a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj index b62c575d..fc09091a 100644 --- a/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj +++ b/Tests/Fixtures/TestProject/Project.xcodeproj/project.pbxproj @@ -776,7 +776,6 @@ BC_108053643718 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -826,7 +825,6 @@ BC_129177384103 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -841,7 +839,6 @@ BC_210307580165 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -863,7 +860,6 @@ BC_210338877784 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -894,7 +890,6 @@ BC_240587562436 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -986,8 +981,6 @@ BC_275347760107 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1018,7 +1011,6 @@ BC_282993554784 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -1046,7 +1038,6 @@ BC_313103118526 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1077,7 +1068,6 @@ BC_351179072988 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1108,7 +1098,6 @@ BC_368555321779 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1130,8 +1119,6 @@ BC_380703106572 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1162,7 +1149,6 @@ BC_381577484690 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1246,7 +1232,6 @@ BC_444705348320 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1261,7 +1246,6 @@ BC_467730755629 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1298,8 +1282,6 @@ BC_493052431451 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1330,7 +1312,6 @@ BC_499325041919 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1357,7 +1338,6 @@ BC_517306343059 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1410,8 +1390,6 @@ BC_533481109982 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1442,7 +1420,6 @@ BC_563308786207 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1469,7 +1446,6 @@ BC_568886047790 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1540,7 +1516,6 @@ BC_594849660073 /* Production Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1571,7 +1546,6 @@ BC_622471558373 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1602,7 +1576,6 @@ BC_644737893954 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1624,7 +1597,6 @@ BC_645651856160 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1639,8 +1611,6 @@ BC_655752097950 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1671,7 +1641,6 @@ BC_685135820012 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1698,7 +1667,6 @@ BC_705279564212 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -1831,7 +1799,6 @@ BC_741359447852 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -1881,8 +1848,6 @@ BC_760168680599 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image"; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1913,7 +1878,6 @@ BC_765441740976 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1; @@ -1941,7 +1905,6 @@ BC_790711614758 /* Staging Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -1968,7 +1931,6 @@ BC_793714544511 /* Test Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; BUNDLE_LOADER = "$(TEST_HOST)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1990,7 +1952,6 @@ BC_799591451484 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2027,7 +1988,6 @@ BC_805283956103 /* Production Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; IPHONEOS_DEPLOYMENT_TARGET = 10.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -2100,7 +2060,6 @@ BC_835911551172 /* Test Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; @@ -2127,7 +2086,6 @@ BC_879000441352 /* Staging Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 1;