Add a module map

DeepLinkKit.podspec

@@ -13,6 +13,7 @@ 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}'
 end

DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme

@@ -26,7 +26,8 @@
  buildConfiguration = "Test"
  selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
  selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES">
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ codeCoverageEnabled = "YES">
  <Testables>
  <TestableReference
  skipped = "NO">

DeepLinkKit/Categories/NSString+DPLJSON.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSString (DPLJSON)
 

DeepLinkKit/Categories/NSString+DPLQuery.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSString (DPLQuery)
 

DeepLinkKit/Categories/NSString+DPLTrim.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSString (DPLTrim)
 

DeepLinkKit/DeepLink/DPLDeepLink.h

@@ -1,8 +1,6 @@
-#import <Foundation/Foundation.h>
-
-
-@class DPLDeepLink, DPLAppAction;
+@import Foundation;
 
+@class DPLDeepLink;
 
 @interface DPLDeepLink : NSObject <NSCopying, NSMutableCopying>
 

DeepLinkKit/DeepLinkKit_Private.h

@@ -0,0 +1,9 @@
+#import "DPLDeepLink_Private.h"
+#import "DPLSerializable.h"
+#import "DPLMatchResult.h"
+#import "DPLRouteMatcher.h"
+#import "DPLRegularExpression.h"
+#import "NSString+DPLTrim.h"
+#import "NSString+DPLQuery.h"
+#import "NSString+DPLJSON.h"
+#import "NSObject+DPLJSONObject.h"

DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h

@@ -1,4 +1,4 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @class DPLDeepLink;
 

DeepLinkKit/Regex/DPLMatchResult.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface DPLMatchResult : NSObject
 

DeepLinkKit/Regex/DPLRegularExpression.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "DPLMatchResult.h"
 
 @interface DPLRegularExpression : NSRegularExpression

DeepLinkKit/RouteHandler/DPLRouteHandler.h

@@ -1,4 +1,4 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
 #import "DPLTargetViewControllerProtocol.h"
 
 @class DPLDeepLink;

DeepLinkKit/RouteMatcher/DPLRouteMatcher.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @class DPLDeepLink;
 

DeepLinkKit/Router/DPLDeepLinkRouter.h

@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @class DPLDeepLink;
 @protocol DPLRouteHandler;

DeepLinkKit/module.modulemap

@@ -0,0 +1,29 @@
+framework module DeepLinkKit {
+ umbrella header "DeepLinkKit.h"
+ export *
+
+ exclude header "AppLinks.h"
+ exclude header "DPLDeepLink+AppLinks.h"
+ exclude header "DPLMutableDeepLink+AppLinks.h"
+
+ exclude header "DeepLinkKit_Private.h"
+ exclude header "DPLDeepLink_Private.h"
+ exclude header "DPLSerializable.h"
+ exclude header "DPLMatchResult.h"
+ exclude header "DPLRouteMatcher.h"
+ exclude header "DPLRegularExpression.h"
+ exclude header "NSString+DPLTrim.h"
+ exclude header "NSString+DPLQuery.h"
+ exclude header "NSString+DPLJSON.h"
+ exclude header "NSObject+DPLJSONObject.h"
+}
+
+explicit module DeepLinkKit.Private {
+ header "DeepLinkKit_Private.h"
+ export DeepLinkKit
+}
+
+explicit module DeepLinkKit.AppLinks {
+ header "AppLinks.h"
+ export DeepLinkKit
+}

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Button, Inc.
+Copyright (c) 2015-2016 Button, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Podfile

@@ -1,6 +1,6 @@
 xcodeproj 'DeepLinkKit.xcodeproj', 'Test' => :debug
 inhibit_all_warnings!
-
+use_frameworks!
 
 target 'SenderDemo', :exclusive => true do
  pod 'DeepLinkKit', :path => '.'

Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
  - DeepLinkKit (1.1.0)
- - Expecta (1.0.3)
- - KIF (3.3.0):
- - KIF/Core (= 3.3.0)
- - KIF/Core (3.3.0)
- - OCMock (3.2)
- - Specta (1.0.4)
+ - 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)
 
 DEPENDENCIES:
  - DeepLinkKit (from `.`)
@@ -19,10 +19,10 @@ EXTERNAL SOURCES:
  :path: .
 
 SPEC CHECKSUMS:
- DeepLinkKit: 83cba3b73a997fffa9cf5ddda2bcba8bbed0788a
- Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15
- KIF: 0a82046d06f3648799cac522d2d0f7934214caac
- OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb
- Specta: 69bb134672aae190a1379ff91df07dad8dd1f869
+ DeepLinkKit: 386c3cefdc29703ec85b6f2a69ed29657f6289d6
+ Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe
+ KIF: 2275c6d59c77e5e56f660f006b99d73780130540
+ OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835
+ Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2
 
 COCOAPODS: 0.39.0

SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m

@@ -1,7 +1,7 @@
 #import "DPLReceiverAppDelegate.h"
 #import "DPLProductRouteHandler.h"
 
-#import <DeepLinkKit/DeepLinkKit.h>
+@import DeepLinkKit;
 
 @interface DPLReceiverAppDelegate ()
 

SampleApps/ReceiverDemo/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -5,11 +5,21 @@
  "size" : "29x29",
  "scale" : "2x"
  },
+ {
+ "idiom" : "iphone",
+ "size" : "29x29",
+ "scale" : "3x"
+ },
  {
  "idiom" : "iphone",
  "size" : "40x40",
  "scale" : "2x"
  },
+ {
+ "idiom" : "iphone",
+ "size" : "40x40",
+ "scale" : "3x"
+ },
  {
  "idiom" : "iphone",
  "size" : "60x60",
@@ -49,10 +59,15 @@
  "idiom" : "ipad",
  "size" : "76x76",
  "scale" : "2x"
+ },
+ {
+ "idiom" : "ipad",
+ "size" : "83.5x83.5",
+ "scale" : "2x"
  }
  ],
  "info" : {
  "version" : 1,
  "author" : "xcode"
  }
-}
+}

SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h

@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
-#import <DeepLinkKit/DPLTargetViewControllerProtocol.h>
+#import <DeepLinkKit/DeepLinkKit.h>
 
 @class DPLProduct;
 

SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m

@@ -2,8 +2,6 @@
 #import "DPLProductDataSource.h"
 #import "DPLProduct.h"
 
-#import <DeepLinkKit/DPLDeepLink.h>
-
 @interface DPLProductDetailViewController ()
 
 @property (weak, nonatomic) IBOutlet UILabel *nameLabel;

SampleApps/ReceiverDemoSwift/DPLReceiverSwiftAppDelegate.swift

@@ -17,13 +17,17 @@ class DPLReceiverSwiftAppDelegate: UIResponder, UIApplicationDelegate {
  return true
  }
 
- func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject?) -> Bool {
+ func application(application: UIApplication, openURL url: NSURL, sourceApplication: String?, annotation: AnyObject) -> Bool {
  self.router.handleURL(url, withCompletion: nil)
  return true
  }
 
- func application(application: UIApplication, continueUserActivity userActivity: NSUserActivity, restorationHandler: ([AnyObject]!) -> Void) -> Bool {
-
+ func application(app: UIApplication, openURL url: NSURL, options: [String : AnyObject]) -> Bool {
+ self.router.handleURL(url, withCompletion: nil)
+ return true
+ }
+
+ func application(application: UIApplication, continueUserActivity userActivity: NSUserActivity, restorationHandler: ([AnyObject]?) -> Void) -> Bool {
  self.router.handleUserActivity(userActivity, withCompletion: nil)
  return true
  }

Tests/DeepLink/DPLDeepLink_AppLinksSpec.m

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