Skip to content

Commit a6a9ae0

Browse files
akashivskyyakashivskyy
committed
Merge branch 'release/0.4'
2 parents b1deade + 658ac49 commit a6a9ae0

File tree

96 files changed

+2446
-2575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+2446
-2575
lines changed

‎.gitattributes

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#
2-
# .gitattributes
2+
# .gitattributes
33
#
4-
# Copyright (c) 2015 Netguru Sp z o.o. All rights reserved.
4+
# Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
# Licensed under the MIT License.
56
#
67

78
.pbxproj merge=union

‎.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#
2-
# .gitignore
2+
# .gitignore
33
#
4-
# Copyright (c) 2015 Netguru Sp z o.o. All rights reserved.
4+
# Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
# Licensed under the MIT License.
56
#
67

78
.DS_Store

‎.gitmodules

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[submodule "Carthage/Checkouts/Nimble"]
2+
path = Carthage/Checkouts/Nimble
3+
url = https://github.com/Quick/Nimble.git
4+
[submodule "Carthage/Checkouts/Quick"]
5+
path = Carthage/Checkouts/Quick
6+
url = https://github.com/Quick/Quick.git
7+
[submodule "Carthage/Checkouts/xcconfigs"]
8+
path = Carthage/Checkouts/xcconfigs
9+
url = https://github.com/jspahrsummers/xcconfigs.git

‎Cartfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#
2-
# Cartfile
2+
# Cartfile
33
#
4-
# Copyright (c) 2015 Netguru Sp. z o.o. All rights reserved.
4+
# Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
# Licensed under the MIT License.
56
#
67

7-
github "jspahrsummers/xcconfigs" ~> 0.8
8+
github "jspahrsummers/xcconfigs" ~> 0.9

‎Cartfile.private

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#
2-
# Cartfile.private
2+
# Cartfile.private
33
#
4-
# Copyright (c) 2015 Netguru Sp. z o.o. All rights reserved.
4+
# Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
# Licensed under the MIT License.
56
#
67

7-
github "Quick/Quick" ~> 0.6
8-
github "Quick/Nimble" "v2.0.0-rc.3"
8+
github "Quick/Quick" ~> 0.9
9+
github "Quick/Nimble" ~> 4.0

‎Cartfile.resolved

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v2.0.0-rc.3"
2-
github "Quick/Quick" "v0.6.0"
3-
github "jspahrsummers/xcconfigs" "0.8.1"
1+
github "Quick/Nimble" "v4.0.1"
2+
github "Quick/Quick" "v0.9.2"
3+
github "jspahrsummers/xcconfigs" "0.9"

‎Carthage/Checkouts/Nimble

Submodule Nimble added at 0cf1291

‎Carthage/Checkouts/Quick

Submodule Quick added at dc2b4b7

‎Carthage/Checkouts/xcconfigs

Submodule xcconfigs added at d78854b

‎Configuration/Framework-Common.xcconfig

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// Framework-Common.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
#include "ResponseDetective-Common.xcconfig"
9+
10+
RESPONSEDETECTIVE_PRODUCT_NAME = ResponseDetective
11+
RESPONSEDETECTIVE_BUNDLE_IDENTIFIER = co.netguru.lib.responsedetective
12+
RESPONSEDETECTIVE_INFOPLIST = $(SRCROOT)/Support/ResponseDetective-Info.plist
13+
14+
RESPONSEDETECTIVE_HEADER_SEARCH_PATHS = $(SDKROOT)/usr/include/libxml2
15+
RESPONSEDETECTIVE_LINKED_LIBRARIES = -lxml2

‎Configuration/Framework-OSX-Debug.xcconfig

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// Framework-OSX-Debug.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
#include "Carthage/Checkouts/xcconfigs/Base/Configurations/Debug.xcconfig"
9+
#include "Carthage/Checkouts/xcconfigs/Mac OS X/Mac-Framework.xcconfig"
10+
#include "Framework-Common.xcconfig"

‎Configuration/Framework-OSX-Release.xcconfig

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// Framework-OSX-Release.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
#include "Carthage/Checkouts/xcconfigs/Base/Configurations/Release.xcconfig"
9+
#include "Carthage/Checkouts/xcconfigs/Mac OS X/Mac-Framework.xcconfig"
10+
#include "Framework-Common.xcconfig"

‎Configuration/Framework-iOS-Debug.xcconfig

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

‎Configuration/Framework-iOS-Release.xcconfig

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

‎Configuration/ResponseDetective-Common.xcconfig

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
//
2+
// ResponseDetective-Common.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
// Version settings
9+
10+
RESPONSEDETECTIVE_VERSION = 0.4
11+
RESPONSEDETECTIVE_BUILD = 0.4
12+
13+
// Product settings
14+
15+
RESPONSEDETECTIVE_PRODUCT_NAME =
16+
RESPONSEDETECTIVE_BUNDLE_IDENTIFIER =
17+
RESPONSEDETECTIVE_INFOPLIST =
18+
19+
// Deployment settings
20+
21+
RESPONSEDETECTIVE_DEPLOYMENT_TARGET[sdk=iphone*] = 8.0
22+
RESPONSEDETECTIVE_DEPLOYMENT_TARGET[sdk=macosx*] = 10.10
23+
24+
RESPONSEDETECTIVE_CODE_SIGN_IDENTITY[sdk=iphone*] = iPhone Developer
25+
RESPONSEDETECTIVE_CODE_SIGN_IDENTITY[sdk=macosx*] =
26+
27+
// Linker settings
28+
29+
RESPONSEDETECTIVE_FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/Carthage/Build/iOS
30+
RESPONSEDETECTIVE_FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SRCROOT)/Carthage/Build/Mac
31+
32+
RESPONSEDETECTIVE_HEADER_SEARCH_PATHS =
33+
34+
RESPONSEDETECTIVE_LINKED_FRAMEWORKS =
35+
RESPONSEDETECTIVE_LINKED_LIBRARIES =
36+
37+
// Do not edit below this line
38+
39+
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
40+
41+
PRODUCT_BUNDLE_VERSION_STRING = $(RESPONSEDETECTIVE_VERSION)
42+
PRODUCT_BUNDLE_VERSION = $(RESPONSEDETECTIVE_BUILD)
43+
PRODUCT_NAME = $(RESPONSEDETECTIVE_PRODUCT_NAME)
44+
PRODUCT_BUNDLE_IDENTIFIER = $(RESPONSEDETECTIVE_BUNDLE_IDENTIFIER)
45+
INFOPLIST_FILE = $(RESPONSEDETECTIVE_INFOPLIST)
46+
47+
IPHONEOS_DEPLOYMENT_TARGET = $(RESPONSEDETECTIVE_DEPLOYMENT_TARGET)
48+
MAOSX_DEPLOYMENT_TARGET = $(RESPONSEDETECTIVE_DEPLOYMENT_TARGET)
49+
CODE_SIGN_IDENTITY = $(RESPONSEDETECTIVE_CODE_SIGN_IDENTITY)
50+
51+
FRAMEWORK_SEARCH_PATHS = $(inherited) $(RESPONSEDETECTIVE_FRAMEWORK_SEARCH_PATHS)
52+
HEADER_SEARCH_PATHS = $(RESPONSEDETECTIVE_HEADER_SEARCH_PATHS)
53+
OTHER_LDFLAGS = $(inherited) $(RESPONSEDETECTIVE_LINKED_FRAMEWORKS) $(RESPONSEDETECTIVE_LINKED_LIBRARIES)

‎Configuration/Tests-Common.xcconfig

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//
2+
// Tests-Common.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
#include "ResponseDetective-Common.xcconfig"
9+
10+
RESPONSEDETECTIVE_PRODUCT_NAME = ResponseDetective Tests
11+
RESPONSEDETECTIVE_BUNDLE_IDENTIFIER = co.netguru.lib.responsedetective.tests
12+
RESPONSEDETECTIVE_INFOPLIST = $(SRCROOT)/Support/ResponseDetective-Tests-Info.plist
13+
14+
RESPONSEDETECTIVE_LINKED_FRAMEWORKS = -framework Quick -framework Nimble

‎Configuration/Tests-OSX-Debug.xcconfig

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// Tests-OSX-Debug.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
#include "Carthage/Checkouts/xcconfigs/Base/Configurations/Test.xcconfig"
9+
#include "Carthage/Checkouts/xcconfigs/Mac OS X/Mac-Application.xcconfig"
10+
#include "Tests-Common.xcconfig"

‎Configuration/Tests-OSX-Release.xcconfig

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
//
2+
// Tests-OSX-Release.xcconfig
3+
//
4+
// Copyright (c) 2016 Netguru Sp. z o.o. All rights reserved.
5+
// Licensed under the MIT License.
6+
//
7+
8+
#include "Carthage/Checkouts/xcconfigs/Base/Configurations/Test.xcconfig"
9+
#include "Carthage/Checkouts/xcconfigs/Mac OS X/Mac-Application.xcconfig"
10+
#include "Tests-Common.xcconfig"

‎Configuration/Tests-iOS-Debug.xcconfig

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

‎Configuration/Tests-iOS-Release.xcconfig

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

‎Images/Header.png

72.1 KB
Loading

‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
**Copyright (c) 2015 Netguru Sp. z o.o. All rights reserved.**
1+
**Copyright (c) 2015-2016 Netguru Sp. z o.o. All rights reserved.**
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
44

0 commit comments

Comments
 (0)