Skip to content

Commit

Permalink
Support Swift Package Manager
Browse files Browse the repository at this point in the history
  • Loading branch information
ikesyo committed Jan 22, 2017
1 parent b05b60c commit 5d4e1a3
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 18 deletions.
20 changes: 17 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
### https://raw.github.com/github/gitignore/afbff9027d02ccfc680e031f6c295f79ad61662d/Swift.gitignore

# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData
DerivedData/

## Various settings
*.pbxuser
Expand All @@ -15,7 +17,7 @@ DerivedData
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
xcuserdata/

## Other
*.xccheckout
Expand All @@ -26,12 +28,24 @@ xcuserdata
## Obj-C/Swift specific
*.hmap
*.ipa
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

Expand Down
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.0.2
16 changes: 11 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@ git:
branches:
only:
- master
before_script:
- git submodule update --init --recursive
script:
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
matrix:
include:
- osx_image: xcode8
- os: osx
osx_image: xcode8.2
xcode_scheme: ReactiveTask
before_script:
- git submodule update --init --recursive
script:
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
env: JOB=Xcode8
- os: osx
osx_image: xcode8.2
script:
- swift build
env: JOB=SWIFTPM_DARWIN
notifications:
email: false
slack:
Expand Down
8 changes: 8 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import PackageDescription

let package = Package(
name: "ReactiveTask",
dependencies: [
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", majorVersion: 1),
]
)
22 changes: 12 additions & 10 deletions ReactiveTask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@
D0BFEA9F1A2D212000E23194 /* Task.swift */,
D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */,
);
path = ReactiveTask;
name = ReactiveTask;
path = Sources;
sourceTree = "<group>";
};
D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */ = {
Expand All @@ -134,7 +135,8 @@
D0BFEAA11A2D212800E23194 /* TaskSpec.swift */,
D0BFEA681A2D1E5E00E23194 /* Supporting Files */,
);
path = ReactiveTaskTests;
name = ReactiveTaskTests;
path = Tests/ReactiveTaskTests;
sourceTree = "<group>";
};
D0BFEA681A2D1E5E00E23194 /* Supporting Files */ = {
Expand Down Expand Up @@ -389,7 +391,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveTask/Info.plist;
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand All @@ -403,7 +405,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveTask/Info.plist;
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand All @@ -418,7 +420,7 @@
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand All @@ -433,7 +435,7 @@
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand Down Expand Up @@ -463,7 +465,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveTask/Info.plist;
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand All @@ -478,7 +480,7 @@
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand Down Expand Up @@ -508,7 +510,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
INFOPLIST_FILE = ReactiveTask/Info.plist;
INFOPLIST_FILE = Sources/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
Expand All @@ -523,7 +525,7 @@
"$(DEVELOPER_FRAMEWORKS_DIR)",
"$(inherited)",
);
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
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.
File renamed without changes.

0 comments on commit 5d4e1a3

Please sign in to comment.