From a2218b1ff3f3ed098b68be03e24cf4447b8c1e36 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 12:53:05 -0400 Subject: [PATCH 1/8] change to @ import for iOS frameworks --- DeepLinkKit/Categories/NSString+DPLJSON.h | 2 +- DeepLinkKit/Categories/NSString+DPLQuery.h | 2 +- DeepLinkKit/Categories/NSString+DPLTrim.h | 2 +- DeepLinkKit/DeepLink/DPLDeepLink.h | 6 ++---- DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h | 2 +- DeepLinkKit/Regex/DPLMatchResult.h | 2 +- DeepLinkKit/Regex/DPLRegularExpression.h | 2 +- DeepLinkKit/RouteHandler/DPLRouteHandler.h | 2 +- DeepLinkKit/RouteMatcher/DPLRouteMatcher.h | 2 +- DeepLinkKit/Router/DPLDeepLinkRouter.h | 2 +- 10 files changed, 11 insertions(+), 13 deletions(-) diff --git a/DeepLinkKit/Categories/NSString+DPLJSON.h b/DeepLinkKit/Categories/NSString+DPLJSON.h index 2d5c048..6cbb42d 100644 --- a/DeepLinkKit/Categories/NSString+DPLJSON.h +++ b/DeepLinkKit/Categories/NSString+DPLJSON.h @@ -1,4 +1,4 @@ -#import +@import Foundation; @interface NSString (DPLJSON) diff --git a/DeepLinkKit/Categories/NSString+DPLQuery.h b/DeepLinkKit/Categories/NSString+DPLQuery.h index 235283a..71689d1 100644 --- a/DeepLinkKit/Categories/NSString+DPLQuery.h +++ b/DeepLinkKit/Categories/NSString+DPLQuery.h @@ -1,4 +1,4 @@ -#import +@import Foundation; @interface NSString (DPLQuery) diff --git a/DeepLinkKit/Categories/NSString+DPLTrim.h b/DeepLinkKit/Categories/NSString+DPLTrim.h index 491579d..5ee9f26 100644 --- a/DeepLinkKit/Categories/NSString+DPLTrim.h +++ b/DeepLinkKit/Categories/NSString+DPLTrim.h @@ -1,4 +1,4 @@ -#import +@import Foundation; @interface NSString (DPLTrim) diff --git a/DeepLinkKit/DeepLink/DPLDeepLink.h b/DeepLinkKit/DeepLink/DPLDeepLink.h index 9cbd820..f4b1c9e 100644 --- a/DeepLinkKit/DeepLink/DPLDeepLink.h +++ b/DeepLinkKit/DeepLink/DPLDeepLink.h @@ -1,8 +1,6 @@ -#import - - -@class DPLDeepLink, DPLAppAction; +@import Foundation; +@class DPLDeepLink; @interface DPLDeepLink : NSObject diff --git a/DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h b/DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h index 12f97df..0ce2b37 100644 --- a/DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h +++ b/DeepLinkKit/Protocols/DPLTargetViewControllerProtocol.h @@ -1,4 +1,4 @@ -#import +@import UIKit; @class DPLDeepLink; diff --git a/DeepLinkKit/Regex/DPLMatchResult.h b/DeepLinkKit/Regex/DPLMatchResult.h index c9f39ca..edb17a9 100644 --- a/DeepLinkKit/Regex/DPLMatchResult.h +++ b/DeepLinkKit/Regex/DPLMatchResult.h @@ -1,4 +1,4 @@ -#import +@import Foundation; @interface DPLMatchResult : NSObject diff --git a/DeepLinkKit/Regex/DPLRegularExpression.h b/DeepLinkKit/Regex/DPLRegularExpression.h index e2affc2..b37aada 100644 --- a/DeepLinkKit/Regex/DPLRegularExpression.h +++ b/DeepLinkKit/Regex/DPLRegularExpression.h @@ -1,4 +1,4 @@ -#import +@import Foundation; #import "DPLMatchResult.h" @interface DPLRegularExpression : NSRegularExpression diff --git a/DeepLinkKit/RouteHandler/DPLRouteHandler.h b/DeepLinkKit/RouteHandler/DPLRouteHandler.h index 0c914db..71907d4 100644 --- a/DeepLinkKit/RouteHandler/DPLRouteHandler.h +++ b/DeepLinkKit/RouteHandler/DPLRouteHandler.h @@ -1,4 +1,4 @@ -#import +@import UIKit; #import "DPLTargetViewControllerProtocol.h" @class DPLDeepLink; diff --git a/DeepLinkKit/RouteMatcher/DPLRouteMatcher.h b/DeepLinkKit/RouteMatcher/DPLRouteMatcher.h index 9c294d0..a566d68 100644 --- a/DeepLinkKit/RouteMatcher/DPLRouteMatcher.h +++ b/DeepLinkKit/RouteMatcher/DPLRouteMatcher.h @@ -1,4 +1,4 @@ -#import +@import Foundation; @class DPLDeepLink; diff --git a/DeepLinkKit/Router/DPLDeepLinkRouter.h b/DeepLinkKit/Router/DPLDeepLinkRouter.h index 92aac0f..0fcd442 100644 --- a/DeepLinkKit/Router/DPLDeepLinkRouter.h +++ b/DeepLinkKit/Router/DPLDeepLinkRouter.h @@ -1,4 +1,4 @@ -#import +@import Foundation; @class DPLDeepLink; @protocol DPLRouteHandler; From c7271699ac1555b778bb20be545632aaced03439 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 12:55:12 -0400 Subject: [PATCH 2/8] add a private umbrella header --- DeepLinkKit.xcodeproj/project.pbxproj | 34 ++++++++++++++------------- DeepLinkKit/DeepLinkKit_Private.h | 9 +++++++ 2 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 DeepLinkKit/DeepLinkKit_Private.h diff --git a/DeepLinkKit.xcodeproj/project.pbxproj b/DeepLinkKit.xcodeproj/project.pbxproj index 51f9e08..7a93669 100644 --- a/DeepLinkKit.xcodeproj/project.pbxproj +++ b/DeepLinkKit.xcodeproj/project.pbxproj @@ -7,8 +7,8 @@ objects = { /* Begin PBXBuildFile section */ - 1252340A196B4771BE27D5FD /* libPods-ReceiverDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CFE63F7FEA51182807D98A78 /* libPods-ReceiverDemo.a */; }; 2F4988DE1AE71ABC0069EF2B /* DPLRouteHandlerIntegrationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4988DD1AE71ABC0069EF2B /* DPLRouteHandlerIntegrationTest.m */; }; + 39F4B8FD8A040788A53100D6 /* Pods_ReceiverDemoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D432B47B5ABA10BCB8F2EF9A /* Pods_ReceiverDemoSwift.framework */; }; 4D4F412B1B02A96400B710DB /* DPLRegularExpressionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F412A1B02A96400B710DB /* DPLRegularExpressionSpec.m */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; @@ -27,9 +27,9 @@ 62EE96F61B570B10003D7564 /* DPLProductDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DE025EB01A5F0D37007C4F3A /* DPLProductDataSource.m */; }; 62EE96F71B570B13003D7564 /* DPLProduct.m in Sources */ = {isa = PBXBuildFile; fileRef = DE87B1F01A5DF49F00204A35 /* DPLProduct.m */; }; 62EE96F81B570B16003D7564 /* DPLProductTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD327A19E079D3003C8D65 /* DPLProductTableViewController.m */; }; - 68101FFDAAC0A24037B56D22 /* libPods-Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19367BAF0FEDE5B798128F3D /* libPods-Tests.a */; }; - 6C18B300BAD926F6461AC49D /* libPods-SenderDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 81A53B1FA1F6DF1D2B557DCD /* libPods-SenderDemo.a */; }; - B27794D5B1147817FAFDCD39 /* libPods-ReceiverDemoSwift.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 21875F254C5D9923A2B5CBF3 /* libPods-ReceiverDemoSwift.a */; }; + A61A6536EAE2970D84077D8E /* Pods_ReceiverDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA72CC121C9C80C6421FE77 /* Pods_ReceiverDemo.framework */; }; + C9849ABE78EE8A3DC75B547F /* Pods_SenderDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5A526426D04947767367953 /* Pods_SenderDemo.framework */; }; + DD8C7D2A4BB3D273384F8ED0 /* Pods_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C894FBCCA52EB64FCF44947 /* Pods_Tests.framework */; }; DE025EB11A5F0D37007C4F3A /* DPLProductDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DE025EB01A5F0D37007C4F3A /* DPLProductDataSource.m */; }; DE058E0A1A3B46FD00147C04 /* NSString_DPLQuerySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DE058E091A3B46FD00147C04 /* NSString_DPLQuerySpec.m */; }; DE058E101A3B485500147C04 /* DPLDeepLinkSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DE058E0F1A3B485500147C04 /* DPLDeepLinkSpec.m */; }; @@ -76,10 +76,9 @@ /* Begin PBXFileReference section */ 14A1857A6611A826E51F612A /* Pods-ReceiverDemo.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemo.test.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo.test.xcconfig"; sourceTree = ""; }; - 19367BAF0FEDE5B798128F3D /* libPods-Tests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Tests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 21875F254C5D9923A2B5CBF3 /* libPods-ReceiverDemoSwift.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ReceiverDemoSwift.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2AE3E05821FBC0C05F248E61 /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = ""; }; 2F4988DD1AE71ABC0069EF2B /* DPLRouteHandlerIntegrationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DPLRouteHandlerIntegrationTest.m; path = IntegrationTests/DPLRouteHandlerIntegrationTest.m; sourceTree = ""; }; + 4C894FBCCA52EB64FCF44947 /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4D4F412A1B02A96400B710DB /* DPLRegularExpressionSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLRegularExpressionSpec.m; sourceTree = ""; }; 57D5F02E049D7887B4F4ACDF /* Pods-ReceiverDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo.debug.xcconfig"; sourceTree = ""; }; 59C6806DC6FB049E0A3371C7 /* Pods-ReceiverDemoSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemoSwift.release.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift.release.xcconfig"; sourceTree = ""; }; @@ -95,18 +94,18 @@ 62EE96F11B57011D003D7564 /* ReceiverDemoSwift-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReceiverDemoSwift-Bridging-Header.h"; sourceTree = ""; }; 62EE96F31B570891003D7564 /* DPLProductRouteHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DPLProductRouteHandler.swift; sourceTree = ""; }; 6B9E60301031FFD1833ECA7A /* Pods-SenderDemo.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SenderDemo.test.xcconfig"; path = "Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo.test.xcconfig"; sourceTree = ""; }; - 81A53B1FA1F6DF1D2B557DCD /* libPods-SenderDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SenderDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 83D34C3B1B03ECAD00BA6EF1 /* DPLMatchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLMatchResult.h; sourceTree = ""; }; 83D34C3C1B03ECAD00BA6EF1 /* DPLMatchResult.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DPLMatchResult.m; sourceTree = ""; }; 83D34C3D1B03ECAD00BA6EF1 /* DPLRegularExpression.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLRegularExpression.h; sourceTree = ""; }; 83D34C3E1B03ECAD00BA6EF1 /* DPLRegularExpression.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DPLRegularExpression.m; sourceTree = ""; }; 8949A4E8F681A12A47C20775 /* DeepLinkKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = DeepLinkKit.podspec; path = ./DeepLinkKit.podspec; sourceTree = ""; }; A7644D9D2D35BA2869AD63FA /* Pods-SenderDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SenderDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo.release.xcconfig"; sourceTree = ""; }; + AEA72CC121C9C80C6421FE77 /* Pods_ReceiverDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReceiverDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B3CB044233E227F87FCF2C46 /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = ""; }; B915356798E84DC8F8A0A3CB /* Pods-SenderDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SenderDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo.debug.xcconfig"; sourceTree = ""; }; BB75E70100C0775F382CD22F /* Pods-ReceiverDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo.release.xcconfig"; sourceTree = ""; }; BBE7E5A25C1B0E9637BE745A /* Pods-Tests.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.test.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.test.xcconfig"; sourceTree = ""; }; - CFE63F7FEA51182807D98A78 /* libPods-ReceiverDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ReceiverDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + D432B47B5ABA10BCB8F2EF9A /* Pods_ReceiverDemoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReceiverDemoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DE025EAF1A5F0D37007C4F3A /* DPLProductDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLProductDataSource.h; sourceTree = ""; }; DE025EB01A5F0D37007C4F3A /* DPLProductDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLProductDataSource.m; sourceTree = ""; }; DE058E071A3B46F500147C04 /* NSString+DPLQuery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+DPLQuery.h"; sourceTree = ""; }; @@ -159,6 +158,7 @@ DEAD328519E079D3003C8D65 /* Tests-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; DEB4EDBC1A4A036D00F31D14 /* DPLDeepLink_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLDeepLink_Private.h; sourceTree = ""; }; DEB4EDBD1A4A726200F31D14 /* DeepLinkKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkKit.h; sourceTree = ""; }; + DEC308D91CAD70A5006828A5 /* DeepLinkKit_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkKit_Private.h; sourceTree = ""; }; DECB32491A87C64E0071C76E /* DPLMutableDeepLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLMutableDeepLink.h; sourceTree = ""; }; DECB324A1A87C64E0071C76E /* DPLMutableDeepLink.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DPLMutableDeepLink.m; sourceTree = ""; }; DECB324B1A87C6750071C76E /* DPLMutableDeepLink+AppLinks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "DPLMutableDeepLink+AppLinks.h"; sourceTree = ""; }; @@ -185,6 +185,7 @@ DEEBD4A71AAB7946000BCA84 /* DPLSerializableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DPLSerializableObject.h; path = Fixtures/DPLSerializableObject.h; sourceTree = ""; }; DEEBD4A81AAB7946000BCA84 /* DPLSerializableObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DPLSerializableObject.m; path = Fixtures/DPLSerializableObject.m; sourceTree = ""; }; DF9272621ECB6C2824AD5C94 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ./LICENSE; sourceTree = ""; }; + E5A526426D04947767367953 /* Pods_SenderDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SenderDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E9CA1DB95577CF3689F4B77F /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ./README.md; sourceTree = ""; }; FB774EA6D84A50233F032ADC /* Pods-ReceiverDemoSwift.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemoSwift.test.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift.test.xcconfig"; sourceTree = ""; }; FBD5C3C0EA400B61BE35A3E4 /* Pods-ReceiverDemoSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemoSwift.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift.debug.xcconfig"; sourceTree = ""; }; @@ -198,7 +199,7 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - 1252340A196B4771BE27D5FD /* libPods-ReceiverDemo.a in Frameworks */, + A61A6536EAE2970D84077D8E /* Pods_ReceiverDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -208,7 +209,7 @@ files = ( 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - 68101FFDAAC0A24037B56D22 /* libPods-Tests.a in Frameworks */, + DD8C7D2A4BB3D273384F8ED0 /* Pods_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -219,7 +220,7 @@ 62335E0B1B5700BC00E3818C /* UIKit.framework in Frameworks */, 62335E0A1B5700B400E3818C /* CoreGraphics.framework in Frameworks */, 62335E091B5700AF00E3818C /* Foundation.framework in Frameworks */, - B27794D5B1147817FAFDCD39 /* libPods-ReceiverDemoSwift.a in Frameworks */, + 39F4B8FD8A040788A53100D6 /* Pods_ReceiverDemoSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -230,7 +231,7 @@ DE16E91A1A4254E100077E18 /* CoreGraphics.framework in Frameworks */, DE16E9181A4254D200077E18 /* UIKit.framework in Frameworks */, DE16E9191A4254D900077E18 /* Foundation.framework in Frameworks */, - 6C18B300BAD926F6461AC49D /* libPods-SenderDemo.a in Frameworks */, + C9849ABE78EE8A3DC75B547F /* Pods_SenderDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -302,10 +303,10 @@ 6003F58D195388D20070C39A /* Foundation.framework */, 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, - CFE63F7FEA51182807D98A78 /* libPods-ReceiverDemo.a */, - 81A53B1FA1F6DF1D2B557DCD /* libPods-SenderDemo.a */, - 19367BAF0FEDE5B798128F3D /* libPods-Tests.a */, - 21875F254C5D9923A2B5CBF3 /* libPods-ReceiverDemoSwift.a */, + AEA72CC121C9C80C6421FE77 /* Pods_ReceiverDemo.framework */, + D432B47B5ABA10BCB8F2EF9A /* Pods_ReceiverDemoSwift.framework */, + E5A526426D04947767367953 /* Pods_SenderDemo.framework */, + 4C894FBCCA52EB64FCF44947 /* Pods_Tests.framework */, ); name = Frameworks; sourceTree = ""; @@ -495,6 +496,7 @@ isa = PBXGroup; children = ( DEB4EDBD1A4A726200F31D14 /* DeepLinkKit.h */, + DEC308D91CAD70A5006828A5 /* DeepLinkKit_Private.h */, DE4128901A8BBE500089DAA2 /* AppLinks.h */, DE99EF6A1A3B6CDD00CE3449 /* Protocols */, DE3E61071A3B4485008D6DFC /* Categories */, diff --git a/DeepLinkKit/DeepLinkKit_Private.h b/DeepLinkKit/DeepLinkKit_Private.h new file mode 100644 index 0000000..647fa46 --- /dev/null +++ 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" From e81c151cd5e84fdcb4f95eefa30a70097d19f526 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 12:56:32 -0400 Subject: [PATCH 3/8] add a module map --- DeepLinkKit.podspec | 1 + DeepLinkKit.xcodeproj/project.pbxproj | 2 ++ DeepLinkKit/AppLinks.h | 1 - DeepLinkKit/module.modulemap | 16 ++++++++++++++++ Podfile | 2 +- Podfile.lock | 2 +- SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m | 2 +- .../DPLProductDetailViewController.h | 2 +- .../DPLProductDetailViewController.m | 2 -- 9 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 DeepLinkKit/module.modulemap diff --git a/DeepLinkKit.podspec b/DeepLinkKit.podspec index 204a8a6..7e9db32 100644 --- 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 index 7a93669..4faf351 100644 --- a/DeepLinkKit.xcodeproj/project.pbxproj +++ b/DeepLinkKit.xcodeproj/project.pbxproj @@ -158,6 +158,7 @@ DEAD328519E079D3003C8D65 /* Tests-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Tests-Prefix.pch"; sourceTree = ""; }; DEB4EDBC1A4A036D00F31D14 /* DPLDeepLink_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLDeepLink_Private.h; sourceTree = ""; }; DEB4EDBD1A4A726200F31D14 /* DeepLinkKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkKit.h; sourceTree = ""; }; + DEC308D71CAD6A05006828A5 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = DeepLinkKit/module.modulemap; sourceTree = ""; }; DEC308D91CAD70A5006828A5 /* DeepLinkKit_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DeepLinkKit_Private.h; sourceTree = ""; }; DECB32491A87C64E0071C76E /* DPLMutableDeepLink.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLMutableDeepLink.h; sourceTree = ""; }; DECB324A1A87C64E0071C76E /* DPLMutableDeepLink.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DPLMutableDeepLink.m; sourceTree = ""; }; @@ -314,6 +315,7 @@ 60FF7A9C1954A5C5007DD14C /* Pod Metadata */ = { isa = PBXGroup; children = ( + DEC308D71CAD6A05006828A5 /* module.modulemap */, 8949A4E8F681A12A47C20775 /* DeepLinkKit.podspec */, E9CA1DB95577CF3689F4B77F /* README.md */, DF9272621ECB6C2824AD5C94 /* LICENSE */, diff --git a/DeepLinkKit/AppLinks.h b/DeepLinkKit/AppLinks.h index f95e2c9..7509670 100644 --- a/DeepLinkKit/AppLinks.h +++ b/DeepLinkKit/AppLinks.h @@ -1,3 +1,2 @@ -#import "DeepLinkKit.h" #import "DPLDeepLink+AppLinks.h" #import "DPLMutableDeepLink+AppLinks.h" diff --git a/DeepLinkKit/module.modulemap b/DeepLinkKit/module.modulemap new file mode 100644 index 0000000..5e37f46 --- /dev/null +++ b/DeepLinkKit/module.modulemap @@ -0,0 +1,16 @@ +framework module DeepLinkKit { + umbrella header "DeepLinkKit.h" + export * + module * { export * } + + explicit module Private { + header "DeepLinkKit_Private.h" + export * + } + + explicit module AppLinks { + header "AppLinks.h" + export * + } +} + diff --git a/Podfile b/Podfile index 8440a2e..181fd9d 100644 --- 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 index 5d7be24..4f6b831 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -19,7 +19,7 @@ EXTERNAL SOURCES: :path: . SPEC CHECKSUMS: - DeepLinkKit: 83cba3b73a997fffa9cf5ddda2bcba8bbed0788a + DeepLinkKit: 386c3cefdc29703ec85b6f2a69ed29657f6289d6 Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 KIF: 0a82046d06f3648799cac522d2d0f7934214caac OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb diff --git a/SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m b/SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m index 685a8e4..966b314 100644 --- a/SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m +++ b/SampleApps/ReceiverDemo/DPLReceiverAppDelegate.m @@ -1,7 +1,7 @@ #import "DPLReceiverAppDelegate.h" #import "DPLProductRouteHandler.h" -#import +@import DeepLinkKit; @interface DPLReceiverAppDelegate () diff --git a/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h b/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h index 52c3a26..946f62e 100644 --- a/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h +++ b/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.h @@ -1,5 +1,5 @@ #import -#import +#import @class DPLProduct; diff --git a/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m b/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m index ef4b5ac..012d108 100644 --- a/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m +++ b/SampleApps/ReceiverDemo/ProductDetail/DPLProductDetailViewController.m @@ -2,8 +2,6 @@ #import "DPLProductDataSource.h" #import "DPLProduct.h" -#import - @interface DPLProductDetailViewController () @property (weak, nonatomic) IBOutlet UILabel *nameLabel; From 093dd1fa9eb381e5809ddd93411393b78d8f2db6 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 12:56:45 -0400 Subject: [PATCH 4/8] update the license --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index cfa4761..05fd73d 100644 --- 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 From c10a628d2030d63b763fa7cd2dc20a5279a6691a Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 14:34:29 -0400 Subject: [PATCH 5/8] enforce separate imports for private and applinks modules --- DeepLinkKit/AppLinks.h | 1 + DeepLinkKit/module.modulemap | 31 ++++++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/DeepLinkKit/AppLinks.h b/DeepLinkKit/AppLinks.h index 7509670..f95e2c9 100644 --- a/DeepLinkKit/AppLinks.h +++ b/DeepLinkKit/AppLinks.h @@ -1,2 +1,3 @@ +#import "DeepLinkKit.h" #import "DPLDeepLink+AppLinks.h" #import "DPLMutableDeepLink+AppLinks.h" diff --git a/DeepLinkKit/module.modulemap b/DeepLinkKit/module.modulemap index 5e37f46..88984b1 100644 --- a/DeepLinkKit/module.modulemap +++ b/DeepLinkKit/module.modulemap @@ -1,16 +1,29 @@ framework module DeepLinkKit { umbrella header "DeepLinkKit.h" export * - module * { export * } - explicit module Private { - header "DeepLinkKit_Private.h" - export * - } + exclude header "AppLinks.h" + exclude header "DPLDeepLink+AppLinks.h" + exclude header "DPLMutableDeepLink+AppLinks.h" - explicit module AppLinks { - header "AppLinks.h" - export * - } + 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 +} From 228acd767af09102e799009f7d5edf91066710a3 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 16:34:21 -0400 Subject: [PATCH 6/8] update pods --- Podfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 4f6b831..4764ee0 100644 --- 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 `.`) @@ -20,9 +20,9 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: DeepLinkKit: 386c3cefdc29703ec85b6f2a69ed29657f6289d6 - Expecta: 9d1bff6c8b0eeee73a166a2ee898892478927a15 - KIF: 0a82046d06f3648799cac522d2d0f7934214caac - OCMock: 28def049ef47f996b515a8eeea958be7ccab2dbb - Specta: 69bb134672aae190a1379ff91df07dad8dd1f869 + Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe + KIF: 2275c6d59c77e5e56f660f006b99d73780130540 + OCMock: 18c9b7e67d4c2770e95bb77a9cc1ae0c91fe3835 + Specta: ac94d110b865115fe60ff2c6d7281053c6f8e8a2 COCOAPODS: 0.39.0 From da84c2034e6dc08e68831b9c64d62f6a5359cf72 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 16:34:58 -0400 Subject: [PATCH 7/8] fix swift project --- .../DPLReceiverSwiftAppDelegate.swift | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/SampleApps/ReceiverDemoSwift/DPLReceiverSwiftAppDelegate.swift b/SampleApps/ReceiverDemoSwift/DPLReceiverSwiftAppDelegate.swift index 8167cae..c709089 100644 --- 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 } From 77f46bbe950082da0b76fad59e2b5803c1bd54e7 Mon Sep 17 00:00:00 2001 From: Wes Smith Date: Thu, 31 Mar 2016 16:35:18 -0400 Subject: [PATCH 8/8] update tests and code coverage settings --- DeepLinkKit.xcodeproj/project.pbxproj | 65 ++++++------------- .../xcschemes/ReceiverDemo.xcscheme | 3 +- .../AppIcon.appiconset/Contents.json | 17 ++++- Tests/DeepLink/DPLDeepLink_AppLinksSpec.m | 5 +- 4 files changed, 39 insertions(+), 51 deletions(-) diff --git a/DeepLinkKit.xcodeproj/project.pbxproj b/DeepLinkKit.xcodeproj/project.pbxproj index 4faf351..528b4b8 100644 --- a/DeepLinkKit.xcodeproj/project.pbxproj +++ b/DeepLinkKit.xcodeproj/project.pbxproj @@ -8,8 +8,10 @@ /* Begin PBXBuildFile section */ 2F4988DE1AE71ABC0069EF2B /* DPLRouteHandlerIntegrationTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F4988DD1AE71ABC0069EF2B /* DPLRouteHandlerIntegrationTest.m */; }; - 39F4B8FD8A040788A53100D6 /* Pods_ReceiverDemoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D432B47B5ABA10BCB8F2EF9A /* Pods_ReceiverDemoSwift.framework */; }; + 4AEEDB1E39AECEBE74DEC785 /* Pods_ReceiverDemoSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EC3E153594BC11ACCA16FACF /* Pods_ReceiverDemoSwift.framework */; }; + 4B891C24F5FC37AB411B3CFE /* Pods_SenderDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B177EEF374212F61E2F88E2 /* Pods_SenderDemo.framework */; }; 4D4F412B1B02A96400B710DB /* DPLRegularExpressionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D4F412A1B02A96400B710DB /* DPLRegularExpressionSpec.m */; }; + 59F0E57564C24FFB8BD121EC /* Pods_ReceiverDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ACBE42039CA1306AF612E45E /* Pods_ReceiverDemo.framework */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; @@ -27,9 +29,7 @@ 62EE96F61B570B10003D7564 /* DPLProductDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DE025EB01A5F0D37007C4F3A /* DPLProductDataSource.m */; }; 62EE96F71B570B13003D7564 /* DPLProduct.m in Sources */ = {isa = PBXBuildFile; fileRef = DE87B1F01A5DF49F00204A35 /* DPLProduct.m */; }; 62EE96F81B570B16003D7564 /* DPLProductTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DEAD327A19E079D3003C8D65 /* DPLProductTableViewController.m */; }; - A61A6536EAE2970D84077D8E /* Pods_ReceiverDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AEA72CC121C9C80C6421FE77 /* Pods_ReceiverDemo.framework */; }; - C9849ABE78EE8A3DC75B547F /* Pods_SenderDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E5A526426D04947767367953 /* Pods_SenderDemo.framework */; }; - DD8C7D2A4BB3D273384F8ED0 /* Pods_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C894FBCCA52EB64FCF44947 /* Pods_Tests.framework */; }; + BCA80D0137FDB7D7BDCE4B1D /* Pods_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 939E4800884A5EF9BDEBAA95 /* Pods_Tests.framework */; }; DE025EB11A5F0D37007C4F3A /* DPLProductDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DE025EB01A5F0D37007C4F3A /* DPLProductDataSource.m */; }; DE058E0A1A3B46FD00147C04 /* NSString_DPLQuerySpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DE058E091A3B46FD00147C04 /* NSString_DPLQuerySpec.m */; }; DE058E101A3B485500147C04 /* DPLDeepLinkSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = DE058E0F1A3B485500147C04 /* DPLDeepLinkSpec.m */; }; @@ -75,10 +75,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0B177EEF374212F61E2F88E2 /* Pods_SenderDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SenderDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 14A1857A6611A826E51F612A /* Pods-ReceiverDemo.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemo.test.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo.test.xcconfig"; sourceTree = ""; }; 2AE3E05821FBC0C05F248E61 /* Pods-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.debug.xcconfig"; sourceTree = ""; }; 2F4988DD1AE71ABC0069EF2B /* DPLRouteHandlerIntegrationTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DPLRouteHandlerIntegrationTest.m; path = IntegrationTests/DPLRouteHandlerIntegrationTest.m; sourceTree = ""; }; - 4C894FBCCA52EB64FCF44947 /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 4D4F412A1B02A96400B710DB /* DPLRegularExpressionSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLRegularExpressionSpec.m; sourceTree = ""; }; 57D5F02E049D7887B4F4ACDF /* Pods-ReceiverDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo.debug.xcconfig"; sourceTree = ""; }; 59C6806DC6FB049E0A3371C7 /* Pods-ReceiverDemoSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemoSwift.release.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift.release.xcconfig"; sourceTree = ""; }; @@ -99,13 +99,13 @@ 83D34C3D1B03ECAD00BA6EF1 /* DPLRegularExpression.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DPLRegularExpression.h; sourceTree = ""; }; 83D34C3E1B03ECAD00BA6EF1 /* DPLRegularExpression.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DPLRegularExpression.m; sourceTree = ""; }; 8949A4E8F681A12A47C20775 /* DeepLinkKit.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = DeepLinkKit.podspec; path = ./DeepLinkKit.podspec; sourceTree = ""; }; + 939E4800884A5EF9BDEBAA95 /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A7644D9D2D35BA2869AD63FA /* Pods-SenderDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SenderDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo.release.xcconfig"; sourceTree = ""; }; - AEA72CC121C9C80C6421FE77 /* Pods_ReceiverDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReceiverDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ACBE42039CA1306AF612E45E /* Pods_ReceiverDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReceiverDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B3CB044233E227F87FCF2C46 /* Pods-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.release.xcconfig"; sourceTree = ""; }; B915356798E84DC8F8A0A3CB /* Pods-SenderDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SenderDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-SenderDemo/Pods-SenderDemo.debug.xcconfig"; sourceTree = ""; }; BB75E70100C0775F382CD22F /* Pods-ReceiverDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemo/Pods-ReceiverDemo.release.xcconfig"; sourceTree = ""; }; BBE7E5A25C1B0E9637BE745A /* Pods-Tests.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Tests.test.xcconfig"; path = "Pods/Target Support Files/Pods-Tests/Pods-Tests.test.xcconfig"; sourceTree = ""; }; - D432B47B5ABA10BCB8F2EF9A /* Pods_ReceiverDemoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReceiverDemoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DE025EAF1A5F0D37007C4F3A /* DPLProductDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DPLProductDataSource.h; sourceTree = ""; }; DE025EB01A5F0D37007C4F3A /* DPLProductDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DPLProductDataSource.m; sourceTree = ""; }; DE058E071A3B46F500147C04 /* NSString+DPLQuery.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+DPLQuery.h"; sourceTree = ""; }; @@ -186,8 +186,8 @@ DEEBD4A71AAB7946000BCA84 /* DPLSerializableObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DPLSerializableObject.h; path = Fixtures/DPLSerializableObject.h; sourceTree = ""; }; DEEBD4A81AAB7946000BCA84 /* DPLSerializableObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DPLSerializableObject.m; path = Fixtures/DPLSerializableObject.m; sourceTree = ""; }; DF9272621ECB6C2824AD5C94 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = LICENSE; path = ./LICENSE; sourceTree = ""; }; - E5A526426D04947767367953 /* Pods_SenderDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SenderDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; E9CA1DB95577CF3689F4B77F /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; name = README.md; path = ./README.md; sourceTree = ""; }; + EC3E153594BC11ACCA16FACF /* Pods_ReceiverDemoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ReceiverDemoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FB774EA6D84A50233F032ADC /* Pods-ReceiverDemoSwift.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemoSwift.test.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift.test.xcconfig"; sourceTree = ""; }; FBD5C3C0EA400B61BE35A3E4 /* Pods-ReceiverDemoSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReceiverDemoSwift.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ReceiverDemoSwift/Pods-ReceiverDemoSwift.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -200,7 +200,7 @@ 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */, 6003F592195388D20070C39A /* UIKit.framework in Frameworks */, 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, - A61A6536EAE2970D84077D8E /* Pods_ReceiverDemo.framework in Frameworks */, + 59F0E57564C24FFB8BD121EC /* Pods_ReceiverDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -210,7 +210,7 @@ files = ( 6003F5B2195388D20070C39A /* UIKit.framework in Frameworks */, 6003F5B1195388D20070C39A /* Foundation.framework in Frameworks */, - DD8C7D2A4BB3D273384F8ED0 /* Pods_Tests.framework in Frameworks */, + BCA80D0137FDB7D7BDCE4B1D /* Pods_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -221,7 +221,7 @@ 62335E0B1B5700BC00E3818C /* UIKit.framework in Frameworks */, 62335E0A1B5700B400E3818C /* CoreGraphics.framework in Frameworks */, 62335E091B5700AF00E3818C /* Foundation.framework in Frameworks */, - 39F4B8FD8A040788A53100D6 /* Pods_ReceiverDemoSwift.framework in Frameworks */, + 4AEEDB1E39AECEBE74DEC785 /* Pods_ReceiverDemoSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -232,7 +232,7 @@ DE16E91A1A4254E100077E18 /* CoreGraphics.framework in Frameworks */, DE16E9181A4254D200077E18 /* UIKit.framework in Frameworks */, DE16E9191A4254D900077E18 /* Foundation.framework in Frameworks */, - C9849ABE78EE8A3DC75B547F /* Pods_SenderDemo.framework in Frameworks */, + 4B891C24F5FC37AB411B3CFE /* Pods_SenderDemo.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -304,10 +304,10 @@ 6003F58D195388D20070C39A /* Foundation.framework */, 6003F58F195388D20070C39A /* CoreGraphics.framework */, 6003F591195388D20070C39A /* UIKit.framework */, - AEA72CC121C9C80C6421FE77 /* Pods_ReceiverDemo.framework */, - D432B47B5ABA10BCB8F2EF9A /* Pods_ReceiverDemoSwift.framework */, - E5A526426D04947767367953 /* Pods_SenderDemo.framework */, - 4C894FBCCA52EB64FCF44947 /* Pods_Tests.framework */, + ACBE42039CA1306AF612E45E /* Pods_ReceiverDemo.framework */, + EC3E153594BC11ACCA16FACF /* Pods_ReceiverDemoSwift.framework */, + 0B177EEF374212F61E2F88E2 /* Pods_SenderDemo.framework */, + 939E4800884A5EF9BDEBAA95 /* Pods_Tests.framework */, ); name = Frameworks; sourceTree = ""; @@ -1156,8 +1156,6 @@ ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1198,8 +1196,6 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1219,6 +1215,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_ENABLE_CODE_COVERAGE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch"; INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist"; @@ -1236,6 +1233,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_ENABLE_CODE_COVERAGE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch"; INFOPLIST_FILE = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Info.plist"; @@ -1295,14 +1293,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = YES; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-l\"Pods-ReceiverDemoSwift-DeepLinkKit\"", - "-Wall", - "-fprofile-arcs", - "-ftest-coverage", - ); PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h"; @@ -1326,14 +1316,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-l\"Pods-ReceiverDemoSwift-DeepLinkKit\"", - "-Wall", - "-fprofile-arcs", - "-ftest-coverage", - ); PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h"; @@ -1356,14 +1338,6 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MTL_ENABLE_DEBUG_INFO = NO; - OTHER_LDFLAGS = ( - "$(inherited)", - "-ObjC", - "-l\"Pods-ReceiverDemoSwift-DeepLinkKit\"", - "-Wall", - "-fprofile-arcs", - "-ftest-coverage", - ); PRODUCT_BUNDLE_IDENTIFIER = "com.usebutton.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "SampleApps/ReceiverDemoSwift/ReceiverDemoSwift-Bridging-Header.h"; @@ -1391,8 +1365,6 @@ COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; - GCC_GENERATE_TEST_COVERAGE_FILES = YES; - GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -1419,6 +1391,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CLANG_ENABLE_CODE_COVERAGE = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SampleApps/ReceiverDemo/SupportingFiles/ReceiverDemo-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; diff --git a/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme b/DeepLinkKit.xcodeproj/xcshareddata/xcschemes/ReceiverDemo.xcscheme index 126bf16..3c503d8 100644 --- 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"> diff --git a/SampleApps/ReceiverDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/SampleApps/ReceiverDemo/Images.xcassets/AppIcon.appiconset/Contents.json index 8262f9d..eeea76c 100644 --- 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" } -} +} \ No newline at end of file diff --git a/Tests/DeepLink/DPLDeepLink_AppLinksSpec.m b/Tests/DeepLink/DPLDeepLink_AppLinksSpec.m index 83b0c75..866e303 100644 --- 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)