Skip to content

Commit 9d7617d

Browse files
akashivskyyakashivskyy
committed
Merge branch 'release/1.2.0'
2 parents 89f9fec + cc40079 commit 9d7617d

39 files changed

+220
-419
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
url = https://github.com/Quick/Quick.git
77
[submodule "Carthage/Checkouts/xcconfigs"]
88
path = Carthage/Checkouts/xcconfigs
9-
url = https://github.com/jspahrsummers/xcconfigs.git
9+
url = https://github.com/netguru/xcconfigs.git

‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.1
1+
3.2

‎Cartfile.private

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
#
22
# Cartfile.private
33
#
4-
# Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
4+
# Copyright © 2017 Netguru Sp. z o.o. All rights reserved.
55
# Licensed under the MIT License.
66
#
77

88
# Configuration dependencies
99

10-
github "jspahrsummers/xcconfigs" "master"
10+
github "netguru/xcconfigs" == 0.3
1111

1212
# Test dependencies
1313

14-
github "Quick/Quick" ~> 1.1.0
15-
github "Quick/Nimble" ~> 6.1.0
14+
github "Quick/Quick" ~> 1.2.0
15+
github "Quick/Nimble" ~> 7.0.2

‎Cartfile.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v6.1.0"
2-
github "Quick/Quick" "v1.1.0"
3-
github "jspahrsummers/xcconfigs" "2055f18efbe18e77408f7f43947f7ad92b2d4ff0"
1+
github "Quick/Nimble" "v7.0.2"
2+
github "Quick/Quick" "v1.2.0"
3+
github "netguru/xcconfigs" "0.3"

‎Carthage/Checkouts/Nimble

Submodule Nimble updated 93 files

‎Carthage/Checkouts/Quick

Submodule Quick updated 46 files

‎Carthage/Checkouts/xcconfigs

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ AFURLSessionManager *manager = [[AFURLSessionManager alloc] initWithSessionConfi
5959
```swift
6060
// Swift (Alamofire)
6161
62-
let manager = Alamofire.Manager(configuration: configuration)
62+
let manager = Alamofire.SessionManager(configuration: configuration)
6363
```
6464

6565
And that's all!

‎ResponseDetective.podspec

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# ResponseDetective.podspec
33
#
4-
# Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
4+
# Copyright © 2017 Netguru Sp. z o.o. All rights reserved.
55
# Licensed under the MIT License.
66
#
77

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

1212
spec.name = 'ResponseDetective'
13-
spec.version = '1.1'
13+
spec.version = '1.2.0'
1414
spec.summary = 'Sherlock Holmes of the networking layer'
1515
spec.homepage = 'https://github.com/netguru/ResponseDetective'
1616

@@ -52,7 +52,7 @@ Pod::Spec.new do |spec|
5252
spec.osx.deployment_target = '10.9'
5353
spec.tvos.deployment_target = '9.0'
5454

55-
spec.xcconfig = {
55+
spec.pod_target_xcconfig = {
5656
'HEADER_SEARCH_PATHS' => '$(SDKROOT)/usr/include/libxml2'
5757
}
5858

‎ResponseDetective.xcodeproj/project.pbxproj

+64-122
Large diffs are not rendered by default.

‎ResponseDetective.xcodeproj/xcshareddata/xcschemes/iOS.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES"
4445
codeCoverageEnabled = "YES">
4546
<Testables>
@@ -70,6 +71,7 @@
7071
buildConfiguration = "Debug"
7172
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7273
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
74+
language = ""
7375
launchStyle = "0"
7476
useCustomWorkingDirectory = "NO"
7577
ignoresPersistentStateOnLaunch = "NO"

‎ResponseDetective.xcodeproj/xcshareddata/xcschemes/macOS.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES"
4445
codeCoverageEnabled = "YES">
4546
<Testables>
@@ -70,6 +71,7 @@
7071
buildConfiguration = "Debug"
7172
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7273
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
74+
language = ""
7375
launchStyle = "0"
7476
useCustomWorkingDirectory = "NO"
7577
ignoresPersistentStateOnLaunch = "NO"

‎ResponseDetective.xcodeproj/xcshareddata/xcschemes/tvOS.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0830"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES"
4445
codeCoverageEnabled = "YES">
4546
<Testables>
@@ -70,6 +71,7 @@
7071
buildConfiguration = "Debug"
7172
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7273
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
74+
language = ""
7375
launchStyle = "0"
7476
useCustomWorkingDirectory = "NO"
7577
ignoresPersistentStateOnLaunch = "NO"

‎ResponseDetective/Configuration/Base-Common.xcconfig

-101
This file was deleted.

‎ResponseDetective/Configuration/Base-Mappings.xcconfig

-50
This file was deleted.

‎ResponseDetective/Configuration/Common-Base.xcconfig

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//
2+
// Common-Base.xcconfig
3+
//
4+
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
// Imports
9+
10+
#include "../../Carthage/Checkouts/xcconfigs/Common/Common.xcconfig"
11+
#include "../../Carthage/Checkouts/xcconfigs/Common/Carthage.xcconfig"
12+
13+
// MARK: Build
14+
15+
_BUILD_VERSION = 1.2.0
16+
17+
// MARK: Deployment
18+
19+
_DEPLOYMENT_TARGET_IOS = 8.0
20+
_DEPLOYMENT_TARGET_MACOS = 10.9
21+
_DEPLOYMENT_TARGET_TVOS = 9.0
22+
23+
// MARK: Compiler
24+
25+
_COMPILER_SWIFT_VERSION = 3.2

‎ResponseDetective/Configuration/Common-Debug.xcconfig

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// Common-Debug.xcconfig
3+
//
4+
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
// Imports
9+
10+
#include "Common-Base.xcconfig"
11+
#include "../../Carthage/Checkouts/xcconfigs/Configurations/Debug.xcconfig"

‎ResponseDetective/Configuration/Common-Release.xcconfig

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
//
2+
// Common-Release.xcconfig
3+
//
4+
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
// Imports
9+
10+
#include "Common-Base.xcconfig"
11+
#include "../../Carthage/Checkouts/xcconfigs/Configurations/Release.xcconfig"

‎ResponseDetective/Configuration/Framework-Common.xcconfig renamed to ‎ResponseDetective/Configuration/Framework-Base.xcconfig

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
//
2-
// Framework-Common.xcconfig
2+
// Framework-Base.xcconfig
33
//
44
// Copyright © 2016-2017 Netguru Sp. z o.o. All rights reserved.
55
// Licensed under the MIT License.
66
//
77

8-
#include "Base-Common.xcconfig"
8+
// Imports
9+
10+
#include "../../Carthage/Checkouts/xcconfigs/Targets/Framework.xcconfig"
11+
12+
// Bundle
913

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

14-
_COMPILER_HEADER_SEARCH_PATHS = $(SDKROOT)/usr/include/libxml2
15-
_COMPILER_LINKED_LIBRARIES = -lxml2
18+
// Compiler
19+
20+
_COMPILER_OBJC_HEADER_SEARCH_PATHS = $(SDKROOT)/usr/include/libxml2
21+
_COMPILER_OBJC_LINKER_FLAGS = -lxml2

‎ResponseDetective/Configuration/Framework-iOS-Debug.xcconfig

-10
This file was deleted.

0 commit comments

Comments
 (0)