Skip to content

Commit

Permalink
Merge pull request #9 from neonichu/spm
Browse files Browse the repository at this point in the history
Support for Swift Package Manager
  • Loading branch information
kylef committed Dec 6, 2015
2 parents ba7edee + 786c46e commit cab23f4
Show file tree
Hide file tree
Showing 23 changed files with 90 additions and 86 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ DerivedData
#
# Pods/


# Swift Package Manager
.build/
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.2-dev
File renamed without changes.
2 changes: 1 addition & 1 deletion PathKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Pod::Spec.new do |spec|
spec.author = { 'Kyle Fuller' => '[email protected]' }
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
Expand Down
14 changes: 8 additions & 6 deletions PathKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@
77DCBAE61A1E2A950054C841 /* PathKit.swift */,
77DCBACD1A1E2A750054C841 /* Supporting Files */,
);
path = PathKit;
name = PathKit;
path = Sources;
sourceTree = "<group>";
};
77DCBACD1A1E2A750054C841 /* Supporting Files */ = {
Expand All @@ -121,7 +122,8 @@
29279AFC1B8DF4AE00A2A586 /* Fixtures */,
77DCBADA1A1E2A750054C841 /* Supporting Files */,
);
path = PathKitTests;
name = PathKitTests;
path = Tests;
sourceTree = "<group>";
};
77DCBADA1A1E2A750054C841 /* Supporting Files */ = {
Expand Down Expand Up @@ -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)";
Expand All @@ -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)";
Expand All @@ -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)";
Expand All @@ -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)";
Expand Down
154 changes: 77 additions & 77 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion PathKit/PathKit.swift → Sources/PathKit.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public struct Path {
}

/// Create a Path by joining multiple path components together
public init<S : CollectionType where S.Generator.Element == String>(let components: S) {
public init<S : CollectionType where S.Generator.Element == String>(components: S) {
if components.isEmpty {
path = "."
} else if components.first == Path.separator && components.count > 1 {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit cab23f4

Please sign in to comment.