🐛 :: Run pod install with fix for interface builder

This commit is contained in:
Felix Mau
2019-08-25 21:39:30 +02:00
parent 95a28420c9
commit c88021a13e
7 changed files with 686 additions and 680 deletions
+12
View File
@@ -9,6 +9,18 @@ target 'GradientLoadingBar_Example' do
pod 'SwiftFormat/CLI'
pod 'SwiftLint'
# Fix issues with interface builder and cocoapods.
# Source: https://github.com/CocoaPods/CocoaPods/issues/7606#issuecomment-484294739
post_install do |installer|
installer.pods_project.build_configurations.each do |config|
next unless config.name == 'Debug'
config.build_settings['LD_RUNPATH_SEARCH_PATHS'] = [
'$(FRAMEWORK_SEARCH_PATHS)'
]
end
end
target 'GradientLoadingBar_Tests' do
inherit! :search_paths
+2 -2
View File
@@ -26,6 +26,6 @@ SPEC CHECKSUMS:
SwiftFormat: d0e2118da5bfccc0158f0b8eff80c476c5acd984
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
PODFILE CHECKSUM: 55891446b31c0884d45a4c65f1b52d307ff274bc
PODFILE CHECKSUM: 9a1a2f86c7b31d66ba4113a2176ea0299f2e507c
COCOAPODS: 1.6.0
COCOAPODS: 1.7.5
+2 -2
View File
@@ -26,6 +26,6 @@ SPEC CHECKSUMS:
SwiftFormat: d0e2118da5bfccc0158f0b8eff80c476c5acd984
SwiftLint: fed9c66336e41fc74dc48a73678380718f0c8b0e
PODFILE CHECKSUM: 55891446b31c0884d45a4c65f1b52d307ff274bc
PODFILE CHECKSUM: 9a1a2f86c7b31d66ba4113a2176ea0299f2e507c
COCOAPODS: 1.6.0
COCOAPODS: 1.7.5
File diff suppressed because it is too large Load Diff
@@ -94,7 +94,7 @@ install_dsym() {
binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
# Strip invalid architectures so "fat" simulator / device frameworks work on device
if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
if [[ "$(file "$binary")" == *"Mach-O "*"dSYM companion"* ]]; then
strip_invalid_archs "$binary"
fi
@@ -109,6 +109,14 @@ install_dsym() {
fi
}
# Copies the bcsymbolmap files of a vendored framework
install_bcsymbolmap() {
local bcsymbolmap_path="$1"
local destination="${BUILT_PRODUCTS_DIR}"
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${bcsymbolmap_path}" "${destination}""
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${bcsymbolmap_path}" "${destination}"
}
# Signs a framework with the provided identity
code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY:-}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
@@ -1,7 +1,6 @@
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/GradientLoadingBar" "${PODS_CONFIGURATION_BUILD_DIR}/LightweightObservable"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/GradientLoadingBar/GradientLoadingBar.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LightweightObservable/LightweightObservable.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -framework "GradientLoadingBar" -framework "LightweightObservable"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
@@ -1,7 +1,6 @@
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/GradientLoadingBar" "${PODS_CONFIGURATION_BUILD_DIR}/LightweightObservable"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/GradientLoadingBar/GradientLoadingBar.framework/Headers" "${PODS_CONFIGURATION_BUILD_DIR}/LightweightObservable/LightweightObservable.framework/Headers"
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
OTHER_LDFLAGS = $(inherited) -framework "GradientLoadingBar" -framework "LightweightObservable"
PODS_BUILD_DIR = ${BUILD_DIR}
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)