From 674631acd4c92f1b47d2abd6e01f804c304d228f Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:18:36 +0200 Subject: [PATCH 1/9] Support Mac platform --- SweetRouter.xcodeproj/project.pbxproj | 253 +++++++++++++++++++++++++- 1 file changed, 252 insertions(+), 1 deletion(-) diff --git a/SweetRouter.xcodeproj/project.pbxproj b/SweetRouter.xcodeproj/project.pbxproj index eb447ca..560e17b 100644 --- a/SweetRouter.xcodeproj/project.pbxproj +++ b/SweetRouter.xcodeproj/project.pbxproj @@ -18,6 +18,23 @@ CE756FDD1E7C39A500D55DBA /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FDC1E7C39A500D55DBA /* Router.swift */; }; CE756FE11E7C411D00D55DBA /* TestRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FE01E7C411D00D55DBA /* TestRouter.swift */; }; CE8F7F391EAA007600336390 /* IPv6.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8F7F381EAA007600336390 /* IPv6.swift */; }; + CEA374FE1EB9C86700DA55C5 /* SweetRouter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CEA374F51EB9C86700DA55C5 /* SweetRouter.framework */; }; + CEA3750C1EB9C89000DA55C5 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FDC1E7C39A500D55DBA /* Router.swift */; }; + CEA3750D1EB9C89C00DA55C5 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA21E7C3218000D625A /* Environment.swift */; }; + CEA3750E1EB9C89C00DA55C5 /* Scheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE94C1E7AD157000647EF /* Scheme.swift */; }; + CEA3750F1EB9C89C00DA55C5 /* Host.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA01E7C30BC000D625A /* Host.swift */; }; + CEA375101EB9C89C00DA55C5 /* IP.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE9501E7ADE6B000647EF /* IP.swift */; }; + CEA375111EB9C89C00DA55C5 /* IPv6.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8F7F381EAA007600336390 /* IPv6.swift */; }; + CEA375121EB9C8A000DA55C5 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949F01E7C293C00D3C856 /* Route.swift */; }; + CEA375131EB9C8A000DA55C5 /* Path.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507411E7AF0BE007BCD37 /* Path.swift */; }; + CEA375141EB9C8A000DA55C5 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EC1E7C200000D3C856 /* Query.swift */; }; + CEA375151EB9C95700DA55C5 /* TestRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FE01E7C411D00D55DBA /* TestRouter.swift */; }; + CEA375161EB9C95700DA55C5 /* TestEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA41E7C3570000D625A /* TestEnvironment.swift */; }; + CEA375171EB9C95700DA55C5 /* TestScheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE94E1E7AD223000647EF /* TestScheme.swift */; }; + CEA375181EB9C95700DA55C5 /* TestIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE9521E7AE0CF000647EF /* TestIP.swift */; }; + CEA375191EB9C95700DA55C5 /* TestRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECF9C1E7C2B82000D625A /* TestRoute.swift */; }; + CEA3751A1EB9C95700DA55C5 /* TestRoutePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507431E7AF0F5007BCD37 /* TestRoutePath.swift */; }; + CEA3751B1EB9C95700DA55C5 /* TestQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EE1E7C23E400D3C856 /* TestQuery.swift */; }; CEE949ED1E7C200000D3C856 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EC1E7C200000D3C856 /* Query.swift */; }; CEE949EF1E7C23E400D3C856 /* TestQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EE1E7C23E400D3C856 /* TestQuery.swift */; }; CEE949F11E7C293C00D3C856 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949F01E7C293C00D3C856 /* Route.swift */; }; @@ -35,6 +52,13 @@ remoteGlobalIDString = CE0CE9311E7AC651000647EF; remoteInfo = SweetRouter; }; + CEA374FF1EB9C86700DA55C5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = CE0CE9291E7AC651000647EF /* Project object */; + proxyType = 1; + remoteGlobalIDString = CEA374F41EB9C86700DA55C5; + remoteInfo = "SweetRouter-Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -52,6 +76,8 @@ CE756FDC1E7C39A500D55DBA /* Router.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Router.swift; sourceTree = ""; }; CE756FE01E7C411D00D55DBA /* TestRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRouter.swift; sourceTree = ""; }; CE8F7F381EAA007600336390 /* IPv6.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IPv6.swift; sourceTree = ""; }; + CEA374F51EB9C86700DA55C5 /* SweetRouter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SweetRouter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CEA374FD1EB9C86700DA55C5 /* SweetRouter-MacTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SweetRouter-MacTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; CEE949EC1E7C200000D3C856 /* Query.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Query.swift; sourceTree = ""; }; CEE949EE1E7C23E400D3C856 /* TestQuery.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestQuery.swift; sourceTree = ""; }; CEE949F01E7C293C00D3C856 /* Route.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Route.swift; sourceTree = ""; }; @@ -77,6 +103,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CEA374F11EB9C86700DA55C5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CEA374FA1EB9C86700DA55C5 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + CEA374FE1EB9C86700DA55C5 /* SweetRouter.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -94,6 +135,8 @@ children = ( CE0CE9321E7AC651000647EF /* SweetRouter.framework */, CE0CE93B1E7AC651000647EF /* SweetRouterTests.xctest */, + CEA374F51EB9C86700DA55C5 /* SweetRouter.framework */, + CEA374FD1EB9C86700DA55C5 /* SweetRouter-MacTests.xctest */, ); name = Products; sourceTree = ""; @@ -158,6 +201,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CEA374F21EB9C86700DA55C5 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -197,13 +247,49 @@ productReference = CE0CE93B1E7AC651000647EF /* SweetRouterTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = CEA3750A1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-Mac" */; + buildPhases = ( + CEA374F01EB9C86700DA55C5 /* Sources */, + CEA374F11EB9C86700DA55C5 /* Frameworks */, + CEA374F21EB9C86700DA55C5 /* Headers */, + CEA374F31EB9C86700DA55C5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SweetRouter-Mac"; + productName = "SweetRouter-Mac"; + productReference = CEA374F51EB9C86700DA55C5 /* SweetRouter.framework */; + productType = "com.apple.product-type.framework"; + }; + CEA374FC1EB9C86700DA55C5 /* SweetRouter-MacTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = CEA3750B1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-MacTests" */; + buildPhases = ( + CEA374F91EB9C86700DA55C5 /* Sources */, + CEA374FA1EB9C86700DA55C5 /* Frameworks */, + CEA374FB1EB9C86700DA55C5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + CEA375001EB9C86700DA55C5 /* PBXTargetDependency */, + ); + name = "SweetRouter-MacTests"; + productName = "SweetRouter-MacTests"; + productReference = CEA374FD1EB9C86700DA55C5 /* SweetRouter-MacTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ CE0CE9291E7AC651000647EF /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0820; + LastSwiftUpdateCheck = 0830; LastUpgradeCheck = 0820; ORGANIZATIONNAME = ViolentOctopus; TargetAttributes = { @@ -218,6 +304,16 @@ DevelopmentTeam = 7H6SM4X3H7; ProvisioningStyle = Automatic; }; + CEA374F41EB9C86700DA55C5 = { + CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = 5MH662633R; + ProvisioningStyle = Automatic; + }; + CEA374FC1EB9C86700DA55C5 = { + CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = 7H6SM4X3H7; + ProvisioningStyle = Automatic; + }; }; }; buildConfigurationList = CE0CE92C1E7AC651000647EF /* Build configuration list for PBXProject "SweetRouter" */; @@ -234,6 +330,8 @@ targets = ( CE0CE9311E7AC651000647EF /* SweetRouter */, CE0CE93A1E7AC651000647EF /* SweetRouterTests */, + CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */, + CEA374FC1EB9C86700DA55C5 /* SweetRouter-MacTests */, ); }; /* End PBXProject section */ @@ -253,6 +351,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CEA374F31EB9C86700DA55C5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CEA374FB1EB9C86700DA55C5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -286,6 +398,36 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CEA374F01EB9C86700DA55C5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CEA3750E1EB9C89C00DA55C5 /* Scheme.swift in Sources */, + CEA375141EB9C8A000DA55C5 /* Query.swift in Sources */, + CEA3750C1EB9C89000DA55C5 /* Router.swift in Sources */, + CEA375131EB9C8A000DA55C5 /* Path.swift in Sources */, + CEA3750D1EB9C89C00DA55C5 /* Environment.swift in Sources */, + CEA375101EB9C89C00DA55C5 /* IP.swift in Sources */, + CEA375111EB9C89C00DA55C5 /* IPv6.swift in Sources */, + CEA375121EB9C8A000DA55C5 /* Route.swift in Sources */, + CEA3750F1EB9C89C00DA55C5 /* Host.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CEA374F91EB9C86700DA55C5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CEA375181EB9C95700DA55C5 /* TestIP.swift in Sources */, + CEA375151EB9C95700DA55C5 /* TestRouter.swift in Sources */, + CEA3751A1EB9C95700DA55C5 /* TestRoutePath.swift in Sources */, + CEA375161EB9C95700DA55C5 /* TestEnvironment.swift in Sources */, + CEA375191EB9C95700DA55C5 /* TestRoute.swift in Sources */, + CEA375171EB9C95700DA55C5 /* TestScheme.swift in Sources */, + CEA3751B1EB9C95700DA55C5 /* TestQuery.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -294,6 +436,11 @@ target = CE0CE9311E7AC651000647EF /* SweetRouter */; targetProxy = CE0CE93D1E7AC651000647EF /* PBXContainerItemProxy */; }; + CEA375001EB9C86700DA55C5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */; + targetProxy = CEA374FF1EB9C86700DA55C5 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -467,6 +614,94 @@ }; name = Release; }; + CEA375061EB9C86700DA55C5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Mac Developer"; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5MH662633R; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = SweetRouter/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; + PRODUCT_NAME = SweetRouter; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + CEA375071EB9C86700DA55C5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Mac Developer"; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 5MH662633R; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = SweetRouter/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; + PRODUCT_NAME = SweetRouter; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; + }; + name = Release; + }; + CEA375081EB9C86700DA55C5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + INFOPLIST_FILE = SweetRouterTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; + PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-MacTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SWIFT_VERSION = 3.0; + }; + name = Debug; + }; + CEA375091EB9C86700DA55C5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + INFOPLIST_FILE = SweetRouterTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.12; + PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-MacTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SWIFT_VERSION = 3.0; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -497,6 +732,22 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + CEA3750A1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CEA375061EB9C86700DA55C5 /* Debug */, + CEA375071EB9C86700DA55C5 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + CEA3750B1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-MacTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CEA375081EB9C86700DA55C5 /* Debug */, + CEA375091EB9C86700DA55C5 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = CE0CE9291E7AC651000647EF /* Project object */; From 3e6f6f30b039c5c9b9c4ca50349faf7dafc4d8dc Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:27:25 +0200 Subject: [PATCH 2/9] Add tvOS target --- SweetRouter.xcodeproj/project.pbxproj | 245 ++++++++++++++++++++++++++ 1 file changed, 245 insertions(+) diff --git a/SweetRouter.xcodeproj/project.pbxproj b/SweetRouter.xcodeproj/project.pbxproj index 560e17b..d0644ce 100644 --- a/SweetRouter.xcodeproj/project.pbxproj +++ b/SweetRouter.xcodeproj/project.pbxproj @@ -15,6 +15,23 @@ CE0CE9531E7AE0CF000647EF /* TestIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE9521E7AE0CF000647EF /* TestIP.swift */; }; CE3507421E7AF0BE007BCD37 /* Path.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507411E7AF0BE007BCD37 /* Path.swift */; }; CE3507441E7AF0F5007BCD37 /* TestRoutePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507431E7AF0F5007BCD37 /* TestRoutePath.swift */; }; + CE3715071EB9CB0200590480 /* SweetRouter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE3714FE1EB9CB0200590480 /* SweetRouter.framework */; }; + CE3715151EB9CB7D00590480 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FDC1E7C39A500D55DBA /* Router.swift */; }; + CE3715161EB9CB8000590480 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA21E7C3218000D625A /* Environment.swift */; }; + CE3715171EB9CB8000590480 /* Scheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE94C1E7AD157000647EF /* Scheme.swift */; }; + CE3715181EB9CB8000590480 /* Host.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA01E7C30BC000D625A /* Host.swift */; }; + CE3715191EB9CB8000590480 /* IP.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE9501E7ADE6B000647EF /* IP.swift */; }; + CE37151A1EB9CB8000590480 /* IPv6.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8F7F381EAA007600336390 /* IPv6.swift */; }; + CE37151B1EB9CB8500590480 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949F01E7C293C00D3C856 /* Route.swift */; }; + CE37151C1EB9CB8500590480 /* Path.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507411E7AF0BE007BCD37 /* Path.swift */; }; + CE37151D1EB9CB8500590480 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EC1E7C200000D3C856 /* Query.swift */; }; + CE37151E1EB9CB9600590480 /* TestRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FE01E7C411D00D55DBA /* TestRouter.swift */; }; + CE37151F1EB9CB9600590480 /* TestEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA41E7C3570000D625A /* TestEnvironment.swift */; }; + CE3715201EB9CB9600590480 /* TestScheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE94E1E7AD223000647EF /* TestScheme.swift */; }; + CE3715211EB9CB9600590480 /* TestIP.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE9521E7AE0CF000647EF /* TestIP.swift */; }; + CE3715221EB9CB9600590480 /* TestRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECF9C1E7C2B82000D625A /* TestRoute.swift */; }; + CE3715231EB9CB9600590480 /* TestRoutePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507431E7AF0F5007BCD37 /* TestRoutePath.swift */; }; + CE3715241EB9CB9600590480 /* TestQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EE1E7C23E400D3C856 /* TestQuery.swift */; }; CE756FDD1E7C39A500D55DBA /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FDC1E7C39A500D55DBA /* Router.swift */; }; CE756FE11E7C411D00D55DBA /* TestRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FE01E7C411D00D55DBA /* TestRouter.swift */; }; CE8F7F391EAA007600336390 /* IPv6.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8F7F381EAA007600336390 /* IPv6.swift */; }; @@ -52,6 +69,13 @@ remoteGlobalIDString = CE0CE9311E7AC651000647EF; remoteInfo = SweetRouter; }; + CE3715081EB9CB0200590480 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = CE0CE9291E7AC651000647EF /* Project object */; + proxyType = 1; + remoteGlobalIDString = CE3714FD1EB9CB0200590480; + remoteInfo = "SweetRouter-tvOS"; + }; CEA374FF1EB9C86700DA55C5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = CE0CE9291E7AC651000647EF /* Project object */; @@ -73,6 +97,8 @@ CE0CE9521E7AE0CF000647EF /* TestIP.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestIP.swift; sourceTree = ""; }; CE3507411E7AF0BE007BCD37 /* Path.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Path.swift; sourceTree = ""; }; CE3507431E7AF0F5007BCD37 /* TestRoutePath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRoutePath.swift; sourceTree = ""; }; + CE3714FE1EB9CB0200590480 /* SweetRouter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SweetRouter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + CE3715061EB9CB0200590480 /* SweetRouter-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SweetRouter-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; CE756FDC1E7C39A500D55DBA /* Router.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Router.swift; sourceTree = ""; }; CE756FE01E7C411D00D55DBA /* TestRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRouter.swift; sourceTree = ""; }; CE8F7F381EAA007600336390 /* IPv6.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IPv6.swift; sourceTree = ""; }; @@ -103,6 +129,21 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3714FA1EB9CB0200590480 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CE3715031EB9CB0200590480 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + CE3715071EB9CB0200590480 /* SweetRouter.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F11EB9C86700DA55C5 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -137,6 +178,8 @@ CE0CE93B1E7AC651000647EF /* SweetRouterTests.xctest */, CEA374F51EB9C86700DA55C5 /* SweetRouter.framework */, CEA374FD1EB9C86700DA55C5 /* SweetRouter-MacTests.xctest */, + CE3714FE1EB9CB0200590480 /* SweetRouter.framework */, + CE3715061EB9CB0200590480 /* SweetRouter-tvOSTests.xctest */, ); name = Products; sourceTree = ""; @@ -201,6 +244,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3714FB1EB9CB0200590480 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F21EB9C86700DA55C5 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -247,6 +297,42 @@ productReference = CE0CE93B1E7AC651000647EF /* SweetRouterTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + CE3714FD1EB9CB0200590480 /* SweetRouter-tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = CE3715131EB9CB0200590480 /* Build configuration list for PBXNativeTarget "SweetRouter-tvOS" */; + buildPhases = ( + CE3714F91EB9CB0200590480 /* Sources */, + CE3714FA1EB9CB0200590480 /* Frameworks */, + CE3714FB1EB9CB0200590480 /* Headers */, + CE3714FC1EB9CB0200590480 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SweetRouter-tvOS"; + productName = "SweetRouter-tvOS"; + productReference = CE3714FE1EB9CB0200590480 /* SweetRouter.framework */; + productType = "com.apple.product-type.framework"; + }; + CE3715051EB9CB0200590480 /* SweetRouter-tvOSTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = CE3715141EB9CB0200590480 /* Build configuration list for PBXNativeTarget "SweetRouter-tvOSTests" */; + buildPhases = ( + CE3715021EB9CB0200590480 /* Sources */, + CE3715031EB9CB0200590480 /* Frameworks */, + CE3715041EB9CB0200590480 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + CE3715091EB9CB0200590480 /* PBXTargetDependency */, + ); + name = "SweetRouter-tvOSTests"; + productName = "SweetRouter-tvOSTests"; + productReference = CE3715061EB9CB0200590480 /* SweetRouter-tvOSTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */ = { isa = PBXNativeTarget; buildConfigurationList = CEA3750A1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-Mac" */; @@ -304,6 +390,16 @@ DevelopmentTeam = 7H6SM4X3H7; ProvisioningStyle = Automatic; }; + CE3714FD1EB9CB0200590480 = { + CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = 7H6SM4X3H7; + ProvisioningStyle = Automatic; + }; + CE3715051EB9CB0200590480 = { + CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = 7H6SM4X3H7; + ProvisioningStyle = Automatic; + }; CEA374F41EB9C86700DA55C5 = { CreatedOnToolsVersion = 8.3.2; DevelopmentTeam = 5MH662633R; @@ -332,6 +428,8 @@ CE0CE93A1E7AC651000647EF /* SweetRouterTests */, CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */, CEA374FC1EB9C86700DA55C5 /* SweetRouter-MacTests */, + CE3714FD1EB9CB0200590480 /* SweetRouter-tvOS */, + CE3715051EB9CB0200590480 /* SweetRouter-tvOSTests */, ); }; /* End PBXProject section */ @@ -351,6 +449,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3714FC1EB9CB0200590480 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CE3715041EB9CB0200590480 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F31EB9C86700DA55C5 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -398,6 +510,36 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3714F91EB9CB0200590480 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CE3715171EB9CB8000590480 /* Scheme.swift in Sources */, + CE37151D1EB9CB8500590480 /* Query.swift in Sources */, + CE3715151EB9CB7D00590480 /* Router.swift in Sources */, + CE37151C1EB9CB8500590480 /* Path.swift in Sources */, + CE3715161EB9CB8000590480 /* Environment.swift in Sources */, + CE3715191EB9CB8000590480 /* IP.swift in Sources */, + CE37151A1EB9CB8000590480 /* IPv6.swift in Sources */, + CE37151B1EB9CB8500590480 /* Route.swift in Sources */, + CE3715181EB9CB8000590480 /* Host.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + CE3715021EB9CB0200590480 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CE3715211EB9CB9600590480 /* TestIP.swift in Sources */, + CE37151E1EB9CB9600590480 /* TestRouter.swift in Sources */, + CE3715231EB9CB9600590480 /* TestRoutePath.swift in Sources */, + CE37151F1EB9CB9600590480 /* TestEnvironment.swift in Sources */, + CE3715221EB9CB9600590480 /* TestRoute.swift in Sources */, + CE3715201EB9CB9600590480 /* TestScheme.swift in Sources */, + CE3715241EB9CB9600590480 /* TestQuery.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F01EB9C86700DA55C5 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -436,6 +578,11 @@ target = CE0CE9311E7AC651000647EF /* SweetRouter */; targetProxy = CE0CE93D1E7AC651000647EF /* PBXContainerItemProxy */; }; + CE3715091EB9CB0200590480 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = CE3714FD1EB9CB0200590480 /* SweetRouter-tvOS */; + targetProxy = CE3715081EB9CB0200590480 /* PBXContainerItemProxy */; + }; CEA375001EB9C86700DA55C5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */; @@ -614,6 +761,86 @@ }; name = Release; }; + CE37150F1EB9CB0200590480 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = ""; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = SweetRouter/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; + PRODUCT_NAME = SweetRouter; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Debug; + }; + CE3715101EB9CB0200590480 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = ""; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = SweetRouter/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; + PRODUCT_NAME = SweetRouter; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.0; + }; + name = Release; + }; + CE3715111EB9CB0200590480 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + INFOPLIST_FILE = SweetRouterTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-tvOSTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + SWIFT_VERSION = 3.0; + TVOS_DEPLOYMENT_TARGET = 10.2; + }; + name = Debug; + }; + CE3715121EB9CB0200590480 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + INFOPLIST_FILE = SweetRouterTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.violentoctopus.SweetRouter-tvOSTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + SWIFT_VERSION = 3.0; + TVOS_DEPLOYMENT_TARGET = 10.2; + }; + name = Release; + }; CEA375061EB9C86700DA55C5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -732,6 +959,22 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + CE3715131EB9CB0200590480 /* Build configuration list for PBXNativeTarget "SweetRouter-tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CE37150F1EB9CB0200590480 /* Debug */, + CE3715101EB9CB0200590480 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + CE3715141EB9CB0200590480 /* Build configuration list for PBXNativeTarget "SweetRouter-tvOSTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CE3715111EB9CB0200590480 /* Debug */, + CE3715121EB9CB0200590480 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; CEA3750A1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -739,6 +982,7 @@ CEA375071EB9C86700DA55C5 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; CEA3750B1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-MacTests" */ = { isa = XCConfigurationList; @@ -747,6 +991,7 @@ CEA375091EB9C86700DA55C5 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; From 47b4cf71d423379a3f5247a625f742e335b91ca6 Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:28:57 +0200 Subject: [PATCH 3/9] Update project settings --- SweetRouter.xcodeproj/project.pbxproj | 6 +++--- .../xcshareddata/xcschemes/SweetRouter.xcscheme | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SweetRouter.xcodeproj/project.pbxproj b/SweetRouter.xcodeproj/project.pbxproj index d0644ce..36b4646 100644 --- a/SweetRouter.xcodeproj/project.pbxproj +++ b/SweetRouter.xcodeproj/project.pbxproj @@ -376,7 +376,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0820; + LastUpgradeCheck = 0830; ORGANIZATIONNAME = ViolentOctopus; TargetAttributes = { CE0CE9311E7AC651000647EF = { @@ -846,7 +846,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5MH662633R; @@ -872,7 +872,7 @@ buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "Mac Developer"; + CODE_SIGN_IDENTITY = ""; COMBINE_HIDPI_IMAGES = YES; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = 5MH662633R; diff --git a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme index 53781d9..88b0699 100644 --- a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme +++ b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter.xcscheme @@ -1,6 +1,6 @@ Date: Wed, 3 May 2017 10:31:31 +0200 Subject: [PATCH 4/9] Add watch os target --- SweetRouter.xcodeproj/project.pbxproj | 128 ++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/SweetRouter.xcodeproj/project.pbxproj b/SweetRouter.xcodeproj/project.pbxproj index 36b4646..6416c0d 100644 --- a/SweetRouter.xcodeproj/project.pbxproj +++ b/SweetRouter.xcodeproj/project.pbxproj @@ -32,6 +32,15 @@ CE3715221EB9CB9600590480 /* TestRoute.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECF9C1E7C2B82000D625A /* TestRoute.swift */; }; CE3715231EB9CB9600590480 /* TestRoutePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507431E7AF0F5007BCD37 /* TestRoutePath.swift */; }; CE3715241EB9CB9600590480 /* TestQuery.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EE1E7C23E400D3C856 /* TestQuery.swift */; }; + CE3715321EB9CCC600590480 /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FDC1E7C39A500D55DBA /* Router.swift */; }; + CE3715331EB9CCC900590480 /* Environment.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA21E7C3218000D625A /* Environment.swift */; }; + CE3715341EB9CCC900590480 /* Scheme.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE94C1E7AD157000647EF /* Scheme.swift */; }; + CE3715351EB9CCC900590480 /* Host.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEEECFA01E7C30BC000D625A /* Host.swift */; }; + CE3715361EB9CCC900590480 /* IP.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE0CE9501E7ADE6B000647EF /* IP.swift */; }; + CE3715371EB9CCC900590480 /* IPv6.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8F7F381EAA007600336390 /* IPv6.swift */; }; + CE3715381EB9CCCC00590480 /* Route.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949F01E7C293C00D3C856 /* Route.swift */; }; + CE3715391EB9CCCC00590480 /* Path.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3507411E7AF0BE007BCD37 /* Path.swift */; }; + CE37153A1EB9CCCC00590480 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE949EC1E7C200000D3C856 /* Query.swift */; }; CE756FDD1E7C39A500D55DBA /* Router.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FDC1E7C39A500D55DBA /* Router.swift */; }; CE756FE11E7C411D00D55DBA /* TestRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE756FE01E7C411D00D55DBA /* TestRouter.swift */; }; CE8F7F391EAA007600336390 /* IPv6.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE8F7F381EAA007600336390 /* IPv6.swift */; }; @@ -99,6 +108,7 @@ CE3507431E7AF0F5007BCD37 /* TestRoutePath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRoutePath.swift; sourceTree = ""; }; CE3714FE1EB9CB0200590480 /* SweetRouter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SweetRouter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CE3715061EB9CB0200590480 /* SweetRouter-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SweetRouter-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + CE37152A1EB9CC8600590480 /* SweetRouter.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SweetRouter.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CE756FDC1E7C39A500D55DBA /* Router.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Router.swift; sourceTree = ""; }; CE756FE01E7C411D00D55DBA /* TestRouter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestRouter.swift; sourceTree = ""; }; CE8F7F381EAA007600336390 /* IPv6.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IPv6.swift; sourceTree = ""; }; @@ -144,6 +154,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3715261EB9CC8600590480 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F11EB9C86700DA55C5 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -180,6 +197,7 @@ CEA374FD1EB9C86700DA55C5 /* SweetRouter-MacTests.xctest */, CE3714FE1EB9CB0200590480 /* SweetRouter.framework */, CE3715061EB9CB0200590480 /* SweetRouter-tvOSTests.xctest */, + CE37152A1EB9CC8600590480 /* SweetRouter.framework */, ); name = Products; sourceTree = ""; @@ -251,6 +269,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3715271EB9CC8600590480 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F21EB9C86700DA55C5 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -333,6 +358,24 @@ productReference = CE3715061EB9CB0200590480 /* SweetRouter-tvOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + CE3715291EB9CC8600590480 /* SweetRouter-watchOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = CE37152F1EB9CC8600590480 /* Build configuration list for PBXNativeTarget "SweetRouter-watchOS" */; + buildPhases = ( + CE3715251EB9CC8600590480 /* Sources */, + CE3715261EB9CC8600590480 /* Frameworks */, + CE3715271EB9CC8600590480 /* Headers */, + CE3715281EB9CC8600590480 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "SweetRouter-watchOS"; + productName = "SweetRouter-watchOS"; + productReference = CE37152A1EB9CC8600590480 /* SweetRouter.framework */; + productType = "com.apple.product-type.framework"; + }; CEA374F41EB9C86700DA55C5 /* SweetRouter-Mac */ = { isa = PBXNativeTarget; buildConfigurationList = CEA3750A1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-Mac" */; @@ -400,6 +443,11 @@ DevelopmentTeam = 7H6SM4X3H7; ProvisioningStyle = Automatic; }; + CE3715291EB9CC8600590480 = { + CreatedOnToolsVersion = 8.3.2; + DevelopmentTeam = 7H6SM4X3H7; + ProvisioningStyle = Automatic; + }; CEA374F41EB9C86700DA55C5 = { CreatedOnToolsVersion = 8.3.2; DevelopmentTeam = 5MH662633R; @@ -430,6 +478,7 @@ CEA374FC1EB9C86700DA55C5 /* SweetRouter-MacTests */, CE3714FD1EB9CB0200590480 /* SweetRouter-tvOS */, CE3715051EB9CB0200590480 /* SweetRouter-tvOSTests */, + CE3715291EB9CC8600590480 /* SweetRouter-watchOS */, ); }; /* End PBXProject section */ @@ -463,6 +512,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3715281EB9CC8600590480 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F31EB9C86700DA55C5 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -540,6 +596,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + CE3715251EB9CC8600590480 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + CE3715341EB9CCC900590480 /* Scheme.swift in Sources */, + CE37153A1EB9CCCC00590480 /* Query.swift in Sources */, + CE3715321EB9CCC600590480 /* Router.swift in Sources */, + CE3715391EB9CCCC00590480 /* Path.swift in Sources */, + CE3715331EB9CCC900590480 /* Environment.swift in Sources */, + CE3715361EB9CCC900590480 /* IP.swift in Sources */, + CE3715371EB9CCC900590480 /* IPv6.swift in Sources */, + CE3715381EB9CCCC00590480 /* Route.swift in Sources */, + CE3715351EB9CCC900590480 /* Host.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; CEA374F01EB9C86700DA55C5 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -841,6 +913,54 @@ }; name = Release; }; + CE3715301EB9CC8600590480 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = ""; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = SweetRouter/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; + PRODUCT_NAME = SweetRouter; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 3.2; + }; + name = Debug; + }; + CE3715311EB9CC8600590480 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = ""; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = 7H6SM4X3H7; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = SweetRouter/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.violentoctopus.SweetRouter; + PRODUCT_NAME = SweetRouter; + SDKROOT = watchos; + SKIP_INSTALL = YES; + SWIFT_VERSION = 3.0; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 3.2; + }; + name = Release; + }; CEA375061EB9C86700DA55C5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -975,6 +1095,14 @@ ); defaultConfigurationIsVisible = 0; }; + CE37152F1EB9CC8600590480 /* Build configuration list for PBXNativeTarget "SweetRouter-watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + CE3715301EB9CC8600590480 /* Debug */, + CE3715311EB9CC8600590480 /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; CEA3750A1EB9C86700DA55C5 /* Build configuration list for PBXNativeTarget "SweetRouter-Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( From 1bdaebe3d2e804441e7f545e00b2a70221624520 Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:37:08 +0200 Subject: [PATCH 5/9] Update travis yaml --- .travis.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51304a8..bbb6d9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,14 @@ language: objective-c osx_image: xcode8.3 -script: - - open -a "simulator" --args -CurrentDeviceUDID 99F4F45C-3B72-4473-A6C5-3FD81EF3C25D - - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=iOS Simulator,OS=10.3,id=99F4F45C-3B72-4473-A6C5-3FD81EF3C25D' +matrix: + include: + - script: + - open -a "simulator" --args -CurrentDeviceUDID 99F4F45C-3B72-4473-A6C5-3FD81EF3C25D + - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=iOS Simulator,OS=10.3,id=99F4F45C-3B72-4473-A6C5-3FD81EF3C25D' + + - script: + - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=tvOS Simulator,OS=10.2' after_success: - bash <(curl -s https://codecov.io/bash) From 623a0f8e5acf925d8b682377dbc0bbdbbf713f3f Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:41:23 +0200 Subject: [PATCH 6/9] Fix scheme for tvOS --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bbb6d9c..56ae98b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ matrix: - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=iOS Simulator,OS=10.3,id=99F4F45C-3B72-4473-A6C5-3FD81EF3C25D' - script: - - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=tvOS Simulator,OS=10.2' + - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter-tvOS -destination 'platform=tvOS Simulator,OS=10.2' after_success: - bash <(curl -s https://codecov.io/bash) From 9cdd937444f5354563c8cd724088ac6f1ea86581 Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:45:04 +0200 Subject: [PATCH 7/9] Fix tvOS script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 56ae98b..ea173ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ matrix: - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter -destination 'platform=iOS Simulator,OS=10.3,id=99F4F45C-3B72-4473-A6C5-3FD81EF3C25D' - script: - - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter-tvOS -destination 'platform=tvOS Simulator,OS=10.2' + - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter-tvOS -destination 'platform=tvOS Simulator,OS=10.2,name=Apple TV 1080p' after_success: - bash <(curl -s https://codecov.io/bash) From 05122ab0236905719d0342b753834ee956b986cf Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:45:56 +0200 Subject: [PATCH 8/9] Make all schemes shared --- .../xcschemes/SweetRouter-Mac.xcscheme | 100 ++++++++++++++++++ .../xcschemes/SweetRouter-tvOS.xcscheme | 100 ++++++++++++++++++ .../xcschemes/SweetRouter-watchOS.xcscheme | 80 ++++++++++++++ 3 files changed, 280 insertions(+) create mode 100644 SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-Mac.xcscheme create mode 100644 SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-tvOS.xcscheme create mode 100644 SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-watchOS.xcscheme diff --git a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-Mac.xcscheme b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-Mac.xcscheme new file mode 100644 index 0000000..7ed366f --- /dev/null +++ b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-Mac.xcscheme @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-tvOS.xcscheme b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-tvOS.xcscheme new file mode 100644 index 0000000..397d416 --- /dev/null +++ b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-tvOS.xcscheme @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-watchOS.xcscheme b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-watchOS.xcscheme new file mode 100644 index 0000000..a5a01a5 --- /dev/null +++ b/SweetRouter.xcodeproj/xcshareddata/xcschemes/SweetRouter-watchOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 40f82564793a65e7ee6e81b4c92abe84b6219038 Mon Sep 17 00:00:00 2001 From: Oleksii Dykan Date: Wed, 3 May 2017 10:51:51 +0200 Subject: [PATCH 9/9] Add macOS and watchOS --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index ea173ff..5c68435 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,12 @@ matrix: - script: - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter-tvOS -destination 'platform=tvOS Simulator,OS=10.2,name=Apple TV 1080p' + - script: + - xcodebuild clean build test -project SweetRouter.xcodeproj -scheme SweetRouter-Mac + + - script: + - xcodebuild clean build -project SweetRouter.xcodeproj -scheme SweetRouter-watchOS + after_success: - bash <(curl -s https://codecov.io/bash)