Skip to content

Commit cdc044c

Browse files
bobgodwinxbobgodwinx
authored
Merge pull request #118 from bobgodwinx/master
Carthage patch
2 parents 375c078 + cec94dc commit cdc044c

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

‎.travis.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ os: osx
22
language: objective-c
33
osx_image: xcode9
44

5+
before_script:
6+
- carthage version
7+
- carthage bootstrap
8+
59
script:
610
- set -o pipefail
7-
- xcodebuild build-for-testing test-without-building -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c
8-
- xcodebuild build -workspace Action.xcworkspace -scheme Action-watchOS -sdk watchsimulator -destination "name=Apple Watch - 38mm" | xcpretty -c
11+
- xcodebuild test -workspace Action.xcworkspace -scheme Action -sdk iphonesimulator -destination "name=iPhone X" | xcpretty -c
12+
- xcodebuild build -workspace Action.xcworkspace -scheme Action-watchOS -sdk watchsimulator -destination "name=Apple Watch - 38mm" | xcpretty -c
913
- xcodebuild build -workspace Action.xcworkspace -scheme Action-macOS -sdk macosx -destination "arch=x86_64" | xcpretty -c
1014
- xcodebuild build -workspace Action.xcworkspace -scheme Action-tvOS -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty -c
11-
- swift build
1215

‎Action.xcodeproj/project.pbxproj

+14
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,7 @@
801801
DYLIB_COMPATIBILITY_VERSION = 1;
802802
DYLIB_CURRENT_VERSION = 1;
803803
DYLIB_INSTALL_NAME_BASE = "@rpath";
804+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
804805
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
805806
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
806807
PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action;
@@ -823,6 +824,7 @@
823824
DYLIB_COMPATIBILITY_VERSION = 1;
824825
DYLIB_CURRENT_VERSION = 1;
825826
DYLIB_INSTALL_NAME_BASE = "@rpath";
827+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
826828
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
827829
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
828830
PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action;
@@ -847,6 +849,7 @@
847849
DYLIB_CURRENT_VERSION = 1;
848850
DYLIB_INSTALL_NAME_BASE = "@rpath";
849851
FRAMEWORK_VERSION = A;
852+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
850853
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
851854
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
852855
MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -872,6 +875,7 @@
872875
DYLIB_CURRENT_VERSION = 1;
873876
DYLIB_INSTALL_NAME_BASE = "@rpath";
874877
FRAMEWORK_VERSION = A;
878+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
875879
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
876880
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
877881
MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -894,6 +898,7 @@
894898
DYLIB_COMPATIBILITY_VERSION = 1;
895899
DYLIB_CURRENT_VERSION = 1;
896900
DYLIB_INSTALL_NAME_BASE = "@rpath";
901+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
897902
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
898903
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
899904
PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action;
@@ -917,6 +922,7 @@
917922
DYLIB_COMPATIBILITY_VERSION = 1;
918923
DYLIB_CURRENT_VERSION = 1;
919924
DYLIB_INSTALL_NAME_BASE = "@rpath";
925+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
920926
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
921927
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
922928
PRODUCT_BUNDLE_IDENTIFIER = jp.toshi0383.Action;
@@ -946,6 +952,7 @@
946952
COMBINE_HIDPI_IMAGES = YES;
947953
DEVELOPMENT_TEAM = K42G4S78CE;
948954
GCC_C_LANGUAGE_STANDARD = gnu11;
955+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
949956
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
950957
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
951958
MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -974,6 +981,7 @@
974981
COMBINE_HIDPI_IMAGES = YES;
975982
DEVELOPMENT_TEAM = K42G4S78CE;
976983
GCC_C_LANGUAGE_STANDARD = gnu11;
984+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
977985
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
978986
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
979987
MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -991,6 +999,7 @@
991999
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
9921000
CLANG_WARN_SUSPICIOUS_MOVES = YES;
9931001
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
1002+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
9941003
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
9951004
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
9961005
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
@@ -1008,6 +1017,7 @@
10081017
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10091018
CLANG_WARN_SUSPICIOUS_MOVES = YES;
10101019
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
1020+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
10111021
INFOPLIST_FILE = Tests/ActionTests/Info.plist;
10121022
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
10131023
PRODUCT_BUNDLE_IDENTIFIER = "-.Tests";
@@ -1021,6 +1031,7 @@
10211031
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10221032
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10231033
CLANG_WARN_SUSPICIOUS_MOVES = YES;
1034+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
10241035
INFOPLIST_FILE = Demo/Info.plist;
10251036
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10261037
PRODUCT_BUNDLE_IDENTIFIER = "-.Demo";
@@ -1035,6 +1046,7 @@
10351046
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
10361047
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
10371048
CLANG_WARN_SUSPICIOUS_MOVES = YES;
1049+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
10381050
INFOPLIST_FILE = Demo/Info.plist;
10391051
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
10401052
PRODUCT_BUNDLE_IDENTIFIER = "-.Demo";
@@ -1151,6 +1163,7 @@
11511163
DYLIB_COMPATIBILITY_VERSION = 1;
11521164
DYLIB_CURRENT_VERSION = 1;
11531165
DYLIB_INSTALL_NAME_BASE = "@rpath";
1166+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
11541167
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11551168
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11561169
PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action;
@@ -1169,6 +1182,7 @@
11691182
DYLIB_COMPATIBILITY_VERSION = 1;
11701183
DYLIB_CURRENT_VERSION = 1;
11711184
DYLIB_INSTALL_NAME_BASE = "@rpath";
1185+
GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO;
11721186
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
11731187
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11741188
PRODUCT_BUNDLE_IDENTIFIER = com.ashfurrow.Action;

‎Cartfile.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v7.0.1"
2-
github "Quick/Quick" "v1.1.0"
3-
github "ReactiveX/RxSwift" "4.0.0-alpha.1"
1+
github "Quick/Nimble" "v7.0.2"
2+
github "Quick/Quick" "v1.2.0"
3+
github "ReactiveX/RxSwift" "4.0.0"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 70 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 46 files

‎Carthage/Checkouts/RxSwift

Submodule RxSwift updated 323 files

0 commit comments

Comments
 (0)