Skip to content

Commit

Permalink
Merge branch 'release/1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
akashivskyy committed Oct 1, 2017
2 parents 89f9fec + cc40079 commit 9d7617d
Show file tree
Hide file tree
Showing 39 changed files with 220 additions and 419 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
url = https://github.com/Quick/Quick.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
url = https://github.com/netguru/xcconfigs.git
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1
3.2
8 changes: 4 additions & 4 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#
# Cartfile.private
#
# Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
# Copyright © 2017 Netguru Sp. z o.o. All rights reserved.
# Licensed under the MIT License.
#

# Configuration dependencies

github "jspahrsummers/xcconfigs" "master"
github "netguru/xcconfigs" == 0.3

# Test dependencies

github "Quick/Quick" ~> 1.1.0
github "Quick/Nimble" ~> 6.1.0
github "Quick/Quick" ~> 1.2.0
github "Quick/Nimble" ~> 7.0.2
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Quick/Nimble" "v6.1.0"
github "Quick/Quick" "v1.1.0"
github "jspahrsummers/xcconfigs" "2055f18efbe18e77408f7f43947f7ad92b2d4ff0"
github "Quick/Nimble" "v7.0.2"
github "Quick/Quick" "v1.2.0"
github "netguru/xcconfigs" "0.3"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 93 files
+4 −4 .swiftlint.yml
+7 −1 .travis.yml
+2 −1 Nimble.podspec
+65 −19 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
+5 −3 Package.swift
+495 −179 README.md
+1 −1 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/CwlCatchException.m
+2 −1 Sources/Lib/CwlPreconditionTesting/CwlCatchExceptionSupport/include/CwlCatchException.h
+1 −1 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+100 −44 Sources/Nimble/Adapters/NMBExpectation.swift
+3 −1 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+1 −1 Sources/Nimble/Adapters/NimbleEnvironment.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
+66 −5 Sources/Nimble/Expectation.swift
+262 −0 Sources/Nimble/ExpectationMessage.swift
+11 −2 Sources/Nimble/Expression.swift
+27 −0 Sources/Nimble/FailureMessage.swift
+76 −49 Sources/Nimble/Matchers/AllPass.swift
+100 −5 Sources/Nimble/Matchers/AsyncMatcherWrapper.swift
+40 −20 Sources/Nimble/Matchers/BeAKindOf.swift
+29 −23 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+30 −26 Sources/Nimble/Matchers/BeCloseTo.swift
+38 −34 Sources/Nimble/Matchers/BeEmpty.swift
+12 −11 Sources/Nimble/Matchers/BeGreaterThan.swift
+8 −8 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+6 −6 Sources/Nimble/Matchers/BeIdenticalTo.swift
+8 −8 Sources/Nimble/Matchers/BeLessThan.swift
+8 −8 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+24 −30 Sources/Nimble/Matchers/BeLogical.swift
+5 −6 Sources/Nimble/Matchers/BeNil.swift
+2 −2 Sources/Nimble/Matchers/BeVoid.swift
+17 −20 Sources/Nimble/Matchers/BeginWith.swift
+19 −18 Sources/Nimble/Matchers/Contain.swift
+7 −6 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+12 −12 Sources/Nimble/Matchers/EndWith.swift
+87 −48 Sources/Nimble/Matchers/Equal.swift
+9 −7 Sources/Nimble/Matchers/HaveCount.swift
+5 −5 Sources/Nimble/Matchers/Match.swift
+41 −9 Sources/Nimble/Matchers/MatchError.swift
+19 −3 Sources/Nimble/Matchers/MatcherFunc.swift
+24 −23 Sources/Nimble/Matchers/MatcherProtocols.swift
+6 −8 Sources/Nimble/Matchers/PostNotification.swift
+348 −0 Sources/Nimble/Matchers/Predicate.swift
+28 −13 Sources/Nimble/Matchers/RaisesException.swift
+76 −29 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+5 −4 Sources/Nimble/Matchers/ThrowAssertion.swift
+229 −24 Sources/Nimble/Matchers/ThrowError.swift
+37 −0 Sources/Nimble/Matchers/ToSucceed.swift
+39 −23 Sources/Nimble/Utils/Async.swift
+2 −80 Sources/Nimble/Utils/Errors.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
+1 −1 Sources/NimbleObjectiveC/NMBStringify.h
+2 −0 Tests/.swiftlint.yml
+32 −9 Tests/NimbleTests/AsynchronousTest.swift
+1 −1 Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
+16 −14 Tests/NimbleTests/Helpers/utils.swift
+5 −5 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+6 −6 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+14 −14 Tests/NimbleTests/Matchers/BeCloseToTest.swift
+2 −2 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+4 −4 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeginWithTest.swift
+5 −5 Tests/NimbleTests/Matchers/ContainTest.swift
+1 −1 Tests/NimbleTests/Matchers/EndWithTest.swift
+6 −4 Tests/NimbleTests/Matchers/EqualTest.swift
+1 −0 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+1 −1 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −1 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+1 −1 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+1 −0 Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+36 −0 Tests/NimbleTests/Matchers/ToSucceedTest.swift
+2 −2 Tests/NimbleTests/SynchronousTests.swift
+7 −7 Tests/NimbleTests/objc/ObjCAllPassTest.m
+4 −4 Tests/NimbleTests/objc/ObjCBeEmptyTest.m
+4 −4 Tests/NimbleTests/objc/ObjCBeGreaterThanTest.m
+4 −4 Tests/NimbleTests/objc/ObjCBeLessThanTest.m
+2 −2 Tests/NimbleTests/objc/ObjCContainTest.m
+2 −2 Tests/NimbleTests/objc/ObjCEqualTest.m
+1 −1 Tests/NimbleTests/objc/ObjCRaiseExceptionTest.m
+2 −1 script/release
+2 −1 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
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 [email protected]
+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/xcconfigs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfi
```swift
// Swift (Alamofire)
let manager = Alamofire.Manager(configuration: configuration)
let manager = Alamofire.SessionManager(configuration: configuration)
```

And that's all!
Expand Down
6 changes: 3 additions & 3 deletions ResponseDetective.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# ResponseDetective.podspec
#
# Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
# Copyright © 2017 Netguru Sp. z o.o. All rights reserved.
# Licensed under the MIT License.
#

Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
# Description

spec.name = 'ResponseDetective'
spec.version = '1.1'
spec.version = '1.2.0'
spec.summary = 'Sherlock Holmes of the networking layer'
spec.homepage = 'https://github.com/netguru/ResponseDetective'

Expand Down Expand Up @@ -52,7 +52,7 @@ Pod::Spec.new do |spec|
spec.osx.deployment_target = '10.9'
spec.tvos.deployment_target = '9.0'

spec.xcconfig = {
spec.pod_target_xcconfig = {
'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'
}

Expand Down
186 changes: 64 additions & 122 deletions ResponseDetective.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,6 +40,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
Expand Down Expand Up @@ -70,6 +71,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,6 +40,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
Expand Down Expand Up @@ -70,6 +71,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
LastUpgradeVersion = "0900"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down Expand Up @@ -40,6 +40,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
Expand Down Expand Up @@ -70,6 +71,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
101 changes: 0 additions & 101 deletions ResponseDetective/Configuration/Base-Common.xcconfig

This file was deleted.

50 changes: 0 additions & 50 deletions ResponseDetective/Configuration/Base-Mappings.xcconfig

This file was deleted.

25 changes: 25 additions & 0 deletions ResponseDetective/Configuration/Common-Base.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// Common-Base.xcconfig
//
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
// Licensed under the MIT License.
//

// Imports

#include "../../Carthage/Checkouts/xcconfigs/Common/Common.xcconfig"
#include "../../Carthage/Checkouts/xcconfigs/Common/Carthage.xcconfig"

// MARK: Build

_BUILD_VERSION = 1.2.0

// MARK: Deployment

_DEPLOYMENT_TARGET_IOS = 8.0
_DEPLOYMENT_TARGET_MACOS = 10.9
_DEPLOYMENT_TARGET_TVOS = 9.0

// MARK: Compiler

_COMPILER_SWIFT_VERSION = 3.2
11 changes: 11 additions & 0 deletions ResponseDetective/Configuration/Common-Debug.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Common-Debug.xcconfig
//
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
// Licensed under the MIT License.
//

// Imports

#include "Common-Base.xcconfig"
#include "../../Carthage/Checkouts/xcconfigs/Configurations/Debug.xcconfig"
11 changes: 11 additions & 0 deletions ResponseDetective/Configuration/Common-Release.xcconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//
// Common-Release.xcconfig
//
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
// Licensed under the MIT License.
//

// Imports

#include "Common-Base.xcconfig"
#include "../../Carthage/Checkouts/xcconfigs/Configurations/Release.xcconfig"
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
//
// Framework-Common.xcconfig
// Framework-Base.xcconfig
//
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
// Licensed under the MIT License.
//

#include "Base-Common.xcconfig"
// Imports

#include "../../Carthage/Checkouts/xcconfigs/Targets/Framework.xcconfig"

// Bundle

_BUNDLE_NAME = ResponseDetective
_BUNDLE_IDENTIFIER = co.netguru.lib.responsedetective
_BUNDLE_INFOPLIST_PATH = $(SRCROOT)/ResponseDetective/Resources/Framework-Info.plist

_COMPILER_HEADER_SEARCH_PATHS = $(SDKROOT)/usr/include/libxml2
_COMPILER_LINKED_LIBRARIES = -lxml2
// Compiler

_COMPILER_OBJC_HEADER_SEARCH_PATHS = $(SDKROOT)/usr/include/libxml2
_COMPILER_OBJC_LINKER_FLAGS = -lxml2
10 changes: 0 additions & 10 deletions ResponseDetective/Configuration/Framework-iOS-Debug.xcconfig

This file was deleted.

Loading

0 comments on commit 9d7617d

Please sign in to comment.