Skip to content

Commit 5d4e1a3

Browse files
ikesyoikesyo
committed
Support Swift Package Manager
1 parent b05b60c commit 5d4e1a3

File tree

12 files changed

+49
-18
lines changed

12 files changed

+49
-18
lines changed

‎.gitignore‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
### https://raw.github.com/github/gitignore/afbff9027d02ccfc680e031f6c295f79ad61662d/Swift.gitignore
2+
13
# Xcode
24
#
35
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
46

57
## Build generated
68
build/
7-
DerivedData
9+
DerivedData/
810

911
## Various settings
1012
*.pbxuser
@@ -15,7 +17,7 @@ DerivedData
1517
!default.mode2v3
1618
*.perspectivev3
1719
!default.perspectivev3
18-
xcuserdata
20+
xcuserdata/
1921

2022
## Other
2123
*.xccheckout
@@ -26,12 +28,24 @@ xcuserdata
2628
## Obj-C/Swift specific
2729
*.hmap
2830
*.ipa
31+
*.dSYM.zip
32+
*.dSYM
33+
34+
## Playgrounds
35+
timeline.xctimeline
36+
playground.xcworkspace
37+
38+
# Swift Package Manager
39+
#
40+
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
41+
# Packages/
42+
.build/
2943

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

‎.swift-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.0.2

‎.travis.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ git:
55
branches:
66
only:
77
- master
8-
before_script:
9-
- git submodule update --init --recursive
10-
script:
11-
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
128
matrix:
139
include:
14-
- osx_image: xcode8
10+
- os: osx
11+
osx_image: xcode8.2
1512
xcode_scheme: ReactiveTask
13+
before_script:
14+
- git submodule update --init --recursive
15+
script:
16+
- set -o pipefail && xcodebuild -workspace "$TRAVIS_XCODE_WORKSPACE" -scheme "$TRAVIS_XCODE_SCHEME" test | xcpretty
1617
env: JOB=Xcode8
18+
- os: osx
19+
osx_image: xcode8.2
20+
script:
21+
- swift build
22+
env: JOB=SWIFTPM_DARWIN
1723
notifications:
1824
email: false
1925
slack:

‎Package.swift‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import PackageDescription
2+
3+
let package = Package(
4+
name: "ReactiveTask",
5+
dependencies: [
6+
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", majorVersion: 1),
7+
]
8+
)

‎ReactiveTask.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@
115115
D0BFEA9F1A2D212000E23194 /* Task.swift */,
116116
D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */,
117117
);
118-
path = ReactiveTask;
118+
name = ReactiveTask;
119+
path = Sources;
119120
sourceTree = "<group>";
120121
};
121122
D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */ = {
@@ -134,7 +135,8 @@
134135
D0BFEAA11A2D212800E23194 /* TaskSpec.swift */,
135136
D0BFEA681A2D1E5E00E23194 /* Supporting Files */,
136137
);
137-
path = ReactiveTaskTests;
138+
name = ReactiveTaskTests;
139+
path = Tests/ReactiveTaskTests;
138140
sourceTree = "<group>";
139141
};
140142
D0BFEA681A2D1E5E00E23194 /* Supporting Files */ = {
@@ -389,7 +391,7 @@
389391
DYLIB_COMPATIBILITY_VERSION = 1;
390392
DYLIB_CURRENT_VERSION = 1;
391393
FRAMEWORK_VERSION = A;
392-
INFOPLIST_FILE = ReactiveTask/Info.plist;
394+
INFOPLIST_FILE = Sources/Info.plist;
393395
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
394396
PRODUCT_NAME = "$(TARGET_NAME)";
395397
SWIFT_VERSION = 3.0;
@@ -403,7 +405,7 @@
403405
DYLIB_COMPATIBILITY_VERSION = 1;
404406
DYLIB_CURRENT_VERSION = 1;
405407
FRAMEWORK_VERSION = A;
406-
INFOPLIST_FILE = ReactiveTask/Info.plist;
408+
INFOPLIST_FILE = Sources/Info.plist;
407409
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
408410
PRODUCT_NAME = "$(TARGET_NAME)";
409411
SWIFT_VERSION = 3.0;
@@ -418,7 +420,7 @@
418420
"$(DEVELOPER_FRAMEWORKS_DIR)",
419421
"$(inherited)",
420422
);
421-
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
423+
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
422424
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
423425
PRODUCT_NAME = "$(TARGET_NAME)";
424426
SWIFT_VERSION = 3.0;
@@ -433,7 +435,7 @@
433435
"$(DEVELOPER_FRAMEWORKS_DIR)",
434436
"$(inherited)",
435437
);
436-
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
438+
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
437439
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
438440
PRODUCT_NAME = "$(TARGET_NAME)";
439441
SWIFT_VERSION = 3.0;
@@ -463,7 +465,7 @@
463465
DYLIB_COMPATIBILITY_VERSION = 1;
464466
DYLIB_CURRENT_VERSION = 1;
465467
FRAMEWORK_VERSION = A;
466-
INFOPLIST_FILE = ReactiveTask/Info.plist;
468+
INFOPLIST_FILE = Sources/Info.plist;
467469
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
468470
PRODUCT_NAME = "$(TARGET_NAME)";
469471
SWIFT_VERSION = 3.0;
@@ -478,7 +480,7 @@
478480
"$(DEVELOPER_FRAMEWORKS_DIR)",
479481
"$(inherited)",
480482
);
481-
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
483+
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
482484
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
483485
PRODUCT_NAME = "$(TARGET_NAME)";
484486
SWIFT_VERSION = 3.0;
@@ -508,7 +510,7 @@
508510
DYLIB_COMPATIBILITY_VERSION = 1;
509511
DYLIB_CURRENT_VERSION = 1;
510512
FRAMEWORK_VERSION = A;
511-
INFOPLIST_FILE = ReactiveTask/Info.plist;
513+
INFOPLIST_FILE = Sources/Info.plist;
512514
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
513515
PRODUCT_NAME = "$(TARGET_NAME)";
514516
SWIFT_VERSION = 3.0;
@@ -523,7 +525,7 @@
523525
"$(DEVELOPER_FRAMEWORKS_DIR)",
524526
"$(inherited)",
525527
);
526-
INFOPLIST_FILE = ReactiveTaskTests/Info.plist;
528+
INFOPLIST_FILE = Tests/ReactiveTaskTests/Info.plist;
527529
PRODUCT_BUNDLE_IDENTIFIER = "org.carthage.$(PRODUCT_NAME:rfc1034identifier)";
528530
PRODUCT_NAME = "$(TARGET_NAME)";
529531
SWIFT_VERSION = 3.0;

ReactiveTask/Availability.swift renamed to Sources/Availability.swift

File renamed without changes.

ReactiveTask/Errors.swift renamed to Sources/Errors.swift

File renamed without changes.

ReactiveTask/Info.plist renamed to Sources/Info.plist

File renamed without changes.

ReactiveTask/ReactiveTask.h renamed to Sources/ReactiveTask.h

File renamed without changes.

ReactiveTask/Task.swift renamed to Sources/Task.swift

File renamed without changes.

0 commit comments

Comments
 (0)