Merge pull request button#90 from button/feature/module_map

wessmith · wessmith · commit e7921a8ad9d3 · 2016-03-31T17:32:40.000-04:00
Add a module map
diff --git a/DeepLinkKit.podspec b/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
diff --git a/DeepLinkKit.xcodeproj/project.pbxproj b/DeepLinkKit.xcodeproj/project.pbxproj
diff --git a/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme b/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">
diff --git a/DeepLinkKit/Categories/NSString+DPLJSON.h b/DeepLinkKit/Categories/NSString+DPLJSON.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSString (DPLJSON)
 
diff --git a/DeepLinkKit/Categories/NSString+DPLQuery.h b/DeepLinkKit/Categories/NSString+DPLQuery.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSString (DPLQuery)
 
diff --git a/DeepLinkKit/Categories/NSString+DPLTrim.h b/DeepLinkKit/Categories/NSString+DPLTrim.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface NSString (DPLTrim)
 
diff --git a/DeepLinkKit/DeepLink/DPLDeepLink.h b/DeepLinkKit/DeepLink/DPLDeepLink.h
@@ -1,8 +1,6 @@
-#import <Foundation/Foundation.h>
-
-
-@class DPLDeepLink, DPLAppAction;
+@import Foundation;
 
+@class DPLDeepLink;
 
 @interface DPLDeepLink : NSObject <NSCopying, NSMutableCopying>
 
diff --git a/DeepLinkKit/DeepLinkKit_Private.h b/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"
diff --git a/DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h b/DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h
@@ -1,4 +1,4 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @class DPLDeepLink;
 
diff --git a/DeepLinkKit/Regex/DPLMatchResult.h b/DeepLinkKit/Regex/DPLMatchResult.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @interface DPLMatchResult : NSObject
 
diff --git a/DeepLinkKit/Regex/DPLRegularExpression.h b/DeepLinkKit/Regex/DPLRegularExpression.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "DPLMatchResult.h"
 
 @interface DPLRegularExpression : NSRegularExpression
diff --git a/DeepLinkKit/RouteHandler/DPLRouteHandler.h b/DeepLinkKit/RouteHandler/DPLRouteHandler.h
@@ -1,4 +1,4 @@
-#import <UIKit/UIKit.h>
+@import UIKit;
 #import "DPLTargetViewControllerProtocol.h"
 
 @class DPLDeepLink;
diff --git a/DeepLinkKit/RouteMatcher/DPLRouteMatcher.h b/DeepLinkKit/RouteMatcher/DPLRouteMatcher.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @class DPLDeepLink;
 
diff --git a/DeepLinkKit/Router/DPLDeepLinkRouter.h b/DeepLinkKit/Router/DPLDeepLinkRouter.h
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @class    DPLDeepLink;
 @protocol DPLRouteHandler;
diff --git a/DeepLinkKit/module.modulemap b/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
+}
diff --git a/LICENSE b/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
diff --git a/Podfile b/Podfile
@@ -1,6 +1,6 @@
 xcodeproj 'DeepLinkKit.xcodeproj', 'Test' => :debug
 inhibit_all_warnings!
-
+use_frameworks!
 
 target 'SenderDemo', :exclusive => true do
     pod 'DeepLinkKit', :path => '.'
diff --git a/Podfile.lock b/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
diff --git a/SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m b/SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m
@@ -1,7 +1,7 @@
 #import "DPLReceiverAppDelegate.h"
 #import "DPLProductRouteHandler.h"
 
-#import <DeepLinkKit/DeepLinkKit.h>
+@import DeepLinkKit;
 
 @interface DPLReceiverAppDelegate ()
 
diff --git a/SampleApps/ReceiverDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/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"
   }
-}
+}
diff --git a/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h b/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h
@@ -1,5 +1,5 @@
 #import <UIKit/UIKit.h>
-#import <DeepLinkKit/DPLTargetViewControllerProtocol.h>
+#import <DeepLinkKit/DeepLinkKit.h>
 
 @class DPLProduct;
 
diff --git a/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m b/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;
diff --git a/SampleApps/ReceiverDemoSwift/DPLReceiverSwiftAppDelegate.swift b/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
     }
diff --git a/Tests/DeepLink/DPLDeepLink_AppLinksSpec.m b/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)
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import <Foundation/Foundation.h>`
	`1`	`+@import Foundation;`
`2`	`2`
`3`	`3`	`@interface NSString (DPLJSON)`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import <UIKit/UIKit.h>`
	`1`	`+@import UIKit;`
`2`	`2`
`3`	`3`	`@class DPLDeepLink;`
`4`	`4`