From 786c46e004a922a34d9f608d928f64cc78c31d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boris=20Bu=CC=88gling?= Date: Sun, 6 Dec 2015 01:48:27 +0100 Subject: [PATCH] Support for Swift Package Manager --- .gitignore | 3 +- .swift-version | 1 + .../Fixtures/directory/child => Package.swift | 0 PathKit.podspec | 2 +- PathKit.xcodeproj/project.pbxproj | 14 +- Pods/Pods.xcodeproj/project.pbxproj | 154 +++++++++--------- {PathKit => Sources}/Info.plist | 0 {PathKit => Sources}/PathKit.h | 0 {PathKit => Sources}/PathKit.swift | 2 +- .../Fixtures/directory}/child | 0 .../Fixtures/directory/subdirectory/child | 0 .../deletable => Tests/Fixtures/file | 0 .../Fixtures/permissions/deletable | 0 .../Fixtures/permissions/executable | 0 .../Fixtures/permissions/readable | 0 Tests/Fixtures/permissions/writable | 0 .../Fixtures/symlinks/directory | 0 .../Fixtures/symlinks/file | 0 .../Fixtures/symlinks/same-dir | 0 .../Fixtures/symlinks/swift | 0 {PathKitTests => Tests}/Info.plist | 0 .../ManipulationTests.swift | 0 {PathKitTests => Tests}/PathKitTests.swift | 0 23 files changed, 90 insertions(+), 86 deletions(-) create mode 100644 .swift-version rename PathKitTests/Fixtures/directory/child => Package.swift (100%) rename {PathKit => Sources}/Info.plist (100%) rename {PathKit => Sources}/PathKit.h (100%) rename {PathKit => Sources}/PathKit.swift (99%) rename {PathKitTests/Fixtures/directory/subdirectory => Tests/Fixtures/directory}/child (100%) rename PathKitTests/Fixtures/file => Tests/Fixtures/directory/subdirectory/child (100%) rename PathKitTests/Fixtures/permissions/deletable => Tests/Fixtures/file (100%) rename PathKitTests/Fixtures/permissions/executable => Tests/Fixtures/permissions/deletable (100%) mode change 100755 => 100644 rename PathKitTests/Fixtures/permissions/readable => Tests/Fixtures/permissions/executable (100%) mode change 100644 => 100755 rename PathKitTests/Fixtures/permissions/writable => Tests/Fixtures/permissions/readable (100%) create mode 100644 Tests/Fixtures/permissions/writable rename {PathKitTests => Tests}/Fixtures/symlinks/directory (100%) rename {PathKitTests => Tests}/Fixtures/symlinks/file (100%) rename {PathKitTests => Tests}/Fixtures/symlinks/same-dir (100%) rename {PathKitTests => Tests}/Fixtures/symlinks/swift (100%) rename {PathKitTests => Tests}/Info.plist (100%) rename {PathKitTests => Tests}/ManipulationTests.swift (100%) rename {PathKitTests => Tests}/PathKitTests.swift (100%) diff --git a/.gitignore b/.gitignore index 3b645e5..41895f0 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ DerivedData # # Pods/ - +# Swift Package Manager +.build/ diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..c78c4ff --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +2.2-dev diff --git a/PathKitTests/Fixtures/directory/child b/Package.swift similarity index 100% rename from PathKitTests/Fixtures/directory/child rename to Package.swift diff --git a/PathKit.podspec b/PathKit.podspec index de5e30e..0f3f54c 100644 --- a/PathKit.podspec +++ b/PathKit.podspec @@ -7,7 +7,7 @@ Pod::Spec.new do |spec| spec.author = { 'Kyle Fuller' => 'kyle@fuller.li' } spec.social_media_url = 'http://twitter.com/kylefuller' spec.source = { :git => 'https://github.com/kylef/PathKit.git', :tag => spec.version } - spec.source_files = 'PathKit/PathKit.swift' + spec.source_files = 'Sources/PathKit.swift' spec.ios.deployment_target = '8.0' spec.osx.deployment_target = '10.9' spec.requires_arc = true diff --git a/PathKit.xcodeproj/project.pbxproj b/PathKit.xcodeproj/project.pbxproj index 101f1e4..7c4c8eb 100644 --- a/PathKit.xcodeproj/project.pbxproj +++ b/PathKit.xcodeproj/project.pbxproj @@ -102,7 +102,8 @@ 77DCBAE61A1E2A950054C841 /* PathKit.swift */, 77DCBACD1A1E2A750054C841 /* Supporting Files */, ); - path = PathKit; + name = PathKit; + path = Sources; sourceTree = ""; }; 77DCBACD1A1E2A750054C841 /* Supporting Files */ = { @@ -121,7 +122,8 @@ 29279AFC1B8DF4AE00A2A586 /* Fixtures */, 77DCBADA1A1E2A750054C841 /* Supporting Files */, ); - path = PathKitTests; + name = PathKitTests; + path = Tests; sourceTree = ""; }; 77DCBADA1A1E2A750054C841 /* Supporting Files */ = { @@ -408,7 +410,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = PathKit/Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)"; @@ -428,7 +430,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; - INFOPLIST_FILE = PathKit/Info.plist; + INFOPLIST_FILE = Sources/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)"; @@ -450,7 +452,7 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = PathKitTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -466,7 +468,7 @@ "$(DEVELOPER_FRAMEWORKS_DIR)", "$(inherited)", ); - INFOPLIST_FILE = PathKitTests/Info.plist; + INFOPLIST_FILE = Tests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocode.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 80cc865..020a500 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -9,34 +9,37 @@ /* Begin PBXBuildFile section */ 2DC49DDE75C002FE3FDF2537298D78FA /* Pods-PathKitTests-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 9680C8CCB233624264FDC4DFF403D294 /* Pods-PathKitTests-dummy.m */; }; 32A4CE49ADE210C81BFBAD55F08C4AC6 /* Pods-PathKitTests-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = BA6435C445A0B2ECC944E2840EAFC268 /* Pods-PathKitTests-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C848F63DCDA9B56034FF8C8B58FEF6AB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B228C1A62B4D45AD5159E7B8E7169ED /* Cocoa.framework */; }; - CFE051093487DAE7105A00AF7907EF67 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B228C1A62B4D45AD5159E7B8E7169ED /* Cocoa.framework */; }; - CFF091C86D2B9CCD50EA115EE01BE304 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C26197DCE8B2ED913548810EFD3F7E82 /* XCTest.framework */; }; - D73B5B44679EDFC719EC47C8C3688014 /* CatchingFire.swift in Sources */ = {isa = PBXBuildFile; fileRef = BCC426787E31F1AE25DDC9F173DA8CA3 /* CatchingFire.swift */; }; - F79A2BADC0014A22177CF9FA7E571EE7 /* CatchingFire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D7473761DD2BCC5A8C0F53D82BBA47 /* CatchingFire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F89077171D750113E6EFAF3AB66A16B1 /* CatchingFire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 603802CAC3327CD22481FE851CBBEEC4 /* CatchingFire-dummy.m */; }; + 60CA44D517C53F1A05E8345C7ED9C3A1 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6ED9CB0EE511113A4BE71A6BCBB058A3 /* XCTest.framework */; }; + 8CE272E362B68E46D74539FDEEC87D4B /* CatchingFire.swift in Sources */ = {isa = PBXBuildFile; fileRef = 613C1308D93BE45AD9B8BECC935E9DDC /* CatchingFire.swift */; }; + A1F52C4AB4EE353813B94260076725A2 /* CatchingFire-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AD30CE7E9C5B2908E2599902F8F76B1 /* CatchingFire-dummy.m */; }; + BD8F08D8337F77833E0855546CCDF1C5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 373D48B665808247C4719F5A28951382 /* Cocoa.framework */; }; + CFE051093487DAE7105A00AF7907EF67 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 373D48B665808247C4719F5A28951382 /* Cocoa.framework */; }; + FE34659F792647612475CB4C26B84A8A /* CatchingFire-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 077B4A36F193C8C812D8F98E7DEA0882 /* CatchingFire-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 27FC24870932141800D886A9D51C5975 /* PBXContainerItemProxy */ = { + 8A73DA45F11FAF5263A10B44F9AD7A69 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = D41D8CD98F00B204E9800998ECF8427E /* Project object */; proxyType = 1; - remoteGlobalIDString = 5D37234EA02AF134040F6D92B7D3006A; + remoteGlobalIDString = 8A01C0FE8867ECD2C07DE084EDF3865D; remoteInfo = CatchingFire; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 01702BE714BCBF92F9E52984A0C2A5B5 /* Pods-PathKitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-PathKitTests.debug.xcconfig"; sourceTree = ""; }; + 077B4A36F193C8C812D8F98E7DEA0882 /* CatchingFire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CatchingFire-umbrella.h"; sourceTree = ""; }; 0C68FCF15E3017E29E5A60E48CC87B5B /* CatchingFire.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CatchingFire.xcconfig; sourceTree = ""; }; 22C0111171DA31162267FDB2B03DC987 /* Pods-PathKitTests-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-PathKitTests-frameworks.sh"; sourceTree = ""; }; + 373D48B665808247C4719F5A28951382 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; 422828DBB60A03A4335035141CE9668A /* CatchingFire-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CatchingFire-prefix.pch"; sourceTree = ""; }; 4F60C457E406D4AD1F24C6700E8DEB05 /* CatchingFire.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = CatchingFire.modulemap; sourceTree = ""; }; - 5B228C1A62B4D45AD5159E7B8E7169ED /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; - 603802CAC3327CD22481FE851CBBEEC4 /* CatchingFire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CatchingFire-dummy.m"; sourceTree = ""; }; - 61DC47E98B9FB9C3AA1D32BFDDBF2673 /* CatchingFire-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "CatchingFire-Private.xcconfig"; sourceTree = ""; }; + 5AD30CE7E9C5B2908E2599902F8F76B1 /* CatchingFire-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "CatchingFire-dummy.m"; sourceTree = ""; }; + 613C1308D93BE45AD9B8BECC935E9DDC /* CatchingFire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CatchingFire.swift; path = src/CatchingFire.swift; sourceTree = ""; }; + 636C6B8B7075407A8B69B85B91B8EC50 /* CatchingFire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CatchingFire.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 63C9BD7BA4070E01A7492505E64A5D3E /* Pods-PathKitTests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-PathKitTests-acknowledgements.plist"; sourceTree = ""; }; + 6ED9CB0EE511113A4BE71A6BCBB058A3 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; 849358E0EC6EBEB05F99E721842901DC /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 860C16180972564291C49ED8A66EEB83 /* Pods-PathKitTests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-PathKitTests-resources.sh"; sourceTree = ""; }; 8C250CA37B37FA02AC8E7653A06F6E2F /* Pods-PathKitTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = "sourcecode.module-map"; path = "Pods-PathKitTests.modulemap"; sourceTree = ""; }; @@ -44,22 +47,19 @@ 994BA01DD7BB262D891D1D33ACDCFA2A /* Pods_PathKitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_PathKitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; BA6428E9F66FD5A23C0A2E06ED26CD2F /* Podfile */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; BA6435C445A0B2ECC944E2840EAFC268 /* Pods-PathKitTests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-PathKitTests-umbrella.h"; sourceTree = ""; }; - BCC426787E31F1AE25DDC9F173DA8CA3 /* CatchingFire.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CatchingFire.swift; path = src/CatchingFire.swift; sourceTree = ""; }; - C26197DCE8B2ED913548810EFD3F7E82 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; + BCE4C453474F0B7184F61EB0D489C270 /* CatchingFire-Private.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "CatchingFire-Private.xcconfig"; sourceTree = ""; }; DD4540E259A1780FFEB9F0196DFE36B3 /* Pods-PathKitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-PathKitTests.release.xcconfig"; sourceTree = ""; }; E42D425B5FC4633B609285A4BCC84C37 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - E4D7473761DD2BCC5A8C0F53D82BBA47 /* CatchingFire-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CatchingFire-umbrella.h"; sourceTree = ""; }; - E560DC36EF5BCEC0F2DF41EC5A7F8DD9 /* CatchingFire.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CatchingFire.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F79EF6F581AF8DEAA458341CAEEA49A5 /* Pods-PathKitTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-PathKitTests-acknowledgements.markdown"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 0758A7DF2A53E7382A60D69F37544A8C /* Frameworks */ = { + BDE170D8400A60480E3EE1BD48D3426A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C848F63DCDA9B56034FF8C8B58FEF6AB /* Cocoa.framework in Frameworks */, - CFF091C86D2B9CCD50EA115EE01BE304 /* XCTest.framework in Frameworks */, + BD8F08D8337F77833E0855546CCDF1C5 /* Cocoa.framework in Frameworks */, + 60CA44D517C53F1A05E8345C7ED9C3A1 /* XCTest.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -77,8 +77,8 @@ 1E2857EEF8D1E8C384FE2D82051855E2 /* OS X */ = { isa = PBXGroup; children = ( - 5B228C1A62B4D45AD5159E7B8E7169ED /* Cocoa.framework */, - C26197DCE8B2ED913548810EFD3F7E82 /* XCTest.framework */, + 373D48B665808247C4719F5A28951382 /* Cocoa.framework */, + 6ED9CB0EE511113A4BE71A6BCBB058A3 /* XCTest.framework */, ); name = "OS X"; sourceTree = ""; @@ -115,7 +115,7 @@ 7F68C314F47E5B8523C677477D5E9C79 /* CatchingFire */ = { isa = PBXGroup; children = ( - BCC426787E31F1AE25DDC9F173DA8CA3 /* CatchingFire.swift */, + 613C1308D93BE45AD9B8BECC935E9DDC /* CatchingFire.swift */, FD544B72F4C52ED20CEACD832751FFB8 /* Support Files */, ); path = CatchingFire; @@ -132,7 +132,7 @@ CCA510CFBEA2D207524CDA0D73C3B561 /* Products */ = { isa = PBXGroup; children = ( - E560DC36EF5BCEC0F2DF41EC5A7F8DD9 /* CatchingFire.framework */, + 636C6B8B7075407A8B69B85B91B8EC50 /* CatchingFire.framework */, 994BA01DD7BB262D891D1D33ACDCFA2A /* Pods_PathKitTests.framework */, ); name = Products; @@ -159,10 +159,10 @@ children = ( 4F60C457E406D4AD1F24C6700E8DEB05 /* CatchingFire.modulemap */, 0C68FCF15E3017E29E5A60E48CC87B5B /* CatchingFire.xcconfig */, - 61DC47E98B9FB9C3AA1D32BFDDBF2673 /* CatchingFire-Private.xcconfig */, - 603802CAC3327CD22481FE851CBBEEC4 /* CatchingFire-dummy.m */, + BCE4C453474F0B7184F61EB0D489C270 /* CatchingFire-Private.xcconfig */, + 5AD30CE7E9C5B2908E2599902F8F76B1 /* CatchingFire-dummy.m */, 422828DBB60A03A4335035141CE9668A /* CatchingFire-prefix.pch */, - E4D7473761DD2BCC5A8C0F53D82BBA47 /* CatchingFire-umbrella.h */, + 077B4A36F193C8C812D8F98E7DEA0882 /* CatchingFire-umbrella.h */, 849358E0EC6EBEB05F99E721842901DC /* Info.plist */, ); name = "Support Files"; @@ -172,11 +172,11 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - AB738B31348C2678D0B6F0D9981BC101 /* Headers */ = { + 3C82DB380908B6F7C3011E0165906DF9 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - F79A2BADC0014A22177CF9FA7E571EE7 /* CatchingFire-umbrella.h in Headers */, + FE34659F792647612475CB4C26B84A8A /* CatchingFire-umbrella.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -202,20 +202,20 @@ buildRules = ( ); dependencies = ( - 8D0B113F41A22AB2E554A430297C7CBE /* PBXTargetDependency */, + 8E8925AD18577822DD9A45CE5A5E38D2 /* PBXTargetDependency */, ); name = "Pods-PathKitTests"; productName = "Pods-PathKitTests"; productReference = 994BA01DD7BB262D891D1D33ACDCFA2A /* Pods_PathKitTests.framework */; productType = "com.apple.product-type.framework"; }; - 5D37234EA02AF134040F6D92B7D3006A /* CatchingFire */ = { + 8A01C0FE8867ECD2C07DE084EDF3865D /* CatchingFire */ = { isa = PBXNativeTarget; - buildConfigurationList = C00C0C88ACE92BDACD942E5BA62DC419 /* Build configuration list for PBXNativeTarget "CatchingFire" */; + buildConfigurationList = FF38FAAB11161B91DC2DC291ABD03533 /* Build configuration list for PBXNativeTarget "CatchingFire" */; buildPhases = ( - 4941E761F173082533B3662BEF575FB9 /* Sources */, - 0758A7DF2A53E7382A60D69F37544A8C /* Frameworks */, - AB738B31348C2678D0B6F0D9981BC101 /* Headers */, + AD0FBCEF08396DA6DFCF674D4CF787DA /* Sources */, + BDE170D8400A60480E3EE1BD48D3426A /* Frameworks */, + 3C82DB380908B6F7C3011E0165906DF9 /* Headers */, ); buildRules = ( ); @@ -223,7 +223,7 @@ ); name = CatchingFire; productName = CatchingFire; - productReference = E560DC36EF5BCEC0F2DF41EC5A7F8DD9 /* CatchingFire.framework */; + productReference = 636C6B8B7075407A8B69B85B91B8EC50 /* CatchingFire.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -247,7 +247,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 5D37234EA02AF134040F6D92B7D3006A /* CatchingFire */, + 8A01C0FE8867ECD2C07DE084EDF3865D /* CatchingFire */, 0FB3679E3D17AF691D100C85B384CA70 /* Pods-PathKitTests */, ); }; @@ -262,34 +262,33 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4941E761F173082533B3662BEF575FB9 /* Sources */ = { + AD0FBCEF08396DA6DFCF674D4CF787DA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F89077171D750113E6EFAF3AB66A16B1 /* CatchingFire-dummy.m in Sources */, - D73B5B44679EDFC719EC47C8C3688014 /* CatchingFire.swift in Sources */, + A1F52C4AB4EE353813B94260076725A2 /* CatchingFire-dummy.m in Sources */, + 8CE272E362B68E46D74539FDEEC87D4B /* CatchingFire.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 8D0B113F41A22AB2E554A430297C7CBE /* PBXTargetDependency */ = { + 8E8925AD18577822DD9A45CE5A5E38D2 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = CatchingFire; - target = 5D37234EA02AF134040F6D92B7D3006A /* CatchingFire */; - targetProxy = 27FC24870932141800D886A9D51C5975 /* PBXContainerItemProxy */; + target = 8A01C0FE8867ECD2C07DE084EDF3865D /* CatchingFire */; + targetProxy = 8A73DA45F11FAF5263A10B44F9AD7A69 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 4AEAE8A1195A476E9BAFE4D52EF4692D /* Release */ = { + 3F0AB121F72A4B4DEBBD222A10A851C2 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 61DC47E98B9FB9C3AA1D32BFDDBF2673 /* CatchingFire-Private.xcconfig */; + baseConfigurationReference = BCE4C453474F0B7184F61EB0D489C270 /* CatchingFire-Private.xcconfig */; buildSettings = { COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 0.2.0; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 0.2.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; @@ -302,14 +301,15 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.9; MODULEMAP_FILE = "Target Support Files/CatchingFire/CatchingFire.modulemap"; - MTL_ENABLE_DEBUG_INFO = NO; + MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_NAME = CatchingFire; SDKROOT = macosx; SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; 52D4ECB745D1C035F94BD060EE7F6605 /* Debug */ = { isa = XCBuildConfiguration; @@ -350,34 +350,6 @@ }; name = Debug; }; - 6DABC6A546B057DB400EC78C985E0AC8 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 61DC47E98B9FB9C3AA1D32BFDDBF2673 /* CatchingFire-Private.xcconfig */; - buildSettings = { - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 0.2.0; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 0.2.0; - DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_VERSION = A; - GCC_PREFIX_HEADER = "Target Support Files/CatchingFire/CatchingFire-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/CatchingFire/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.9; - MODULEMAP_FILE = "Target Support Files/CatchingFire/CatchingFire.modulemap"; - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_NAME = CatchingFire; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; A070F153A04DD66F4E492261894B37FF /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -412,6 +384,34 @@ }; name = Release; }; + B5DA7DBAA542B29C88ADD89CCACBFB4C /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = BCE4C453474F0B7184F61EB0D489C270 /* CatchingFire-Private.xcconfig */; + buildSettings = { + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 0.2.0; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 0.2.0; + DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_VERSION = A; + GCC_PREFIX_HEADER = "Target Support Files/CatchingFire/CatchingFire-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/CatchingFire/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + MODULEMAP_FILE = "Target Support Files/CatchingFire/CatchingFire.modulemap"; + MTL_ENABLE_DEBUG_INFO = NO; + PRODUCT_NAME = CatchingFire; + SDKROOT = macosx; + SKIP_INSTALL = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; BC22A131966858F05B415C97C0924023 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = DD4540E259A1780FFEB9F0196DFE36B3 /* Pods-PathKitTests.release.xcconfig */; @@ -493,11 +493,11 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - C00C0C88ACE92BDACD942E5BA62DC419 /* Build configuration list for PBXNativeTarget "CatchingFire" */ = { + FF38FAAB11161B91DC2DC291ABD03533 /* Build configuration list for PBXNativeTarget "CatchingFire" */ = { isa = XCConfigurationList; buildConfigurations = ( - 6DABC6A546B057DB400EC78C985E0AC8 /* Debug */, - 4AEAE8A1195A476E9BAFE4D52EF4692D /* Release */, + 3F0AB121F72A4B4DEBBD222A10A851C2 /* Debug */, + B5DA7DBAA542B29C88ADD89CCACBFB4C /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/PathKit/Info.plist b/Sources/Info.plist similarity index 100% rename from PathKit/Info.plist rename to Sources/Info.plist diff --git a/PathKit/PathKit.h b/Sources/PathKit.h similarity index 100% rename from PathKit/PathKit.h rename to Sources/PathKit.h diff --git a/PathKit/PathKit.swift b/Sources/PathKit.swift similarity index 99% rename from PathKit/PathKit.swift rename to Sources/PathKit.swift index a82b939..2407601 100644 --- a/PathKit/PathKit.swift +++ b/Sources/PathKit.swift @@ -26,7 +26,7 @@ public struct Path { } /// Create a Path by joining multiple path components together - public init(let components: S) { + public init(components: S) { if components.isEmpty { path = "." } else if components.first == Path.separator && components.count > 1 { diff --git a/PathKitTests/Fixtures/directory/subdirectory/child b/Tests/Fixtures/directory/child similarity index 100% rename from PathKitTests/Fixtures/directory/subdirectory/child rename to Tests/Fixtures/directory/child diff --git a/PathKitTests/Fixtures/file b/Tests/Fixtures/directory/subdirectory/child similarity index 100% rename from PathKitTests/Fixtures/file rename to Tests/Fixtures/directory/subdirectory/child diff --git a/PathKitTests/Fixtures/permissions/deletable b/Tests/Fixtures/file similarity index 100% rename from PathKitTests/Fixtures/permissions/deletable rename to Tests/Fixtures/file diff --git a/PathKitTests/Fixtures/permissions/executable b/Tests/Fixtures/permissions/deletable old mode 100755 new mode 100644 similarity index 100% rename from PathKitTests/Fixtures/permissions/executable rename to Tests/Fixtures/permissions/deletable diff --git a/PathKitTests/Fixtures/permissions/readable b/Tests/Fixtures/permissions/executable old mode 100644 new mode 100755 similarity index 100% rename from PathKitTests/Fixtures/permissions/readable rename to Tests/Fixtures/permissions/executable diff --git a/PathKitTests/Fixtures/permissions/writable b/Tests/Fixtures/permissions/readable similarity index 100% rename from PathKitTests/Fixtures/permissions/writable rename to Tests/Fixtures/permissions/readable diff --git a/Tests/Fixtures/permissions/writable b/Tests/Fixtures/permissions/writable new file mode 100644 index 0000000..e69de29 diff --git a/PathKitTests/Fixtures/symlinks/directory b/Tests/Fixtures/symlinks/directory similarity index 100% rename from PathKitTests/Fixtures/symlinks/directory rename to Tests/Fixtures/symlinks/directory diff --git a/PathKitTests/Fixtures/symlinks/file b/Tests/Fixtures/symlinks/file similarity index 100% rename from PathKitTests/Fixtures/symlinks/file rename to Tests/Fixtures/symlinks/file diff --git a/PathKitTests/Fixtures/symlinks/same-dir b/Tests/Fixtures/symlinks/same-dir similarity index 100% rename from PathKitTests/Fixtures/symlinks/same-dir rename to Tests/Fixtures/symlinks/same-dir diff --git a/PathKitTests/Fixtures/symlinks/swift b/Tests/Fixtures/symlinks/swift similarity index 100% rename from PathKitTests/Fixtures/symlinks/swift rename to Tests/Fixtures/symlinks/swift diff --git a/PathKitTests/Info.plist b/Tests/Info.plist similarity index 100% rename from PathKitTests/Info.plist rename to Tests/Info.plist diff --git a/PathKitTests/ManipulationTests.swift b/Tests/ManipulationTests.swift similarity index 100% rename from PathKitTests/ManipulationTests.swift rename to Tests/ManipulationTests.swift diff --git a/PathKitTests/PathKitTests.swift b/Tests/PathKitTests.swift similarity index 100% rename from PathKitTests/PathKitTests.swift rename to Tests/PathKitTests.swift