Merge pull request #121 from igor-makarov/master

fix build error when building on XCode 8.3

.slather.yml

@@ -1,3 +1,5 @@
 coverage_service: coveralls
 xcodeproj: DeepLinkKit.xcodeproj
+workspace: DeepLinkKit.xcworkspace
+scheme: ReceiverDemo
 source_directory: DeepLinkKit

.travis.yml

@@ -1,11 +1,16 @@
 language: objective-c
+osx_image: xcode8.3
+cache:
+  - bundler
+  - cocoapods
 branches:
   only:
     master
 before_install:
-  - bundle
+  - bundle install
+  - pod repo update --silent
   - pod install
 script:
-  - xctool test -workspace DeepLinkKit.xcworkspace -scheme ReceiverDemo -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
+  - travis_retry xcodebuild build test -workspace DeepLinkKit.xcworkspace -scheme ReceiverDemo -sdk iphonesimulator -configuration Debug -destination 'platform=iOS Simulator,name=iPhone 7,OS=latest'
 after_success:
   - slather

DeepLinkKit.podspec

@@ -13,7 +13,19 @@ Pod::Spec.new do |s|
 
   s.platform         = :ios, '7.0'
   s.requires_arc     = true
-  s.module_map       = 'DeepLinkKit/module.modulemap'
 
-  s.source_files     = 'DeepLinkKit/**/*.{h,m}'
+  s.source_files        = 'DeepLinkKit/**/*.{h,m}'
+  s.private_header_files = [
+    "DeepLinkKit/**/DeepLinkKit_Private.h",
+    "DeepLinkKit/**/DPLDeepLink_Private.h",
+    "DeepLinkKit/**/DPLSerializable.h",
+    "DeepLinkKit/**/DPLMatchResult.h",
+    "DeepLinkKit/**/DPLRouteMatcher.h",
+    "DeepLinkKit/**/DPLRegularExpression.h",
+    "DeepLinkKit/**/NSString+DPLTrim.h",
+    "DeepLinkKit/**/NSString+DPLQuery.h",
+    "DeepLinkKit/**/NSString+DPLJSON.h",
+    "DeepLinkKit/**/NSObject+DPLJSONObject.h",
+    "DeepLinkKit/**/UINavigationController+DPLRouting.h",
+]
 end

Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'xcpretty'
-gem 'cocoapods'
+gem 'cocoapods', '~> 1.2.0'
 gem 'slather'

Gemfile.lock

@@ -1,70 +1,87 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.4)
+    CFPropertyList (2.3.5)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (0.9.1)
+    claide (1.0.1)
     clamp (0.6.5)
-    cocoapods (0.39.0)
-      activesupport (>= 4.0.2)
-      claide (~> 0.9.1)
-      cocoapods-core (= 0.39.0)
-      cocoapods-downloader (~> 0.9.3)
-      cocoapods-plugins (~> 0.4.2)
-      cocoapods-search (~> 0.1.0)
-      cocoapods-stats (~> 0.6.2)
-      cocoapods-trunk (~> 0.6.4)
-      cocoapods-try (~> 0.5.1)
+    cocoapods (1.2.0)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.2.0)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-stats (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.1.2, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      molinillo (~> 0.4.0)
+      fourflusher (~> 2.0.1)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.5)
       nap (~> 1.0)
-      xcodeproj (~> 0.28.2)
-    cocoapods-core (0.39.0)
-      activesupport (>= 4.0.2)
+      ruby-macho (~> 0.2.5)
+      xcodeproj (>= 1.4.1, < 2.0)
+    cocoapods-core (1.2.0)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-downloader (0.9.3)
-    cocoapods-plugins (0.4.2)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.3)
+    cocoapods-plugins (1.0.0)
       nap
-    cocoapods-search (0.1.0)
-    cocoapods-stats (0.6.2)
-    cocoapods-trunk (0.6.4)
+    cocoapods-search (1.0.0)
+    cocoapods-stats (1.0.0)
+    cocoapods-trunk (1.1.2)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (0.5.1)
+    cocoapods-try (1.1.0)
     colored (1.2)
     escape (0.0.4)
+    fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    i18n (0.7.0)
-    json (1.8.3)
-    minitest (5.8.1)
-    molinillo (0.4.0)
-    nap (1.0.0)
+    gh_inspector (1.0.3)
+    i18n (0.8.1)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    molinillo (0.5.7)
+    nanaimo (0.2.3)
+    nap (1.1.0)
     netrc (0.7.8)
-    slather (1.3.0)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    rouge (1.11.1)
+    ruby-macho (0.2.6)
+    slather (2.3.0)
+      activesupport (>= 4.0.2, < 5)
       clamp (~> 0.6)
-      xcodeproj (~> 0.17)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+      nokogiri (~> 1.6.3)
+      xcodeproj (>= 0.20, < 2.0.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
-    xcodeproj (0.28.2)
+    xcodeproj (1.4.2)
+      CFPropertyList (~> 2.3.3)
       activesupport (>= 3)
-      claide (~> 0.9.1)
+      claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
-    xcpretty (0.1.12)
+      nanaimo (~> 0.2.3)
+    xcpretty (0.2.4)
+      rouge (~> 1.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (~> 1.2.0)
   slather
   xcpretty
 
 BUNDLED WITH
-   1.10.6
+   1.14.4

Podfile

@@ -1,20 +1,21 @@
-xcodeproj 'DeepLinkKit.xcodeproj', 'Test' => :debug
+project 'DeepLinkKit.xcodeproj', 'Test' => :debug
 inhibit_all_warnings!
 use_frameworks!
 
-target 'SenderDemo', :exclusive => true do
+target 'SenderDemo' do
     pod 'DeepLinkKit', :path => '.'
 end
 
-target 'ReceiverDemo', :exclusive => true do
+target 'ReceiverDemo' do
     pod 'DeepLinkKit', :path => '.'
 end
 
-target 'ReceiverDemoSwift', :exclusive => true do
+target 'ReceiverDemoSwift' do
     pod 'DeepLinkKit', :path => '.'
 end
 
-target 'Tests', :exclusive => true do
+target 'Tests' do
+    pod 'DeepLinkKit', :path => '.'
     pod 'Specta'
     pod 'Expecta'
     pod 'OCMock'

Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
   - DeepLinkKit (1.2.1)
   - Expecta (1.0.5)
-  - KIF (3.4.1):
-    - KIF/Core (= 3.4.1)
-  - KIF/Core (3.4.1)
-  - OCMock (3.2.2)
-  - Specta (1.0.5)
+  - KIF (3.5.1):
+    - KIF/Core (= 3.5.1)
+  - KIF/Core (3.5.1)
+  - OCMock (3.4)
+  - Specta (1.0.6)
 
 DEPENDENCIES:
   - DeepLinkKit (from `.`)
@@ -16,13 +16,15 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   DeepLinkKit:
-    :path: .
+    :path: "."
 
 SPEC CHECKSUMS:
-  DeepLinkKit: 4c3a713b7ecc6c6e25ba56c87d0c728f6035a9ef
+  DeepLinkKit: 6b8c19f1ffa3bc1bd5e7694f7b6f4b5b7a705aea
   Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
-  KIF: 2275c6d59c77e5e56f660f006b99d73780130540
-  OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
-  Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
+  KIF: '082eb65279e51c3092923802849eb796a04982ab'
+  OCMock: 35ae71d6a8fcc1b59434d561d1520b9dd4f15765
+  Specta: f506f3a8361de16bc0dcf3b17b75e269072ba465
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 47a943bbf5fb3be0a7f74806f054afe0fc7974ff
+
+COCOAPODS: 1.2.0

SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m

@@ -15,7 +15,9 @@ - (void)viewDidLoad {
     [super viewDidLoad];
 
     self.nameLabel.text  = self.product.name;
+    self.nameLabel.accessibilityLabel = self.product.name;
     self.priceLabel.text = [@(self.product.price / 100.0) stringValue];
+    self.priceLabel.accessibilityLabel = self.priceLabel.text;
 }
 
 

Tests/DeepLink/DPLDeepLink_AppLinksSpec.m

@@ -1,4 +1,7 @@
-@import DeepLinkKit.Private;
+#import "DPLDeepLink_Private.h"
+#import "DPLMutableDeepLink.h"
+#import "DPLMutableDeepLink+AppLinks.h"
+@import DeepLinkKit;
 @import DeepLinkKit.AppLinks;
 
 SpecBegin(DPLDeepLink_AppLinks)