Skip to content

Commit 1c239a3

Browse files
authored
Merge pull request #121 from igor-makarov/master
fix build error when building on XCode 8.3
2 parents 384fa09 + 30eca45 commit 1c239a3

File tree

11 files changed

+210
-196
lines changed

11 files changed

+210
-196
lines changed

.slather.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
coverage_service: coveralls
22
xcodeproj: DeepLinkKit.xcodeproj
3+
workspace: DeepLinkKit.xcworkspace
4+
scheme: ReceiverDemo
35
source_directory: DeepLinkKit

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
language: objective-c
2+
osx_image: xcode8.3
3+
cache:
4+
- bundler
5+
- cocoapods
26
branches:
37
only:
48
master
59
before_install:
6-
- bundle
10+
- bundle install
11+
- pod repo update --silent
712
- pod install
813
script:
9-
- xctool test -workspace DeepLinkKit.xcworkspace -scheme ReceiverDemo -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
14+
- travis_retry xcodebuild build test -workspace DeepLinkKit.xcworkspace -scheme ReceiverDemo -sdk iphonesimulator -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 7,OS=latest'
1015
after_success:
1116
- slather

DeepLinkKit.podspec

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,19 @@ Pod::Spec.new do |s|
1313

1414
s.platform = :ios, '7.0'
1515
s.requires_arc = true
16-
s.module_map = 'DeepLinkKit/module.modulemap'
1716

18-
s.source_files = 'DeepLinkKit/**/*.{h,m}'
17+
s.source_files = 'DeepLinkKit/**/*.{h,m}'
18+
s.private_header_files = [
19+
"DeepLinkKit/**/DeepLinkKit_Private.h",
20+
"DeepLinkKit/**/DPLDeepLink_Private.h",
21+
"DeepLinkKit/**/DPLSerializable.h",
22+
"DeepLinkKit/**/DPLMatchResult.h",
23+
"DeepLinkKit/**/DPLRouteMatcher.h",
24+
"DeepLinkKit/**/DPLRegularExpression.h",
25+
"DeepLinkKit/**/NSString+DPLTrim.h",
26+
"DeepLinkKit/**/NSString+DPLQuery.h",
27+
"DeepLinkKit/**/NSString+DPLJSON.h",
28+
"DeepLinkKit/**/NSObject+DPLJSONObject.h",
29+
"DeepLinkKit/**/UINavigationController+DPLRouting.h",
30+
]
1931
end

DeepLinkKit.xcodeproj/project.pbxproj

Lines changed: 107 additions & 107 deletions
Large diffs are not rendered by default.

DeepLinkKit/module.modulemap

Lines changed: 0 additions & 30 deletions
This file was deleted.

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source 'https://rubygems.org'
22

33
gem 'xcpretty'
4-
gem 'cocoapods'
4+
gem 'cocoapods', '~> 1.2.0'
55
gem 'slather'

Gemfile.lock

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,87 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.4)
4+
CFPropertyList (2.3.5)
5+
activesupport (4.2.8)
56
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
77
minitest (~> 5.1)
88
thread_safe (~> 0.3, >= 0.3.4)
99
tzinfo (~> 1.1)
10-
claide (0.9.1)
10+
claide (1.0.1)
1111
clamp (0.6.5)
12-
cocoapods (0.39.0)
13-
activesupport (>= 4.0.2)
14-
claide (~> 0.9.1)
15-
cocoapods-core (= 0.39.0)
16-
cocoapods-downloader (~> 0.9.3)
17-
cocoapods-plugins (~> 0.4.2)
18-
cocoapods-search (~> 0.1.0)
19-
cocoapods-stats (~> 0.6.2)
20-
cocoapods-trunk (~> 0.6.4)
21-
cocoapods-try (~> 0.5.1)
12+
cocoapods (1.2.0)
13+
activesupport (>= 4.0.2, < 5)
14+
claide (>= 1.0.1, < 2.0)
15+
cocoapods-core (= 1.2.0)
16+
cocoapods-deintegrate (>= 1.0.1, < 2.0)
17+
cocoapods-downloader (>= 1.1.3, < 2.0)
18+
cocoapods-plugins (>= 1.0.0, < 2.0)
19+
cocoapods-search (>= 1.0.0, < 2.0)
20+
cocoapods-stats (>= 1.0.0, < 2.0)
21+
cocoapods-trunk (>= 1.1.2, < 2.0)
22+
cocoapods-try (>= 1.1.0, < 2.0)
2223
colored (~> 1.2)
2324
escape (~> 0.0.4)
24-
molinillo (~> 0.4.0)
25+
fourflusher (~> 2.0.1)
26+
gh_inspector (~> 1.0)
27+
molinillo (~> 0.5.5)
2528
nap (~> 1.0)
26-
xcodeproj (~> 0.28.2)
27-
cocoapods-core (0.39.0)
28-
activesupport (>= 4.0.2)
29+
ruby-macho (~> 0.2.5)
30+
xcodeproj (>= 1.4.1, < 2.0)
31+
cocoapods-core (1.2.0)
32+
activesupport (>= 4.0.2, < 5)
2933
fuzzy_match (~> 2.0.4)
3034
nap (~> 1.0)
31-
cocoapods-downloader (0.9.3)
32-
cocoapods-plugins (0.4.2)
35+
cocoapods-deintegrate (1.0.1)
36+
cocoapods-downloader (1.1.3)
37+
cocoapods-plugins (1.0.0)
3338
nap
34-
cocoapods-search (0.1.0)
35-
cocoapods-stats (0.6.2)
36-
cocoapods-trunk (0.6.4)
39+
cocoapods-search (1.0.0)
40+
cocoapods-stats (1.0.0)
41+
cocoapods-trunk (1.1.2)
3742
nap (>= 0.8, < 2.0)
3843
netrc (= 0.7.8)
39-
cocoapods-try (0.5.1)
44+
cocoapods-try (1.1.0)
4045
colored (1.2)
4146
escape (0.0.4)
47+
fourflusher (2.0.1)
4248
fuzzy_match (2.0.4)
43-
i18n (0.7.0)
44-
json (1.8.3)
45-
minitest (5.8.1)
46-
molinillo (0.4.0)
47-
nap (1.0.0)
49+
gh_inspector (1.0.3)
50+
i18n (0.8.1)
51+
mini_portile2 (2.1.0)
52+
minitest (5.10.1)
53+
molinillo (0.5.7)
54+
nanaimo (0.2.3)
55+
nap (1.1.0)
4856
netrc (0.7.8)
49-
slather (1.3.0)
57+
nokogiri (1.6.8.1)
58+
mini_portile2 (~> 2.1.0)
59+
rouge (1.11.1)
60+
ruby-macho (0.2.6)
61+
slather (2.3.0)
62+
activesupport (>= 4.0.2, < 5)
5063
clamp (~> 0.6)
51-
xcodeproj (~> 0.17)
52-
thread_safe (0.3.5)
53-
tzinfo (1.2.2)
64+
nokogiri (~> 1.6.3)
65+
xcodeproj (>= 0.20, < 2.0.0)
66+
thread_safe (0.3.6)
67+
tzinfo (1.2.3)
5468
thread_safe (~> 0.1)
55-
xcodeproj (0.28.2)
69+
xcodeproj (1.4.2)
70+
CFPropertyList (~> 2.3.3)
5671
activesupport (>= 3)
57-
claide (~> 0.9.1)
72+
claide (>= 1.0.1, < 2.0)
5873
colored (~> 1.2)
59-
xcpretty (0.1.12)
74+
nanaimo (~> 0.2.3)
75+
xcpretty (0.2.4)
76+
rouge (~> 1.8)
6077

6178
PLATFORMS
6279
ruby
6380

6481
DEPENDENCIES
65-
cocoapods
82+
cocoapods (~> 1.2.0)
6683
slather
6784
xcpretty
6885

6986
BUNDLED WITH
70-
1.10.6
87+
1.14.4

Podfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
xcodeproj 'DeepLinkKit.xcodeproj', 'Test' => :debug
1+
project 'DeepLinkKit.xcodeproj', 'Test' => :debug
22
inhibit_all_warnings!
33
use_frameworks!
44

5-
target 'SenderDemo', :exclusive => true do
5+
target 'SenderDemo' do
66
pod 'DeepLinkKit', :path => '.'
77
end
88

9-
target 'ReceiverDemo', :exclusive => true do
9+
target 'ReceiverDemo' do
1010
pod 'DeepLinkKit', :path => '.'
1111
end
1212

13-
target 'ReceiverDemoSwift', :exclusive => true do
13+
target 'ReceiverDemoSwift' do
1414
pod 'DeepLinkKit', :path => '.'
1515
end
1616

17-
target 'Tests', :exclusive => true do
17+
target 'Tests' do
18+
pod 'DeepLinkKit', :path => '.'
1819
pod 'Specta'
1920
pod 'Expecta'
2021
pod 'OCMock'

Podfile.lock

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PODS:
22
- DeepLinkKit (1.2.1)
33
- Expecta (1.0.5)
4-
- KIF (3.4.1):
5-
- KIF/Core (= 3.4.1)
6-
- KIF/Core (3.4.1)
7-
- OCMock (3.2.2)
8-
- Specta (1.0.5)
4+
- KIF (3.5.1):
5+
- KIF/Core (= 3.5.1)
6+
- KIF/Core (3.5.1)
7+
- OCMock (3.4)
8+
- Specta (1.0.6)
99

1010
DEPENDENCIES:
1111
- DeepLinkKit (from `.`)
@@ -16,13 +16,15 @@ DEPENDENCIES:
1616

1717
EXTERNAL SOURCES:
1818
DeepLinkKit:
19-
:path: .
19+
:path: "."
2020

2121
SPEC CHECKSUMS:
22-
DeepLinkKit: 4c3a713b7ecc6c6e25ba56c87d0c728f6035a9ef
22+
DeepLinkKit: 6b8c19f1ffa3bc1bd5e7694f7b6f4b5b7a705aea
2323
Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
24-
KIF: 2275c6d59c77e5e56f660f006b99d73780130540
25-
OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
26-
Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
24+
KIF: '082eb65279e51c3092923802849eb796a04982ab'
25+
OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
26+
Specta: f506f3a8361de16bc0dcf3b17b75e269072ba465
2727

28-
COCOAPODS: 0.39.0
28+
PODFILE CHECKSUM: 47a943bbf5fb3be0a7f74806f054afe0fc7974ff
29+
30+
COCOAPODS: 1.2.0

SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ - (void)viewDidLoad {
1515
[super viewDidLoad];
1616

1717
self.nameLabel.text = self.product.name;
18+
self.nameLabel.accessibilityLabel = self.product.name;
1819
self.priceLabel.text = [@(self.product.price / 100.0) stringValue];
20+
self.priceLabel.accessibilityLabel = self.priceLabel.text;
1921
}
2022

2123

0 commit comments

Comments
 (0)