Skip to content

Commit 0de0a54

Browse files
authored
Enable incremental pod installs and fix incremental builds (#3345)
* Enable incremental CocoaPods installation * Disable input/output path checking for generated frameworks ... to make incremental builds work properly. Without this, changes to the framework may not be picked up in between test runs. This does make incremental builds slightly slower, but not by much. * Standardize on DWARF debug symbols for Debug builds Configure this once at the project level and remove customizations. This speeds up link times because it avoids needing to separately generate dSYM bundles for our executables.
1 parent e4a0d62 commit 0de0a54

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

Firestore/Example/Firestore.xcodeproj/project.pbxproj

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4777,7 +4777,6 @@
47774777
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
47784778
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
47794779
COMBINE_HIDPI_IMAGES = YES;
4780-
DEBUG_INFORMATION_FORMAT = dwarf;
47814780
DEVELOPMENT_TEAM = "";
47824781
INFOPLIST_FILE = "Tests/Tests-Info.plist";
47834782
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -4802,7 +4801,6 @@
48024801
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
48034802
COMBINE_HIDPI_IMAGES = YES;
48044803
COPY_PHASE_STRIP = NO;
4805-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
48064804
DEVELOPMENT_TEAM = "";
48074805
INFOPLIST_FILE = "Tests/Tests-Info.plist";
48084806
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -4828,7 +4826,6 @@
48284826
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
48294827
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
48304828
CODE_SIGN_STYLE = Automatic;
4831-
DEBUG_INFORMATION_FORMAT = dwarf;
48324829
INFOPLIST_FILE = "$(SRCROOT)/App/tvOS/Info.plist";
48334830
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
48344831
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
@@ -4854,7 +4851,6 @@
48544851
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
48554852
CODE_SIGN_STYLE = Automatic;
48564853
COPY_PHASE_STRIP = NO;
4857-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
48584854
INFOPLIST_FILE = "$(SRCROOT)/App/tvOS/Info.plist";
48594855
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
48604856
MTL_ENABLE_DEBUG_INFO = NO;
@@ -4878,7 +4874,6 @@
48784874
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
48794875
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
48804876
CODE_SIGN_STYLE = Automatic;
4881-
DEBUG_INFORMATION_FORMAT = dwarf;
48824877
INFOPLIST_FILE = "Tests/Tests-Info.plist";
48834878
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
48844879
MTL_FAST_MATH = YES;
@@ -4903,7 +4898,6 @@
49034898
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
49044899
CODE_SIGN_STYLE = Automatic;
49054900
COPY_PHASE_STRIP = NO;
4906-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
49074901
INFOPLIST_FILE = "Tests/Tests-Info.plist";
49084902
MTL_ENABLE_DEBUG_INFO = NO;
49094903
MTL_FAST_MATH = YES;
@@ -4927,7 +4921,6 @@
49274921
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
49284922
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
49294923
CODE_SIGN_STYLE = Automatic;
4930-
DEBUG_INFORMATION_FORMAT = dwarf;
49314924
INFOPLIST_FILE = "Tests/Tests-Info.plist";
49324925
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
49334926
MTL_FAST_MATH = YES;
@@ -4952,7 +4945,6 @@
49524945
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
49534946
CODE_SIGN_STYLE = Automatic;
49544947
COPY_PHASE_STRIP = NO;
4955-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
49564948
INFOPLIST_FILE = "Tests/Tests-Info.plist";
49574949
MTL_ENABLE_DEBUG_INFO = NO;
49584950
MTL_FAST_MATH = YES;
@@ -4976,7 +4968,6 @@
49764968
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
49774969
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
49784970
COMBINE_HIDPI_IMAGES = YES;
4979-
DEBUG_INFORMATION_FORMAT = dwarf;
49804971
DEVELOPMENT_TEAM = "";
49814972
INFOPLIST_FILE = "Tests/Tests-Info.plist";
49824973
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -5001,7 +4992,6 @@
50014992
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
50024993
COMBINE_HIDPI_IMAGES = YES;
50034994
COPY_PHASE_STRIP = NO;
5004-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
50054995
DEVELOPMENT_TEAM = "";
50064996
INFOPLIST_FILE = "Tests/Tests-Info.plist";
50074997
MACOSX_DEPLOYMENT_TARGET = 10.11;
@@ -5034,7 +5024,6 @@
50345024
CLANG_WARN_UNREACHABLE_CODE = YES;
50355025
CODE_SIGN_IDENTITY = "iPhone Developer";
50365026
CODE_SIGN_STYLE = Automatic;
5037-
DEBUG_INFORMATION_FORMAT = dwarf;
50385027
ENABLE_STRICT_OBJC_MSGSEND = YES;
50395028
GCC_NO_COMMON_BLOCKS = YES;
50405029
INFOPLIST_FILE = ../Swift/Tests/Info.plist;
@@ -5071,7 +5060,6 @@
50715060
CODE_SIGN_IDENTITY = "iPhone Developer";
50725061
CODE_SIGN_STYLE = Automatic;
50735062
COPY_PHASE_STRIP = NO;
5074-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
50755063
ENABLE_STRICT_OBJC_MSGSEND = YES;
50765064
GCC_NO_COMMON_BLOCKS = YES;
50775065
INFOPLIST_FILE = ../Swift/Tests/Info.plist;
@@ -5143,6 +5131,7 @@
51435131
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
51445132
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
51455133
COPY_PHASE_STRIP = NO;
5134+
DEBUG_INFORMATION_FORMAT = dwarf;
51465135
ENABLE_STRICT_OBJC_MSGSEND = YES;
51475136
ENABLE_TESTABILITY = YES;
51485137
GCC_C_LANGUAGE_STANDARD = c99;
@@ -5439,7 +5428,6 @@
54395428
CLANG_WARN_UNREACHABLE_CODE = YES;
54405429
CODE_SIGN_STYLE = Automatic;
54415430
COMBINE_HIDPI_IMAGES = YES;
5442-
DEBUG_INFORMATION_FORMAT = dwarf;
54435431
DEVELOPMENT_TEAM = "";
54445432
ENABLE_STRICT_OBJC_MSGSEND = YES;
54455433
GCC_NO_COMMON_BLOCKS = YES;
@@ -5478,7 +5466,6 @@
54785466
CODE_SIGN_STYLE = Automatic;
54795467
COMBINE_HIDPI_IMAGES = YES;
54805468
COPY_PHASE_STRIP = NO;
5481-
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
54825469
DEVELOPMENT_TEAM = "";
54835470
ENABLE_STRICT_OBJC_MSGSEND = YES;
54845471
GCC_NO_COMMON_BLOCKS = YES;

Firestore/Example/Podfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,17 @@ source 'https://cdn.cocoapods.org/'
99

1010
use_frameworks!
1111

12+
install! 'cocoapods',
13+
:generate_multiple_pod_projects => true,
14+
:incremental_installation => true,
15+
# Disable input/output path checking for generated frameworks to make
16+
# incremental builds work properly. Without this, changes to the framework
17+
# may not be picked up in between test runs.
18+
#
19+
# See:
20+
# https://github.com/CocoaPods/CocoaPods/issues/8073
21+
# https://www.ralfebert.de/ios/blog/cocoapods-clean-input-output-files/
22+
:disable_input_output_paths => true
1223

1324
post_install do |installer|
1425
sync = Pathname.new(__FILE__).dirname.join('../../scripts/sync_project.rb')

0 commit comments

Comments
 (0)