From e9ce3996c060740ba6584152620b326959d498dd Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Tue, 23 Feb 2016 18:41:52 +0800 Subject: [PATCH 1/9] Add targets for all platforms --- TanukiKit.xcodeproj/project.pbxproj | 642 +++++++++++++++++- .../xcschemes/TanukiKit Mac.xcscheme | 99 +++ .../xcschemes/TanukiKit tvOS.xcscheme | 99 +++ .../xcschemes/TanukiKit watchOS.xcscheme | 80 +++ TanukiKit/Keys.swift | 7 - TanukiKit/Repositories.swift | 7 - TanukiKit/User.swift | 7 - TanukiKitTests/ConfigurationTests.swift | 26 +- TanukiKitTests/KeysTests.swift | 10 +- 9 files changed, 917 insertions(+), 60 deletions(-) create mode 100644 TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme create mode 100644 TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit tvOS.xcscheme create mode 100644 TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit watchOS.xcscheme diff --git a/TanukiKit.xcodeproj/project.pbxproj b/TanukiKit.xcodeproj/project.pbxproj index 94cb028..2223445 100644 --- a/TanukiKit.xcodeproj/project.pbxproj +++ b/TanukiKit.xcodeproj/project.pbxproj @@ -20,6 +20,47 @@ 233A0B311C0EFE0400072A58 /* Nocilla.framework in Carthage embed */ = {isa = PBXBuildFile; fileRef = 233A0B2E1C0EFDDC00072A58 /* Nocilla.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 233A0B321C0EFE0400072A58 /* RequestKit.framework in Carthage embed */ = {isa = PBXBuildFile; fileRef = 233A0B2C1C0EFDD000072A58 /* RequestKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 233A0B341C0EFE2A00072A58 /* ConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B331C0EFE2A00072A58 /* ConfigurationTests.swift */; }; + 23A4CE041C7C6BDF00261CFB /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1D1C0EF94400072A58 /* Configuration.swift */; }; + 23A4CE051C7C6BDF00261CFB /* GitLabKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1E1C0EF94400072A58 /* GitLabKit.swift */; }; + 23A4CE061C7C6BDF00261CFB /* Repositories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1F1C0EF94400072A58 /* Repositories.swift */; }; + 23A4CE071C7C6BDF00261CFB /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DA1C1AD8AB0017CBDA /* Keys.swift */; }; + 23A4CE081C7C6BDF00261CFB /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B201C0EF94400072A58 /* User.swift */; }; + 23A4CE091C7C6BE800261CFB /* TanukiKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 233A0B061C0EF8E900072A58 /* TanukiKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 23A4CE191C7C6BF700261CFB /* TanukiKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE0F1C7C6BF700261CFB /* TanukiKit.framework */; }; + 23A4CE261C7C6BFD00261CFB /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1D1C0EF94400072A58 /* Configuration.swift */; }; + 23A4CE271C7C6BFD00261CFB /* GitLabKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1E1C0EF94400072A58 /* GitLabKit.swift */; }; + 23A4CE281C7C6BFD00261CFB /* Repositories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1F1C0EF94400072A58 /* Repositories.swift */; }; + 23A4CE291C7C6BFD00261CFB /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DA1C1AD8AB0017CBDA /* Keys.swift */; }; + 23A4CE2A1C7C6BFD00261CFB /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B201C0EF94400072A58 /* User.swift */; }; + 23A4CE2B1C7C6C0B00261CFB /* TanukiKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 233A0B061C0EF8E900072A58 /* TanukiKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 23A4CE2C1C7C6C3600261CFB /* ConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B331C0EFE2A00072A58 /* ConfigurationTests.swift */; }; + 23A4CE2D1C7C6C3600261CFB /* KeysTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DC1C1AD8FD0017CBDA /* KeysTests.swift */; }; + 23A4CE2E1C7C6C3600261CFB /* TestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DE1C1AD9680017CBDA /* TestHelper.swift */; }; + 23A4CE3E1C7C6C5600261CFB /* TanukiKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE341C7C6C5600261CFB /* TanukiKit.framework */; }; + 23A4CE4B1C7C6C5D00261CFB /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1D1C0EF94400072A58 /* Configuration.swift */; }; + 23A4CE4C1C7C6C5D00261CFB /* GitLabKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1E1C0EF94400072A58 /* GitLabKit.swift */; }; + 23A4CE4D1C7C6C5D00261CFB /* Repositories.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B1F1C0EF94400072A58 /* Repositories.swift */; }; + 23A4CE4E1C7C6C5D00261CFB /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DA1C1AD8AB0017CBDA /* Keys.swift */; }; + 23A4CE4F1C7C6C5D00261CFB /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B201C0EF94400072A58 /* User.swift */; }; + 23A4CE501C7C6C6900261CFB /* TanukiKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 233A0B061C0EF8E900072A58 /* TanukiKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 23A4CE511C7C6C7D00261CFB /* ConfigurationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 233A0B331C0EFE2A00072A58 /* ConfigurationTests.swift */; }; + 23A4CE521C7C6C7D00261CFB /* KeysTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DC1C1AD8FD0017CBDA /* KeysTests.swift */; }; + 23A4CE531C7C6C7D00261CFB /* TestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DE1C1AD9680017CBDA /* TestHelper.swift */; }; + 23A4CE541C7C6C8100261CFB /* Repositories.json in Resources */ = {isa = PBXBuildFile; fileRef = 233A0B281C0EFDBC00072A58 /* Repositories.json */; }; + 23A4CE551C7C6C8100261CFB /* User.json in Resources */ = {isa = PBXBuildFile; fileRef = 233A0B291C0EFDBC00072A58 /* User.json */; }; + 23A4CE561C7C6C8100261CFB /* public_key.json in Resources */ = {isa = PBXBuildFile; fileRef = 23FC28E01C1AD9DD0017CBDA /* public_key.json */; }; + 23A4CE571C7C6C8500261CFB /* Repositories.json in Resources */ = {isa = PBXBuildFile; fileRef = 233A0B281C0EFDBC00072A58 /* Repositories.json */; }; + 23A4CE581C7C6C8500261CFB /* User.json in Resources */ = {isa = PBXBuildFile; fileRef = 233A0B291C0EFDBC00072A58 /* User.json */; }; + 23A4CE591C7C6C8500261CFB /* public_key.json in Resources */ = {isa = PBXBuildFile; fileRef = 23FC28E01C1AD9DD0017CBDA /* public_key.json */; }; + 23A4CE5B1C7C6DDB00261CFB /* RequestKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE5A1C7C6DDB00261CFB /* RequestKit.framework */; }; + 23A4CE5D1C7C6DE800261CFB /* RequestKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE5C1C7C6DE800261CFB /* RequestKit.framework */; }; + 23A4CE611C7C6E4D00261CFB /* RequestKit.framework in Carthage embed */ = {isa = PBXBuildFile; fileRef = 23A4CE5C1C7C6DE800261CFB /* RequestKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 23A4CE631C7C6E5D00261CFB /* Nocilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE621C7C6E5D00261CFB /* Nocilla.framework */; }; + 23A4CE641C7C6E6000261CFB /* Nocilla.framework in Carthage embed */ = {isa = PBXBuildFile; fileRef = 23A4CE621C7C6E5D00261CFB /* Nocilla.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 23A4CE661C7C6E6E00261CFB /* RequestKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE651C7C6E6E00261CFB /* RequestKit.framework */; }; + 23A4CE691C7C6E8600261CFB /* Nocilla.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 23A4CE681C7C6E8600261CFB /* Nocilla.framework */; }; + 23A4CE6A1C7C6E8C00261CFB /* Nocilla.framework in Carthage embed */ = {isa = PBXBuildFile; fileRef = 23A4CE681C7C6E8600261CFB /* Nocilla.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 23A4CE6B1C7C6E8F00261CFB /* RequestKit.framework in Carthage embed */ = {isa = PBXBuildFile; fileRef = 23A4CE651C7C6E6E00261CFB /* RequestKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 23FC28DB1C1AD8AB0017CBDA /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DA1C1AD8AB0017CBDA /* Keys.swift */; }; 23FC28DD1C1AD8FD0017CBDA /* KeysTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DC1C1AD8FD0017CBDA /* KeysTests.swift */; }; 23FC28DF1C1AD9680017CBDA /* TestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 23FC28DE1C1AD9680017CBDA /* TestHelper.swift */; }; @@ -34,6 +75,20 @@ remoteGlobalIDString = 233A0B021C0EF8E900072A58; remoteInfo = TanukiKit; }; + 23A4CE1A1C7C6BF700261CFB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 233A0AFA1C0EF8E900072A58 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 23A4CE0E1C7C6BF700261CFB; + remoteInfo = "TanukiKit tvOS"; + }; + 23A4CE3F1C7C6C5600261CFB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 233A0AFA1C0EF8E900072A58 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 23A4CE331C7C6C5600261CFB; + remoteInfo = "TanukiKit Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -49,6 +104,30 @@ name = "Carthage embed"; runOnlyForDeploymentPostprocessing = 0; }; + 23A4CE5F1C7C6DFC00261CFB /* Carthage embed */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 23A4CE611C7C6E4D00261CFB /* RequestKit.framework in Carthage embed */, + 23A4CE641C7C6E6000261CFB /* Nocilla.framework in Carthage embed */, + ); + name = "Carthage embed"; + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE671C7C6E7300261CFB /* Carthage embed */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + 23A4CE6A1C7C6E8C00261CFB /* Nocilla.framework in Carthage embed */, + 23A4CE6B1C7C6E8F00261CFB /* RequestKit.framework in Carthage embed */, + ); + name = "Carthage embed"; + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -66,6 +145,16 @@ 233A0B2C1C0EFDD000072A58 /* RequestKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RequestKit.framework; path = ../Carthage/Build/iOS/RequestKit.framework; sourceTree = ""; }; 233A0B2E1C0EFDDC00072A58 /* Nocilla.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nocilla.framework; path = ../Carthage/Build/iOS/Nocilla.framework; sourceTree = ""; }; 233A0B331C0EFE2A00072A58 /* ConfigurationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationTests.swift; sourceTree = ""; }; + 23A4CDFC1C7C6BD700261CFB /* TanukiKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TanukiKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 23A4CE0F1C7C6BF700261CFB /* TanukiKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TanukiKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 23A4CE181C7C6BF700261CFB /* TanukiKit tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TanukiKit tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 23A4CE341C7C6C5600261CFB /* TanukiKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TanukiKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 23A4CE3D1C7C6C5600261CFB /* TanukiKit MacTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "TanukiKit MacTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 23A4CE5A1C7C6DDB00261CFB /* RequestKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RequestKit.framework; path = Carthage/Build/watchOS/RequestKit.framework; sourceTree = ""; }; + 23A4CE5C1C7C6DE800261CFB /* RequestKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RequestKit.framework; path = Carthage/Build/tvOS/RequestKit.framework; sourceTree = ""; }; + 23A4CE621C7C6E5D00261CFB /* Nocilla.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nocilla.framework; path = Carthage/Build/tvOS/Nocilla.framework; sourceTree = ""; }; + 23A4CE651C7C6E6E00261CFB /* RequestKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RequestKit.framework; path = Carthage/Build/Mac/RequestKit.framework; sourceTree = ""; }; + 23A4CE681C7C6E8600261CFB /* Nocilla.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Nocilla.framework; path = Carthage/Build/Mac/Nocilla.framework; sourceTree = ""; }; 23FC28DA1C1AD8AB0017CBDA /* Keys.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Keys.swift; sourceTree = ""; }; 23FC28DC1C1AD8FD0017CBDA /* KeysTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeysTests.swift; sourceTree = ""; }; 23FC28DE1C1AD9680017CBDA /* TestHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestHelper.swift; sourceTree = ""; }; @@ -90,6 +179,48 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 23A4CDF81C7C6BD700261CFB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE5B1C7C6DDB00261CFB /* RequestKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE0B1C7C6BF700261CFB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE5D1C7C6DE800261CFB /* RequestKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE151C7C6BF700261CFB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE631C7C6E5D00261CFB /* Nocilla.framework in Frameworks */, + 23A4CE191C7C6BF700261CFB /* TanukiKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE301C7C6C5600261CFB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE661C7C6E6E00261CFB /* RequestKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE3A1C7C6C5600261CFB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE691C7C6E8600261CFB /* Nocilla.framework in Frameworks */, + 23A4CE3E1C7C6C5600261CFB /* TanukiKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -98,6 +229,7 @@ children = ( 233A0B051C0EF8E900072A58 /* TanukiKit */, 233A0B111C0EF8E900072A58 /* TanukiKitTests */, + 23A4CE601C7C6E1000261CFB /* Frameworks */, 233A0B041C0EF8E900072A58 /* Products */, ); sourceTree = ""; @@ -107,6 +239,11 @@ children = ( 233A0B031C0EF8E900072A58 /* TanukiKit.framework */, 233A0B0D1C0EF8E900072A58 /* TanukiKitTests.xctest */, + 23A4CDFC1C7C6BD700261CFB /* TanukiKit.framework */, + 23A4CE0F1C7C6BF700261CFB /* TanukiKit.framework */, + 23A4CE181C7C6BF700261CFB /* TanukiKit tvOSTests.xctest */, + 23A4CE341C7C6C5600261CFB /* TanukiKit.framework */, + 23A4CE3D1C7C6C5600261CFB /* TanukiKit MacTests.xctest */, ); name = Products; sourceTree = ""; @@ -157,6 +294,18 @@ name = Frameworks; sourceTree = ""; }; + 23A4CE601C7C6E1000261CFB /* Frameworks */ = { + isa = PBXGroup; + children = ( + 23A4CE681C7C6E8600261CFB /* Nocilla.framework */, + 23A4CE651C7C6E6E00261CFB /* RequestKit.framework */, + 23A4CE621C7C6E5D00261CFB /* Nocilla.framework */, + 23A4CE5C1C7C6DE800261CFB /* RequestKit.framework */, + 23A4CE5A1C7C6DDB00261CFB /* RequestKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -168,6 +317,30 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 23A4CDF91C7C6BD700261CFB /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE091C7C6BE800261CFB /* TanukiKit.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE0C1C7C6BF700261CFB /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE2B1C7C6C0B00261CFB /* TanukiKit.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE311C7C6C5600261CFB /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE501C7C6C6900261CFB /* TanukiKit.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -208,13 +381,105 @@ productReference = 233A0B0D1C0EF8E900072A58 /* TanukiKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + 23A4CDFB1C7C6BD700261CFB /* TanukiKit watchOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 23A4CE031C7C6BD700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit watchOS" */; + buildPhases = ( + 23A4CDF71C7C6BD700261CFB /* Sources */, + 23A4CDF81C7C6BD700261CFB /* Frameworks */, + 23A4CDF91C7C6BD700261CFB /* Headers */, + 23A4CDFA1C7C6BD700261CFB /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "TanukiKit watchOS"; + productName = "TanukiKit watchOS"; + productReference = 23A4CDFC1C7C6BD700261CFB /* TanukiKit.framework */; + productType = "com.apple.product-type.framework"; + }; + 23A4CE0E1C7C6BF700261CFB /* TanukiKit tvOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 23A4CE201C7C6BF700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit tvOS" */; + buildPhases = ( + 23A4CE0A1C7C6BF700261CFB /* Sources */, + 23A4CE0B1C7C6BF700261CFB /* Frameworks */, + 23A4CE0C1C7C6BF700261CFB /* Headers */, + 23A4CE0D1C7C6BF700261CFB /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "TanukiKit tvOS"; + productName = "TanukiKit tvOS"; + productReference = 23A4CE0F1C7C6BF700261CFB /* TanukiKit.framework */; + productType = "com.apple.product-type.framework"; + }; + 23A4CE171C7C6BF700261CFB /* TanukiKit tvOSTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 23A4CE231C7C6BF700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit tvOSTests" */; + buildPhases = ( + 23A4CE141C7C6BF700261CFB /* Sources */, + 23A4CE151C7C6BF700261CFB /* Frameworks */, + 23A4CE161C7C6BF700261CFB /* Resources */, + 23A4CE5F1C7C6DFC00261CFB /* Carthage embed */, + ); + buildRules = ( + ); + dependencies = ( + 23A4CE1B1C7C6BF700261CFB /* PBXTargetDependency */, + ); + name = "TanukiKit tvOSTests"; + productName = "TanukiKit tvOSTests"; + productReference = 23A4CE181C7C6BF700261CFB /* TanukiKit tvOSTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 23A4CE331C7C6C5600261CFB /* TanukiKit Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 23A4CE451C7C6C5600261CFB /* Build configuration list for PBXNativeTarget "TanukiKit Mac" */; + buildPhases = ( + 23A4CE2F1C7C6C5600261CFB /* Sources */, + 23A4CE301C7C6C5600261CFB /* Frameworks */, + 23A4CE311C7C6C5600261CFB /* Headers */, + 23A4CE321C7C6C5600261CFB /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "TanukiKit Mac"; + productName = "TanukiKit Mac"; + productReference = 23A4CE341C7C6C5600261CFB /* TanukiKit.framework */; + productType = "com.apple.product-type.framework"; + }; + 23A4CE3C1C7C6C5600261CFB /* TanukiKit MacTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 23A4CE481C7C6C5600261CFB /* Build configuration list for PBXNativeTarget "TanukiKit MacTests" */; + buildPhases = ( + 23A4CE391C7C6C5600261CFB /* Sources */, + 23A4CE3A1C7C6C5600261CFB /* Frameworks */, + 23A4CE3B1C7C6C5600261CFB /* Resources */, + 23A4CE671C7C6E7300261CFB /* Carthage embed */, + ); + buildRules = ( + ); + dependencies = ( + 23A4CE401C7C6C5600261CFB /* PBXTargetDependency */, + ); + name = "TanukiKit MacTests"; + productName = "TanukiKit MacTests"; + productReference = 23A4CE3D1C7C6C5600261CFB /* TanukiKit MacTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 233A0AFA1C0EF8E900072A58 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 0710; + LastSwiftUpdateCheck = 0720; LastUpgradeCheck = 0710; ORGANIZATIONNAME = nerdishbynature; TargetAttributes = { @@ -224,6 +489,21 @@ 233A0B0C1C0EF8E900072A58 = { CreatedOnToolsVersion = 7.1; }; + 23A4CDFB1C7C6BD700261CFB = { + CreatedOnToolsVersion = 7.2.1; + }; + 23A4CE0E1C7C6BF700261CFB = { + CreatedOnToolsVersion = 7.2.1; + }; + 23A4CE171C7C6BF700261CFB = { + CreatedOnToolsVersion = 7.2.1; + }; + 23A4CE331C7C6C5600261CFB = { + CreatedOnToolsVersion = 7.2.1; + }; + 23A4CE3C1C7C6C5600261CFB = { + CreatedOnToolsVersion = 7.2.1; + }; }; }; buildConfigurationList = 233A0AFD1C0EF8E900072A58 /* Build configuration list for PBXProject "TanukiKit" */; @@ -240,6 +520,11 @@ targets = ( 233A0B021C0EF8E900072A58 /* TanukiKit */, 233A0B0C1C0EF8E900072A58 /* TanukiKitTests */, + 23A4CDFB1C7C6BD700261CFB /* TanukiKit watchOS */, + 23A4CE0E1C7C6BF700261CFB /* TanukiKit tvOS */, + 23A4CE171C7C6BF700261CFB /* TanukiKit tvOSTests */, + 23A4CE331C7C6C5600261CFB /* TanukiKit Mac */, + 23A4CE3C1C7C6C5600261CFB /* TanukiKit MacTests */, ); }; /* End PBXProject section */ @@ -262,6 +547,47 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 23A4CDFA1C7C6BD700261CFB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE0D1C7C6BF700261CFB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE161C7C6BF700261CFB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE571C7C6C8500261CFB /* Repositories.json in Resources */, + 23A4CE581C7C6C8500261CFB /* User.json in Resources */, + 23A4CE591C7C6C8500261CFB /* public_key.json in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE321C7C6C5600261CFB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE3B1C7C6C5600261CFB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE541C7C6C8100261CFB /* Repositories.json in Resources */, + 23A4CE551C7C6C8100261CFB /* User.json in Resources */, + 23A4CE561C7C6C8100261CFB /* public_key.json in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -287,6 +613,62 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 23A4CDF71C7C6BD700261CFB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE041C7C6BDF00261CFB /* Configuration.swift in Sources */, + 23A4CE051C7C6BDF00261CFB /* GitLabKit.swift in Sources */, + 23A4CE061C7C6BDF00261CFB /* Repositories.swift in Sources */, + 23A4CE071C7C6BDF00261CFB /* Keys.swift in Sources */, + 23A4CE081C7C6BDF00261CFB /* User.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE0A1C7C6BF700261CFB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE261C7C6BFD00261CFB /* Configuration.swift in Sources */, + 23A4CE271C7C6BFD00261CFB /* GitLabKit.swift in Sources */, + 23A4CE281C7C6BFD00261CFB /* Repositories.swift in Sources */, + 23A4CE291C7C6BFD00261CFB /* Keys.swift in Sources */, + 23A4CE2A1C7C6BFD00261CFB /* User.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE141C7C6BF700261CFB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE2C1C7C6C3600261CFB /* ConfigurationTests.swift in Sources */, + 23A4CE2D1C7C6C3600261CFB /* KeysTests.swift in Sources */, + 23A4CE2E1C7C6C3600261CFB /* TestHelper.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE2F1C7C6C5600261CFB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE4B1C7C6C5D00261CFB /* Configuration.swift in Sources */, + 23A4CE4C1C7C6C5D00261CFB /* GitLabKit.swift in Sources */, + 23A4CE4D1C7C6C5D00261CFB /* Repositories.swift in Sources */, + 23A4CE4E1C7C6C5D00261CFB /* Keys.swift in Sources */, + 23A4CE4F1C7C6C5D00261CFB /* User.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 23A4CE391C7C6C5600261CFB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 23A4CE511C7C6C7D00261CFB /* ConfigurationTests.swift in Sources */, + 23A4CE521C7C6C7D00261CFB /* KeysTests.swift in Sources */, + 23A4CE531C7C6C7D00261CFB /* TestHelper.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -295,6 +677,16 @@ target = 233A0B021C0EF8E900072A58 /* TanukiKit */; targetProxy = 233A0B0F1C0EF8E900072A58 /* PBXContainerItemProxy */; }; + 23A4CE1B1C7C6BF700261CFB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 23A4CE0E1C7C6BF700261CFB /* TanukiKit tvOS */; + targetProxy = 23A4CE1A1C7C6BF700261CFB /* PBXContainerItemProxy */; + }; + 23A4CE401C7C6C5600261CFB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 23A4CE331C7C6C5600261CFB /* TanukiKit Mac */; + targetProxy = 23A4CE3F1C7C6C5600261CFB /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -338,6 +730,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = com.nerdishbynature.TanukiKit; + PRODUCT_NAME = TanukiKit; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -379,6 +773,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_BUNDLE_IDENTIFIER = com.nerdishbynature.TanukiKit; + PRODUCT_NAME = TanukiKit; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -402,8 +798,6 @@ INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.nerdishbynature.TanukiKit; - PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -424,8 +818,6 @@ INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = com.nerdishbynature.TanukiKit; - PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; name = Release; @@ -461,6 +853,206 @@ }; name = Release; }; + 23A4CE011C7C6BD700261CFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/watchOS", + ); + INFOPLIST_FILE = "TanukiKit watchOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.1; + }; + name = Debug; + }; + 23A4CE021C7C6BD700261CFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/watchOS", + ); + INFOPLIST_FILE = "TanukiKit watchOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + SDKROOT = watchos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 4; + WATCHOS_DEPLOYMENT_TARGET = 2.1; + }; + name = Release; + }; + 23A4CE211C7C6BF700261CFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/tvOS", + ); + INFOPLIST_FILE = "TanukiKit tvOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.1; + }; + name = Debug; + }; + 23A4CE221C7C6BF700261CFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/tvOS", + ); + INFOPLIST_FILE = "TanukiKit tvOS/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + SDKROOT = appletvos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = 3; + TVOS_DEPLOYMENT_TARGET = 9.1; + }; + name = Release; + }; + 23A4CE241C7C6BF700261CFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/tvOS", + ); + INFOPLIST_FILE = "TanukiKit tvOSTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-tvOSTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + TVOS_DEPLOYMENT_TARGET = 9.1; + }; + name = Debug; + }; + 23A4CE251C7C6BF700261CFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/tvOS", + ); + INFOPLIST_FILE = "TanukiKit tvOSTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-tvOSTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = appletvos; + TVOS_DEPLOYMENT_TARGET = 9.1; + }; + name = Release; + }; + 23A4CE461C7C6C5600261CFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "TanukiKit Mac/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 23A4CE471C7C6C5600261CFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); + FRAMEWORK_VERSION = A; + INFOPLIST_FILE = "TanukiKit Mac/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + SDKROOT = macosx; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 23A4CE491C7C6C5600261CFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); + INFOPLIST_FILE = "TanukiKit MacTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-MacTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Debug; + }; + 23A4CE4A1C7C6C5600261CFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_IDENTITY = "-"; + COMBINE_HIDPI_IMAGES = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/Mac", + ); + INFOPLIST_FILE = "TanukiKit MacTests/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.11; + PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-MacTests"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -491,6 +1083,46 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 23A4CE031C7C6BD700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit watchOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 23A4CE011C7C6BD700261CFB /* Debug */, + 23A4CE021C7C6BD700261CFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 23A4CE201C7C6BF700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit tvOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 23A4CE211C7C6BF700261CFB /* Debug */, + 23A4CE221C7C6BF700261CFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 23A4CE231C7C6BF700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit tvOSTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 23A4CE241C7C6BF700261CFB /* Debug */, + 23A4CE251C7C6BF700261CFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 23A4CE451C7C6C5600261CFB /* Build configuration list for PBXNativeTarget "TanukiKit Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 23A4CE461C7C6C5600261CFB /* Debug */, + 23A4CE471C7C6C5600261CFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + 23A4CE481C7C6C5600261CFB /* Build configuration list for PBXNativeTarget "TanukiKit MacTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 23A4CE491C7C6C5600261CFB /* Debug */, + 23A4CE4A1C7C6C5600261CFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; /* End XCConfigurationList section */ }; rootObject = 233A0AFA1C0EF8E900072A58 /* Project object */; diff --git a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme new file mode 100644 index 0000000..39d16d5 --- /dev/null +++ b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit tvOS.xcscheme b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit tvOS.xcscheme new file mode 100644 index 0000000..ff9c236 --- /dev/null +++ b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit tvOS.xcscheme @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit watchOS.xcscheme b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit watchOS.xcscheme new file mode 100644 index 0000000..96593b3 --- /dev/null +++ b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit watchOS.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/TanukiKit/Keys.swift b/TanukiKit/Keys.swift index 9f19c68..b2454e9 100644 --- a/TanukiKit/Keys.swift +++ b/TanukiKit/Keys.swift @@ -54,11 +54,4 @@ enum PublicKeyRouter: Router { return ["title": title, "key": publicKey] } } - - var URLRequest: NSURLRequest? { - switch self { - case .PostPublicKey(_, _, _): - return request() - } - } } diff --git a/TanukiKit/Repositories.swift b/TanukiKit/Repositories.swift index 3267aa5..15d7690 100644 --- a/TanukiKit/Repositories.swift +++ b/TanukiKit/Repositories.swift @@ -83,11 +83,4 @@ enum RepositoryRouter: Router { return "/projects" } } - - var URLRequest: NSURLRequest? { - switch self { - case .ReadAuthenticatedRepositories(_, _, _): - return request() - } - } } diff --git a/TanukiKit/User.swift b/TanukiKit/User.swift index 6ac19a3..119a3d1 100644 --- a/TanukiKit/User.swift +++ b/TanukiKit/User.swift @@ -76,11 +76,4 @@ enum UserRouter: Router { var params: [String: String] { return [:] } - - var URLRequest: NSURLRequest? { - switch self { - case .ReadAuthenticatedUser(_): - return request() - } - } } diff --git a/TanukiKitTests/ConfigurationTests.swift b/TanukiKitTests/ConfigurationTests.swift index 4b161a5..386a23f 100644 --- a/TanukiKitTests/ConfigurationTests.swift +++ b/TanukiKitTests/ConfigurationTests.swift @@ -1,6 +1,6 @@ import XCTest import Foundation -@testable import TanukiKit +import TanukiKit import Nocilla private let enterpriseURL = "https://gitlab.example.com/api/v3" @@ -50,23 +50,6 @@ class ConfigurationTests: XCTestCase { XCTAssertEqual(subject.apiEndpoint, enterpriseURL) } - func testAuthorizeURLRequest() { - let config = OAuthConfiguration(token: "12345", secret: "6789", redirectURI: "https://oauth.example.com/gitlab_oauth") - let request = OAuthRouter.Authorize(config, "https://oauth.example.com/gitlab_oauth").URLRequest - let expected = NSURL(string: "https://gitlab.com/oauth/authorize?client_id=12345&redirect_uri=https%3A//oauth.example.com/gitlab_oauth&response_type=code")! - XCTAssertEqual(request?.URL, expected) - } - - func testAccessTokenURLRequest() { - let config = OAuthConfiguration(token: "12345", secret: "6789", redirectURI: "https://oauth.example.com/gitlab_oauth") - let request = OAuthRouter.AccessToken(config, "dhfjgh23493", "https://oauth.example.com/gitlab_oauth").URLRequest - let expected = NSURL(string: "https://gitlab.com/oauth/token")! - let expectedBody = "client_id=12345&client_secret=6789&code=dhfjgh23493&grant_type=authorization_code&redirect_uri=https%3A//oauth.example.com/gitlab_oauth" - XCTAssertEqual(request?.URL, expected) - let string = NSString(data: request!.HTTPBody!, encoding: NSUTF8StringEncoding)! - XCTAssertEqual(string as String, expectedBody) - } - func testHandleOpenURL() { let config = OAuthConfiguration(token: "12345", secret: "6789", redirectURI: "https://oauth.example.com/gitlab_oauth") let json = "{\"access_token\": \"017ec60f4a182\", \"token_type\": \"bearer\"}" @@ -81,11 +64,4 @@ class ConfigurationTests: XCTestCase { XCTAssertNil(error, "\(error)") }) } - - func testURLRequestWithPrivateTokenConfiguration() { - let config = PrivateTokenConfiguration("12345_678", url: "https://gitlab.example.com/api/v3") - let request = UserRouter.ReadAuthenticatedUser(config).URLRequest - let expected = NSURL(string: "https://gitlab.example.com/api/v3/user?private_token=12345_678")! - XCTAssertEqual(request?.URL, expected) - } } diff --git a/TanukiKitTests/KeysTests.swift b/TanukiKitTests/KeysTests.swift index 6c01246..a0f0944 100644 --- a/TanukiKitTests/KeysTests.swift +++ b/TanukiKitTests/KeysTests.swift @@ -1,5 +1,5 @@ import XCTest -@testable import TanukiKit +import TanukiKit import Nocilla class PublicKeyTests: XCTestCase { @@ -14,14 +14,6 @@ class PublicKeyTests: XCTestCase { LSNocilla.sharedInstance().stop() } - // MARK: URLRequest Tests - - func testPostPublicKeyURLRequest() { - let kit = TanukiKit(TokenConfiguration("12345")) - let request = PublicKeyRouter.PostPublicKey("test-key", "test title", kit.configuration).URLRequest - XCTAssertEqual(request?.URL, NSURL(string: "https://gitlab.com/api/v3/user/keys")!) - } - // MARK: Actual Request tests func testPostPublicKey() { From 8e1e4a1da8fc77dd3eb56d37e96c0a6929db759c Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Tue, 23 Feb 2016 18:45:53 +0800 Subject: [PATCH 2/9] Use fastlane to run tests --- .travis.yml | 32 +++- Gemfile | 4 +- Gemfile.lock | 281 +++++++++++++++++++++++++++++++++--- Makefile | 11 +- fastlane/.env | 4 + fastlane/.env.default | 15 ++ fastlane/.env.deploy | 14 ++ fastlane/.env.ios92 | 2 + fastlane/.env.ios93_xcode73 | 3 + fastlane/.env.osx | 6 + fastlane/.env.tvos91 | 6 + fastlane/Fastfile | 4 + 12 files changed, 352 insertions(+), 30 deletions(-) create mode 100644 fastlane/.env create mode 100644 fastlane/.env.default create mode 100644 fastlane/.env.deploy create mode 100644 fastlane/.env.ios92 create mode 100644 fastlane/.env.ios93_xcode73 create mode 100644 fastlane/.env.osx create mode 100644 fastlane/.env.tvos91 create mode 100644 fastlane/Fastfile diff --git a/.travis.yml b/.travis.yml index 51c9357..17a4dbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,30 @@ -osx_image: xcode7.1 language: objective-c +osx_image: xcode7.1 +sudo: false +env: + global: + - LC_CTYPE=en_US.UTF-8 + - LANG=en_US.UTF-8 + - FASTLANE_LANE=ci_commit +matrix: + include: + - osx_image: xcode7.2 + env: FASTLANE_LANE=code_coverage FASTLANE_ENV=default + - osx_image: xcode7.2 + env: FASTLANE_ENV=ios92 + - osx_image: xcode7.2 + env: FASTLANE_ENV=tvos91 + - osx_image: xcode7.2 + env: FASTLANE_ENV=osx + - osx_image: xcode7.3 + env: FASTLANE_ENV=ios93_xcode73 before_install: - - make install + - make install script: - - make test + - set -o pipefail + - bundle exec fastlane $FASTLANE_LANE configuration:Debug --env $FASTLANE_ENV + - bundle exec fastlane $FASTLANE_LANE configuration:Release --env $FASTLANE_ENV after_success: - - make post_coverage -notifications: - email: false + - if [ "$FASTLANE_LANE" == "code_coverage" ]; then + make post_coverage; + fi diff --git a/Gemfile b/Gemfile index 665536c..ef43960 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,5 @@ source "https://rubygems.org" -gem "slather", git: "https://github.com/nerdishbynature/slather.git", branch: "feature-profdata" +gem "slather", "~> 2.0" +gem "fastlane" +gem "cocoapods" diff --git a/Gemfile.lock b/Gemfile.lock index ca2dea4..4bf68f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,289 @@ -GIT - remote: https://github.com/nerdishbynature/slather.git - revision: fd90e5e76e2a6422a9c4a4d43d0104529659f3b3 - branch: feature-profdata - specs: - slather (1.8.1) - clamp (~> 0.6) - nokogiri (~> 1.6.3) - xcodeproj (~> 0.26.2) - GEM remote: https://rubygems.org/ specs: - activesupport (4.2.5) + activesupport (4.2.5.1) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + addressable (2.3.8) + babosa (1.0.2) + cert (1.3.0) + fastlane_core (>= 0.29.1, < 1.0.0) + spaceship (>= 0.16.0, < 1.0.0) claide (0.9.1) clamp (0.6.5) + cocoapods (0.39.0) + activesupport (>= 4.0.2) + claide (~> 0.9.1) + cocoapods-core (= 0.39.0) + cocoapods-downloader (~> 0.9.3) + cocoapods-plugins (~> 0.4.2) + cocoapods-search (~> 0.1.0) + cocoapods-stats (~> 0.6.2) + cocoapods-trunk (~> 0.6.4) + cocoapods-try (~> 0.5.1) + colored (~> 1.2) + escape (~> 0.0.4) + molinillo (~> 0.4.0) + nap (~> 1.0) + xcodeproj (~> 0.28.2) + cocoapods-core (0.39.0) + activesupport (>= 4.0.2) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-downloader (0.9.3) + cocoapods-plugins (0.4.2) + nap + cocoapods-search (0.1.0) + cocoapods-stats (0.6.2) + cocoapods-trunk (0.6.4) + nap (>= 0.8, < 2.0) + netrc (= 0.7.8) + cocoapods-try (0.5.1) + coderay (1.1.1) colored (1.2) + commander (4.3.5) + highline (~> 1.7.2) + credentials_manager (0.15.0) + colored + commander (>= 4.3.5) + highline (>= 1.7.1) + security + deliver (1.10.3) + credentials_manager (>= 0.12.0, < 1.0.0) + fastimage (~> 1.6) + fastlane_core (>= 0.36.4, < 1.0.0) + plist (~> 3.1.0) + spaceship (>= 0.19.0, <= 1.0.0) + domain_name (0.5.20160128) + unf (>= 0.0.5, < 1.0.0) + dotenv (2.1.0) + escape (0.0.4) + excon (0.45.4) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + fastimage (1.6.8) + addressable (~> 2.3, >= 2.3.5) + fastlane (1.61.0) + addressable (~> 2.3.8) + cert (>= 1.3.0, < 2.0.0) + credentials_manager (>= 0.15.0, < 1.0.0) + deliver (>= 1.10.1, < 2.0.0) + fastlane_core (>= 0.36.5, < 1.0.0) + frameit (>= 2.4.1, < 3.0.0) + gym (>= 1.6.1, < 2.0.0) + krausefx-shenzhen (>= 0.14.7) + match (>= 0.3.0, < 1.0.0) + pem (>= 1.2.0, < 2.0.0) + pilot (>= 1.3.0, < 2.0.0) + plist (~> 3.1.0) + produce (>= 1.1.0, < 2.0.0) + scan (>= 0.5.0, < 1.0.0) + screengrab (>= 0.2.0, < 1.0.0) + sigh (>= 1.3.1, < 2.0.0) + slack-notifier (~> 1.3) + snapshot (>= 1.7.0, < 2.0.0) + spaceship (>= 0.19.4, < 1.0.0) + supply (>= 0.4.0, < 1.0.0) + terminal-notifier (~> 1.6.2) + terminal-table (~> 1.4.5) + xcodeproj (>= 0.20, < 1.0.0) + xcpretty (>= 0.2.1) + fastlane_core (0.36.6) + babosa + colored + commander (= 4.3.5) + credentials_manager (>= 0.11.0, < 1.0.0) + excon (~> 0.45.0) + highline (>= 1.7.2) + json + multi_json + plist (~> 3.1) + rubyzip (~> 1.1.6) + sentry-raven (~> 0.15) + terminal-table (~> 1.4.5) + frameit (2.4.1) + deliver (> 0.3) + fastimage (~> 1.6.3) + fastlane_core (>= 0.16.0, < 1.0.0) + mini_magick (~> 4.0.2) + fuzzy_match (2.0.4) + google-api-client (0.9.2) + activesupport (>= 3.2) + addressable (~> 2.3) + googleauth (~> 0.5) + httpclient (~> 2.7) + hurley (~> 0.1) + memoist (~> 0.11) + mime-types (>= 1.6) + multi_json (~> 1.11) + representable (~> 2.3.0) + retriable (~> 2.0) + thor (~> 0.19) + googleauth (0.5.1) + faraday (~> 0.9) + jwt (~> 1.4) + logging (~> 2.0) + memoist (~> 0.12) + multi_json (~> 1.11) + os (~> 0.9) + signet (~> 0.7) + gym (1.6.1) + fastlane_core (>= 0.36.1, < 1.0.0) + plist + rubyzip (>= 1.1.7) + terminal-table + xcpretty (>= 0.2.1) + highline (1.7.8) + http-cookie (1.0.2) + domain_name (~> 0.5) + httpclient (2.7.1) + hurley (0.2) i18n (0.7.0) json (1.8.3) - mini_portile (0.6.2) - minitest (5.8.3) - nokogiri (1.6.6.4) - mini_portile (~> 0.6.0) + jwt (1.5.2) + krausefx-shenzhen (0.14.7) + commander (~> 4.3) + dotenv (>= 0.7) + faraday (~> 0.9) + faraday_middleware (~> 0.9) + highline (>= 1.7.2) + json (~> 1.8) + net-sftp (~> 2.1.2) + plist (~> 3.1.0) + rubyzip (~> 1.1) + security (~> 0.1.3) + terminal-table (~> 1.4.5) + little-plugger (1.1.4) + logging (2.0.0) + little-plugger (~> 1.1) + multi_json (~> 1.10) + match (0.3.0) + cert (>= 1.2.8, < 2.0.0) + credentials_manager (>= 0.13.0, < 1.0.0) + fastlane_core (>= 0.36.1, < 1.0.0) + security + sigh (>= 1.2.2, < 2.0.0) + spaceship (>= 0.18.1, < 1.0.0) + memoist (0.14.0) + method_source (0.8.2) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2015.1120) + mini_magick (4.0.4) + mini_portile2 (2.0.0) + minitest (5.8.4) + molinillo (0.4.3) + multi_json (1.11.2) + multi_xml (0.5.5) + multipart-post (2.0.0) + nap (1.1.0) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (3.0.2) + netrc (0.7.8) + nokogiri (1.6.7.2) + mini_portile2 (~> 2.0.0.rc2) + os (0.9.6) + pem (1.2.0) + fastlane_core (>= 0.36.1, < 1.0.0) + spaceship (>= 0.19.3, < 1.0.0) + pilot (1.4.1) + credentials_manager (>= 0.3.0) + fastlane_core (>= 0.36.5, < 1.0.0) + spaceship (>= 0.20.0, < 1.0.0) + terminal-table (~> 1.4.5) + plist (3.1.0) + produce (1.1.1) + fastlane_core (>= 0.30.0, < 1.0.0) + spaceship (>= 0.16.0) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + representable (2.3.0) + uber (~> 0.0.7) + retriable (2.1.0) + rouge (1.10.1) + rubyzip (1.1.7) + scan (0.5.0) + fastlane_core (>= 0.36.1, < 1.0.0) + slack-notifier (~> 1.3) + terminal-table + xcpretty (>= 0.2.1) + xcpretty-travis-formatter (>= 0.0.3) + screengrab (0.2.0) + fastlane_core (>= 0.36.1, < 1.0.0) + security (0.1.3) + sentry-raven (0.15.5) + faraday (>= 0.7.6) + sigh (1.3.1) + fastlane_core (>= 0.36.1, < 1.0.0) + plist (~> 3.1) + spaceship (>= 0.12.3) + signet (0.7.2) + addressable (~> 2.3) + faraday (~> 0.9) + jwt (~> 1.5) + multi_json (~> 1.10) + slack-notifier (1.5.1) + slather (2.0.0) + clamp (~> 0.6) + nokogiri (~> 1.6.3) + xcodeproj (>= 0.28.2, < 1.1.0) + slop (3.6.0) + snapshot (1.8.0) + fastimage (~> 1.6.3) + fastlane_core (>= 0.36.1, < 1.0.0) + plist (~> 3.1.0) + xcpretty (>= 0.2.1) + spaceship (0.21.0) + colored + credentials_manager (>= 0.9.0) + faraday (~> 0.9) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 0.9) + fastimage (~> 1.6) + multi_xml (~> 0.5) + plist (~> 3.1) + pry + supply (0.4.0) + credentials_manager (>= 0.15.0) + fastlane_core (>= 0.35.0) + google-api-client (~> 0.9.1) + terminal-notifier (1.6.3) + terminal-table (1.4.5) + thor (0.19.1) thread_safe (0.3.5) tzinfo (1.2.2) thread_safe (~> 0.1) - xcodeproj (0.26.3) + uber (0.0.15) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.2) + xcodeproj (0.28.2) activesupport (>= 3) claide (~> 0.9.1) colored (~> 1.2) + xcpretty (0.2.2) + rouge (~> 1.8) + xcpretty-travis-formatter (0.0.4) + xcpretty (~> 0.2, >= 0.0.7) PLATFORMS ruby DEPENDENCIES - slather! + cocoapods + fastlane + slather (~> 2.0) BUNDLED WITH - 1.10.6 + 1.11.2 diff --git a/Makefile b/Makefile index 17032de..f665b61 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ +SHA=$(shell git rev-parse HEAD) +BRANCH=$(shell git name-rev --name-only HEAD) + install: - brew update || brew update brew install carthage - brew install python - pip install codecov carthage bootstrap test: - set -o pipefail && xcodebuild clean test -scheme TanukiKit -sdk iphonesimulator -destination name="iPhone 6" ONLY_ACTIVE_ARCH=YES -enableCodeCoverage YES | xcpretty -c + bundle exec fastlane code_coverage configuration:Debug --env default post_coverage: bundle exec slather coverage --input-format profdata -x --ignore "../**/*/Xcode*" --ignore "Carthage/**" --output-directory slather-report --scheme TanukiKit TanukiKit.xcodeproj - codecov -f slather-report/cobertura.xml + curl -X POST -d @slather-report/cobertura.xml "https://codecov.io/upload/v2?token="$(CODECOV_TOKEN)"&commit="$(SHA)"&branch="$(BRANCH)"&job="$(TRAVIS_BUILD_NUMBER) + diff --git a/fastlane/.env b/fastlane/.env new file mode 100644 index 0000000..01aa64e --- /dev/null +++ b/fastlane/.env @@ -0,0 +1,4 @@ +AF_IOS_FRAMEWORK_SCHEME="TanukiKit" +AF_TVOS_FRAMEWORK_SCHEME="TanukiKit tvOS" +AF_OSX_FRAMEWORK_SCHEME="TanukiKit Mac" + diff --git a/fastlane/.env.default b/fastlane/.env.default new file mode 100644 index 0000000..240bac1 --- /dev/null +++ b/fastlane/.env.default @@ -0,0 +1,15 @@ +AF_IOS_SDK=iphonesimulator9.2 +AF_MAC_SDK=macosx10.11 +AF_TVOS_SDK=appletvsimulator9.1 + +AF_CONFIGURATION=Release + +SCAN_SCHEME=$AF_IOS_FRAMEWORK_SCHEME +SCAN_DESTINATION="OS=9.2,name=iPhone 6s" +SCAN_SDK=$AF_IOS_SDK +SCAN_OUTPUT_DIRECTORY=fastlane/test-output +DEPLOY_PODSPEC=TanukiKit.podspec + +EXAMPLE_WORKSPACE=$AF_WORKSPACE +EXAMPLE_SCHEME=$AF_IOS_EXAMPLE_SCHEME +EXAMPLE_DESTINATION=$SCAN_DESTINATION diff --git a/fastlane/.env.deploy b/fastlane/.env.deploy new file mode 100644 index 0000000..e49bd39 --- /dev/null +++ b/fastlane/.env.deploy @@ -0,0 +1,14 @@ +DEPLOY_BRANCH=master +DEPLOY_PLIST_PATH=Framework/Info.plist +DEPLOY_PODSPEC=TanukiKit.podspec +DEPLOY_REMOTE=origin + +DEPLOY_CHANGELOG_PATH=CHANGELOG.md +DEPLOY_CHANGELOG_DELIMITER=--- + +# Used for CHANGELOG Generation and Github Release Management +GITHUB_OWNER=nerdishbynature +GITHUB_REPOSITORY=TanukiKit +# CI Should Provide GITHUB_API_TOKEN + +CARTHAGE_FRAMEWORK_NAME=TanukiKit diff --git a/fastlane/.env.ios92 b/fastlane/.env.ios92 new file mode 100644 index 0000000..67e5e82 --- /dev/null +++ b/fastlane/.env.ios92 @@ -0,0 +1,2 @@ +SCAN_DESTINATION="OS=9.2,name=iPhone 6s" +EXAMPLE_DESTINATION=$SCAN_DESTINATION \ No newline at end of file diff --git a/fastlane/.env.ios93_xcode73 b/fastlane/.env.ios93_xcode73 new file mode 100644 index 0000000..b0516eb --- /dev/null +++ b/fastlane/.env.ios93_xcode73 @@ -0,0 +1,3 @@ +SCAN_DESTINATION="OS=9.3,name=iPhone 6s" +EXAMPLE_DESTINATION=$SCAN_DESTINATION +SCAN_SDK=iphonesimulator9.3 \ No newline at end of file diff --git a/fastlane/.env.osx b/fastlane/.env.osx new file mode 100644 index 0000000..d56e363 --- /dev/null +++ b/fastlane/.env.osx @@ -0,0 +1,6 @@ +SCAN_SCHEME=$AF_OSX_FRAMEWORK_SCHEME +SCAN_DESTINATION="arch=x86_64" +SCAN_SDK=$AF_OSX_SDK + +EXAMPLE_SCHEME=$AF_OSX_EXAMPLE_SCHEME +EXAMPLE_DESTINATION=$SCAN_DESTINATION \ No newline at end of file diff --git a/fastlane/.env.tvos91 b/fastlane/.env.tvos91 new file mode 100644 index 0000000..54cd02b --- /dev/null +++ b/fastlane/.env.tvos91 @@ -0,0 +1,6 @@ +SCAN_SCHEME=$AF_TVOS_FRAMEWORK_SCHEME +SCAN_DESTINATION="OS=9.1,name=Apple TV 1080p" +SCAN_SDK=$AF_TVOS_SDK + +EXAMPLE_SCHEME=$AF_TVOS_EXAMPLE_SCHEME +EXAMPLE_DESTINATION=$SCAN_DESTINATION \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 0000000..3e15f29 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,4 @@ +import_from_git( + url: 'https://github.com/nerdishbynature/requestkit_fastlane.git', + branch: 'master' +) From 1bde337da1b484601ff66b1aab9d691a42377956 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Tue, 23 Feb 2016 18:46:02 +0800 Subject: [PATCH 3/9] Use all-platforms branch --- Cartfile | 2 +- Cartfile.private | 2 +- Cartfile.resolved | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cartfile b/Cartfile index f80aaa5..ea52812 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "nerdishbynature/RequestKit" == 0.2.1 +github "nerdishbynature/RequestKit" "all-platforms" diff --git a/Cartfile.private b/Cartfile.private index 522666f..ab9c05b 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1,2 +1,2 @@ -github "nerdishbynature/Nocilla" +github "nerdishbynature/Nocilla" "all-platforms" diff --git a/Cartfile.resolved b/Cartfile.resolved index c9bfbb7..eb8e15d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ -github "nerdishbynature/Nocilla" "0.10.0" -github "nerdishbynature/RequestKit" "0.2.1" +github "nerdishbynature/Nocilla" "57161f3454bebebf111e3e3b2a0b9cb300e2d0ac" +github "nerdishbynature/RequestKit" "928682d476221bf60705257f9d220836017baa65" From 8fb40e01e8e09365772ddab41a234d5d9bf08b66 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Tue, 23 Feb 2016 18:49:31 +0800 Subject: [PATCH 4/9] Add podspec --- TanukiKit.podspec | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 TanukiKit.podspec diff --git a/TanukiKit.podspec b/TanukiKit.podspec new file mode 100644 index 0000000..68a9714 --- /dev/null +++ b/TanukiKit.podspec @@ -0,0 +1,22 @@ +Pod::Spec.new do |s| + s.name = "TanukiKit" + s.version = "0.5.1" + s.summary = "A Swift API Client for GitLab CE/EE" + s.description = <<-DESC + You are looking at the A Swift API Client for GitLabe CE/EE. + This is very unofficial and not maintained by GitLab. + DESC + s.homepage = "https://github.com/nerdishbynature/tanukikit" + s.license = { :type => "MIT", :file => "LICENSE" } + s.author = { "Piet Brauer" => "piet@nerdishbynature.com" } + s.source = { :git => "https://github.com/nerdishbynature/tanukikit.git", :tag => s.version.to_s } + s.social_media_url = "https://twitter.com/pietbrauer" + s.module_name = "TanukiKit" + s.dependency "NBNRequestKit", "~> 0.2.1" + s.requires_arc = true + s.source_files = "TanukiKit/*.swift" + s.ios.deployment_target = '8.0' + s.osx.deployment_target = '10.10' + s.watchos.deployment_target = '2.0' + s.tvos.deployment_target = '9.0' +end From 845cdb0855373c4a5438923a4db0fe5dbbc84e5e Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Tue, 23 Feb 2016 18:53:35 +0800 Subject: [PATCH 5/9] Fix plists --- TanukiKit.xcodeproj/project.pbxproj | 22 +++++++++++----------- TanukiKit/TanukiKit.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/TanukiKit.xcodeproj/project.pbxproj b/TanukiKit.xcodeproj/project.pbxproj index 2223445..e0ebad2 100644 --- a/TanukiKit.xcodeproj/project.pbxproj +++ b/TanukiKit.xcodeproj/project.pbxproj @@ -120,7 +120,7 @@ isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = ""; - dstSubfolderSpec = 7; + dstSubfolderSpec = 10; files = ( 23A4CE6A1C7C6E8C00261CFB /* Nocilla.framework in Carthage embed */, 23A4CE6B1C7C6E8F00261CFB /* RequestKit.framework in Carthage embed */, @@ -865,7 +865,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", ); - INFOPLIST_FILE = "TanukiKit watchOS/Info.plist"; + INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; SDKROOT = watchos; @@ -887,7 +887,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/watchOS", ); - INFOPLIST_FILE = "TanukiKit watchOS/Info.plist"; + INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; SDKROOT = watchos; @@ -908,7 +908,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", ); - INFOPLIST_FILE = "TanukiKit tvOS/Info.plist"; + INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; SDKROOT = appletvos; @@ -929,7 +929,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", ); - INFOPLIST_FILE = "TanukiKit tvOS/Info.plist"; + INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; SDKROOT = appletvos; @@ -946,7 +946,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", ); - INFOPLIST_FILE = "TanukiKit tvOSTests/Info.plist"; + INFOPLIST_FILE = TanukiKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -962,7 +962,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/tvOS", ); - INFOPLIST_FILE = "TanukiKit tvOSTests/Info.plist"; + INFOPLIST_FILE = TanukiKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -985,7 +985,7 @@ "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "TanukiKit Mac/Info.plist"; + INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -1008,7 +1008,7 @@ "$(PROJECT_DIR)/Carthage/Build/Mac", ); FRAMEWORK_VERSION = A; - INFOPLIST_FILE = "TanukiKit Mac/Info.plist"; + INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -1026,7 +1026,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/Mac", ); - INFOPLIST_FILE = "TanukiKit MacTests/Info.plist"; + INFOPLIST_FILE = TanukiKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-MacTests"; @@ -1044,7 +1044,7 @@ "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/Mac", ); - INFOPLIST_FILE = "TanukiKit MacTests/Info.plist"; + INFOPLIST_FILE = TanukiKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = "com.nerdishbynature.TanukiKit-MacTests"; diff --git a/TanukiKit/TanukiKit.h b/TanukiKit/TanukiKit.h index bd55490..fb91362 100644 --- a/TanukiKit/TanukiKit.h +++ b/TanukiKit/TanukiKit.h @@ -1,4 +1,4 @@ -#import +#import //! Project version number for TanukiKit. FOUNDATION_EXPORT double TanukiKitVersionNumber; From 23b2f73c4eccb2a7a2020c3951be712318f64c32 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 25 Feb 2016 11:11:15 +0800 Subject: [PATCH 6/9] Update RequestKit dependency --- Cartfile | 2 +- Cartfile.resolved | 2 +- TanukiKit.podspec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cartfile b/Cartfile index ea52812..1676ef8 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "nerdishbynature/RequestKit" "all-platforms" +github "nerdishbynature/RequestKit" ~> 0.2.2 diff --git a/Cartfile.resolved b/Cartfile.resolved index eb8e15d..f253b41 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,2 +1,2 @@ github "nerdishbynature/Nocilla" "57161f3454bebebf111e3e3b2a0b9cb300e2d0ac" -github "nerdishbynature/RequestKit" "928682d476221bf60705257f9d220836017baa65" +github "nerdishbynature/RequestKit" "0.2.2" diff --git a/TanukiKit.podspec b/TanukiKit.podspec index 68a9714..ed20655 100644 --- a/TanukiKit.podspec +++ b/TanukiKit.podspec @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.source = { :git => "https://github.com/nerdishbynature/tanukikit.git", :tag => s.version.to_s } s.social_media_url = "https://twitter.com/pietbrauer" s.module_name = "TanukiKit" - s.dependency "NBNRequestKit", "~> 0.2.1" + s.dependency "NBNRequestKit", "~> 0.2.2" s.requires_arc = true s.source_files = "TanukiKit/*.swift" s.ios.deployment_target = '8.0' From 0e81ee10b1930b0386182da046d9d48ad1e58c3e Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 25 Feb 2016 11:11:38 +0800 Subject: [PATCH 7/9] Set correct deployment targets --- TanukiKit.xcodeproj/project.pbxproj | 13 +++++++++---- .../xcshareddata/xcschemes/TanukiKit Mac.xcscheme | 8 ++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/TanukiKit.xcodeproj/project.pbxproj b/TanukiKit.xcodeproj/project.pbxproj index e0ebad2..7dd6c59 100644 --- a/TanukiKit.xcodeproj/project.pbxproj +++ b/TanukiKit.xcodeproj/project.pbxproj @@ -914,7 +914,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Debug; }; @@ -935,7 +935,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.1; + TVOS_DEPLOYMENT_TARGET = 9.0; }; name = Release; }; @@ -988,7 +988,7 @@ INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; SKIP_INSTALL = YES; }; @@ -1011,7 +1011,7 @@ INFOPLIST_FILE = TanukiKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.10; SDKROOT = macosx; SKIP_INSTALL = YES; }; @@ -1090,6 +1090,7 @@ 23A4CE021C7C6BD700261CFB /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 23A4CE201C7C6BF700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit tvOS" */ = { isa = XCConfigurationList; @@ -1098,6 +1099,7 @@ 23A4CE221C7C6BF700261CFB /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 23A4CE231C7C6BF700261CFB /* Build configuration list for PBXNativeTarget "TanukiKit tvOSTests" */ = { isa = XCConfigurationList; @@ -1106,6 +1108,7 @@ 23A4CE251C7C6BF700261CFB /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 23A4CE451C7C6C5600261CFB /* Build configuration list for PBXNativeTarget "TanukiKit Mac" */ = { isa = XCConfigurationList; @@ -1114,6 +1117,7 @@ 23A4CE471C7C6C5600261CFB /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 23A4CE481C7C6C5600261CFB /* Build configuration list for PBXNativeTarget "TanukiKit MacTests" */ = { isa = XCConfigurationList; @@ -1122,6 +1126,7 @@ 23A4CE4A1C7C6C5600261CFB /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme index 39d16d5..077e7b4 100644 --- a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme +++ b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit Mac.xcscheme @@ -15,7 +15,7 @@ @@ -43,7 +43,7 @@ @@ -65,7 +65,7 @@ @@ -83,7 +83,7 @@ From ed7c69b6bb7359096028d83880d9c7121038b3da Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 25 Feb 2016 11:48:51 +0800 Subject: [PATCH 8/9] Remove iOS 9.3 Xcode 7.3 tests --- .travis.yml | 2 -- fastlane/.env.ios93_xcode73 | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 fastlane/.env.ios93_xcode73 diff --git a/.travis.yml b/.travis.yml index 17a4dbb..d8b8431 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,6 @@ matrix: env: FASTLANE_ENV=tvos91 - osx_image: xcode7.2 env: FASTLANE_ENV=osx - - osx_image: xcode7.3 - env: FASTLANE_ENV=ios93_xcode73 before_install: - make install script: diff --git a/fastlane/.env.ios93_xcode73 b/fastlane/.env.ios93_xcode73 deleted file mode 100644 index b0516eb..0000000 --- a/fastlane/.env.ios93_xcode73 +++ /dev/null @@ -1,3 +0,0 @@ -SCAN_DESTINATION="OS=9.3,name=iPhone 6s" -EXAMPLE_DESTINATION=$SCAN_DESTINATION -SCAN_SDK=iphonesimulator9.3 \ No newline at end of file From ba64daec651a57aba6a24f97043b99752691be65 Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Thu, 25 Feb 2016 13:48:55 +0800 Subject: [PATCH 9/9] Generate coverage reports --- TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit.xcscheme | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit.xcscheme b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit.xcscheme index db808cd..313f065 100644 --- a/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit.xcscheme +++ b/TanukiKit.xcodeproj/xcshareddata/xcschemes/TanukiKit.xcscheme @@ -26,7 +26,8 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> + shouldUseLaunchSchemeArgsEnv = "YES" + codeCoverageEnabled = "YES">