Skip to content

Carthage patch #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bobgodwinx merged 3 commits into from
Oct 22, 2017
Merged

Carthage patch #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e830d2a
Carthage patch
bobgodwinx Oct 21, 2017
b64ec1d
Travis file update
bobgodwinx Oct 21, 2017
cec94dc
Project setting
bobgodwinx Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,14 @@ 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
- 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

14 changes: 14 additions & 0 deletions Action.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 70 files
+4 −4 .swiftlint.yml
+6 −0 .travis.yml
+2 −1 Nimble.podspec
+27 −15 Nimble.xcodeproj/project.pbxproj
+3 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+3 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+3 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+20 −16 README.md
+1 −1 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/CwlCatchException.m
+2 −1 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/include/CwlCatchException.h
+21 −17 Sources/Nimble/Adapters/NMBExpectation.swift
+3 −1 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+7 −2 Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+1 −1 Sources/Nimble/Adapters/NonObjectiveC/ExceptionCapture.swift
+23 −5 Sources/Nimble/DSL+Wait.swift
+1 −1 Sources/Nimble/DSL.swift
+1 −0 Sources/Nimble/Expectation.swift
+2 −1 Sources/Nimble/ExpectationMessage.swift
+11 −2 Sources/Nimble/Expression.swift
+3 −2 Sources/Nimble/Matchers/AllPass.swift
+13 −3 Sources/Nimble/Matchers/AsyncMatcherWrapper.swift
+2 −2 Sources/Nimble/Matchers/BeAKindOf.swift
+3 −3 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+6 −6 Sources/Nimble/Matchers/BeCloseTo.swift
+7 −4 Sources/Nimble/Matchers/BeEmpty.swift
+4 −3 Sources/Nimble/Matchers/BeGreaterThan.swift
+2 −2 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+2 −2 Sources/Nimble/Matchers/BeIdenticalTo.swift
+2 −2 Sources/Nimble/Matchers/BeLessThan.swift
+2 −2 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+5 −5 Sources/Nimble/Matchers/BeLogical.swift
+2 −2 Sources/Nimble/Matchers/BeNil.swift
+2 −2 Sources/Nimble/Matchers/BeginWith.swift
+3 −2 Sources/Nimble/Matchers/Contain.swift
+3 −2 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+2 −2 Sources/Nimble/Matchers/EndWith.swift
+5 −5 Sources/Nimble/Matchers/Equal.swift
+4 −2 Sources/Nimble/Matchers/HaveCount.swift
+2 −2 Sources/Nimble/Matchers/Match.swift
+6 −1 Sources/Nimble/Matchers/MatchError.swift
+8 −24 Sources/Nimble/Matchers/MatcherProtocols.swift
+3 −5 Sources/Nimble/Matchers/PostNotification.swift
+1 −1 Sources/Nimble/Matchers/Predicate.swift
+25 −10 Sources/Nimble/Matchers/RaisesException.swift
+4 −2 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+3 −2 Sources/Nimble/Matchers/ThrowAssertion.swift
+21 −3 Sources/Nimble/Matchers/ThrowError.swift
+23 −6 Sources/Nimble/Utils/Async.swift
+1 −1 Sources/Nimble/Utils/Stringers.swift
+3 −3 Sources/NimbleObjectiveC/DSL.h
+6 −6 Sources/NimbleObjectiveC/DSL.m
+2 −2 Sources/NimbleObjectiveC/NMBExceptionCapture.h
+3 −3 Sources/NimbleObjectiveC/NMBExceptionCapture.m
+2 −0 Tests/.swiftlint.yml
+25 −0 Tests/NimbleTests/AsynchronousTest.swift
+1 −1 Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
+5 −3 Tests/NimbleTests/Helpers/utils.swift
+5 −5 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+4 −4 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+2 −2 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeginWithTest.swift
+1 −1 Tests/NimbleTests/Matchers/ContainTest.swift
+1 −1 Tests/NimbleTests/Matchers/EndWithTest.swift
+2 −2 Tests/NimbleTests/Matchers/EqualTest.swift
+1 −1 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −1 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+1 −1 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Open in desktop
Submodule Quick updated 46 files
+0 −39 .Package.test.swift
+2 −1 .gitignore
+1 −1 .swift-version
+1 −2 .swiftlint.yml
+15 −1 .travis.yml
+1 −1 Documentation/ja/ConfiguringQuick.md
+1 −1 Externals/Nimble
+17 −3 Package.swift
+40 −0 Package@swift-4.swift
+1 −1 Quick.podspec
+83 −32 Quick.xcodeproj/project.pbxproj
+17 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+17 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+17 −1 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+4 −5 Rakefile
+17 −0 Sources/Quick/Behavior.swift
+14 −1 Sources/Quick/Callsite.swift
+2 −2 Sources/Quick/Configuration/Configuration.swift
+4 −4 Sources/Quick/Configuration/QuickConfiguration.swift
+30 −0 Sources/Quick/DSL/DSL.swift
+33 −3 Sources/Quick/DSL/World+DSL.swift
+1 −1 Sources/Quick/ErrorUtility.swift
+20 −2 Sources/Quick/Example.swift
+5 −9 Sources/Quick/ExampleGroup.swift
+14 −1 Sources/Quick/ExampleMetadata.swift
+14 −1 Sources/Quick/Filter.swift
+1 −1 Sources/Quick/NSBundle+CurrentTestBundle.swift
+2 −2 Sources/Quick/NSString+C99ExtendedIdentifier.swift
+1 −1 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+2 −2 Sources/Quick/QuickSpec.swift
+6 −6 Sources/Quick/QuickTestSuite.swift
+17 −3 Sources/Quick/World.swift
+2 −2 Sources/QuickSpecBase/include/QuickSpecBase.h
+10 −1 Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
+1 −1 Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+20 −0 Tests/QuickTests/QuickTests/Fixtures/FunctionalTests_BehaviorTests_Behaviors.swift
+20 −21 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+17 −18 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+59 −0 Tests/QuickTests/QuickTests/FunctionalTests/BehaviorTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ContextTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/CrossReferencingSpecs.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+4 −4 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ObjC/FailureUsingXCTAssertTests+ObjC.m
+8 −1 Tests/QuickTests/QuickTests/FunctionalTests/PendingTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Open in desktop
Submodule RxSwift updated 323 files