From e830d2a8082929d0143a1223ef16a09a1cc92a49 Mon Sep 17 00:00:00 2001 From: bobgodwinx Date: Sat, 21 Oct 2017 16:07:18 +0200 Subject: [PATCH 1/3] Carthage patch Patch for `dyld: Symbol not found` when `Action` is built with carthage --- Cartfile.resolved | 6 +++--- Carthage/Checkouts/Nimble | 2 +- Carthage/Checkouts/Quick | 2 +- Carthage/Checkouts/RxSwift | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cartfile.resolved b/Cartfile.resolved index 0e123298..7abb0801 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "Quick/Nimble" "v7.0.1" -github "Quick/Quick" "v1.1.0" -github "ReactiveX/RxSwift" "4.0.0-alpha.1" +github "Quick/Nimble" "v7.0.2" +github "Quick/Quick" "v1.2.0" +github "ReactiveX/RxSwift" "4.0.0" diff --git a/Carthage/Checkouts/Nimble b/Carthage/Checkouts/Nimble index 39b67002..38c9ab08 160000 --- a/Carthage/Checkouts/Nimble +++ b/Carthage/Checkouts/Nimble @@ -1 +1 @@ -Subproject commit 39b67002306fda9de4c9fd1290a6295f97edd09e +Subproject commit 38c9ab0846a3fbec308eb2aa9ef68b10a7434eb4 diff --git a/Carthage/Checkouts/Quick b/Carthage/Checkouts/Quick index e4fa1e85..0ff81f2c 160000 --- a/Carthage/Checkouts/Quick +++ b/Carthage/Checkouts/Quick @@ -1 +1 @@ -Subproject commit e4fa1e85c0305ba4e0866f25812d3fa398f3a048 +Subproject commit 0ff81f2c665b4381f526bd656f8708dd52a9ea2f diff --git a/Carthage/Checkouts/RxSwift b/Carthage/Checkouts/RxSwift index 16083c30..12cccb17 160000 --- a/Carthage/Checkouts/RxSwift +++ b/Carthage/Checkouts/RxSwift @@ -1 +1 @@ -Subproject commit 16083c30ebb8705124921b6974cc1481f3476184 +Subproject commit 12cccb171ad9038251af6883807f0290c1d75a5b From b64ec1d82753a2e36e94cb34e736e4f5f6c7f71e Mon Sep 17 00:00:00 2001 From: bobgodwinx Date: Sat, 21 Oct 2017 16:35:13 +0200 Subject: [PATCH 2/3] Travis file update Updated `.travis file` to add a bootstrap which should recreate `Cartfile.resolved` always --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4d5fbd74..8ceff674 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,10 @@ os: osx language: objective-c osx_image: xcode9 +before_script: + - carthage version + - carthage bootstrap + script: - set -o pipefail - xcodebuild build-for-testing test-without-building -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c From cec94dc058bdc493f544925b68c0ab9a23936326 Mon Sep 17 00:00:00 2001 From: bobgodwinx Date: Sat, 21 Oct 2017 21:06:57 +0200 Subject: [PATCH 3/3] Project setting Update project settings to silence unnecesary `LLVM` warning + cleanup `.travis.yml` xcodebuild commands --- .travis.yml | 5 ++--- Action.xcodeproj/project.pbxproj | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8ceff674..deac4273 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,8 @@ before_script: script: - set -o pipefail - - xcodebuild build-for-testing test-without-building -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c - - xcodebuild build -workspace Action.xcworkspace -scheme Action-watchOS -sdk watchsimulator -destination "name=Apple Watch - 38mm" | xcpretty -c + - xcodebuild test -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c + - xcodebuild build -workspace Action.xcworkspace -scheme Action-watchOS -sdk watchsimulator -destination "name=Apple Watch - 38mm" | xcpretty -c - xcodebuild build -workspace Action.xcworkspace -scheme Action-macOS -sdk macosx -destination "arch=x86_64" | xcpretty -c - xcodebuild build -workspace Action.xcworkspace -scheme Action-tvOS -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty -c - - swift build diff --git a/Action.xcodeproj/project.pbxproj b/Action.xcodeproj/project.pbxproj index 1c1eb786..c9a7ebc7 100644 --- a/Action.xcodeproj/project.pbxproj +++ b/Action.xcodeproj/project.pbxproj @@ -801,6 +801,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action; @@ -823,6 +824,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action; @@ -847,6 +849,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; @@ -872,6 +875,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; @@ -894,6 +898,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action; @@ -917,6 +922,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action; @@ -946,6 +952,7 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = K42G4S78CE; GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Tests/ActionTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; @@ -974,6 +981,7 @@ COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = K42G4S78CE; GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Tests/ActionTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.12; @@ -991,6 +999,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Tests/ActionTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "-.Tests"; @@ -1008,6 +1017,7 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Tests/ActionTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "-.Tests"; @@ -1021,6 +1031,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Demo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "-.Demo"; @@ -1035,6 +1046,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INFOPLIST_FILE = Demo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "-.Demo"; @@ -1151,6 +1163,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action; @@ -1169,6 +1182,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action;