Skip to content

Commit

Permalink
tweak setting preset files
Browse files Browse the repository at this point in the history
  • Loading branch information
@yonaskolb
yonaskolb committed Aug 26, 2017
1 parent 9a93189 commit 7db1f77
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
14 changes: 6 additions & 8 deletions Fixtures/TestProject/GeneratedProject.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = MyFramework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -390,7 +390,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = TestProject/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.test;
SDKROOT = iphoneos;
Expand All @@ -401,7 +401,6 @@
XCBC47994501 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -455,7 +454,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = TestProjectTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -468,7 +467,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = TestProject/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.test;
SDKROOT = iphoneos;
Expand All @@ -479,7 +478,6 @@
XCBC88111401 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_NONNULL = YES;
Expand Down Expand Up @@ -526,7 +524,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = TestProjectTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -543,7 +541,7 @@
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = MyFramework/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
2 changes: 1 addition & 1 deletion SettingPresets/Platforms/iOS.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks"
SDKROOT: iphoneos
IPHONEOS_DEPLOYMENT_TARGET: '10.2'
IPHONEOS_DEPLOYMENT_TARGET: 9.1
TARGETED_DEVICE_FAMILY: '1,2'
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
2 changes: 1 addition & 1 deletion SettingPresets/Platforms/macOS.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/../Frameworks"
SDKROOT: macosx
MACOSX_DEPLOYMENT_TARGET: '10.12'
MACOSX_DEPLOYMENT_TARGET: 10.12
COMBINE_HIDPI_IMAGES: 'YES'
ASSETCATALOG_COMPILER_APPICON_NAME: AppIcon
2 changes: 1 addition & 1 deletion SettingPresets/Platforms/tvOS.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TARGETED_DEVICE_FAMILY: 3
SDKROOT: 'appletvos'
TVOS_DEPLOYMENT_TARGET: '10.1'
TVOS_DEPLOYMENT_TARGET: 9.1
LD_RUNPATH_SEARCH_PATHS: "$(inherited) @executable_path/Frameworks"
ASSETCATALOG_COMPILER_APPICON_NAME: App Icon & Top Shelf Image
1 change: 0 additions & 1 deletion SettingPresets/base.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ COPY_PHASE_STRIP: 'NO'
GCC_C_LANGUAGE_STANDARD: gnu99
GCC_NO_COMMON_BLOCKS: 'YES'
ENABLE_STRICT_OBJC_MSGSEND: 'YES'
CODE_SIGN_IDENTITY[sdk=iphoneos*]: iPhone Developer

This comment has been minimized.

Sign in to view

Copy link
@ImLaufderZeit

ImLaufderZeit Aug 28, 2017 •
edited
Loading

Why has this line been deleted? I mean, without this base setting you have to click Enable Development Signing every time you generate an iOS project. Maybe some conjunctions of generalizing for supporting multi-platform?
Of course, we can just add this line to our own spec though.

This comment has been minimized.

Sign in to view

Copy link
@yonaskolb

yonaskolb Aug 28, 2017

Author Owner

You're right. I didn't want to to be added to every project, but it should be added to the iOS platform template. Other newer platforms like tvOS get this value from the SDK

This comment has been minimized.

Sign in to view

Copy link
@ImLaufderZeit

ImLaufderZeit Aug 29, 2017

That makes sense. And you made it back into iOS base preset, thanks!

This comment has been minimized.

Sign in to view

Copy link
@yonaskolb

yonaskolb Aug 30, 2017

Author Owner

Hi @ImLaufderZeit. This has been changed again so that that CODE_SIGN_IDENTITY[sdk=iphoneos*] is only added to iOS applications not all iOS targets such as frameworks #46
This fixes a bunch of warnings that would otherwise show, but still fixes the common case.

Let me know if this causes any issues

This comment has been minimized.

Sign in to view

Copy link
@ImLaufderZeit

ImLaufderZeit Aug 31, 2017

@yonaskolb, that totally makes sense, making the flow flexible, it's awesome.
Re-generating iOS application specs make no issues so far in 0.6.1.

0 comments on commit 7db1f77

Please sign in to comment.