From 5d4e1a33ffdf25ec2048812fb3f887f24bcd8266 Mon Sep 17 00:00:00 2001 From: Syo Ikeda Date: Mon, 23 Jan 2017 02:28:49 +0900 Subject: [PATCH] Support Swift Package Manager --- .gitignore | 20 ++++++++++++++--- .swift-version | 1 + .travis.yml | 16 +++++++++----- Package.swift | 8 +++++++ ReactiveTask.xcodeproj/project.pbxproj | 22 ++++++++++--------- {ReactiveTask => Sources}/Availability.swift | 0 {ReactiveTask => Sources}/Errors.swift | 0 {ReactiveTask => Sources}/Info.plist | 0 {ReactiveTask => Sources}/ReactiveTask.h | 0 {ReactiveTask => Sources}/Task.swift | 0 .../ReactiveTaskTests}/Info.plist | 0 .../ReactiveTaskTests}/TaskSpec.swift | 0 12 files changed, 49 insertions(+), 18 deletions(-) create mode 100644 .swift-version create mode 100644 Package.swift rename {ReactiveTask => Sources}/Availability.swift (100%) rename {ReactiveTask => Sources}/Errors.swift (100%) rename {ReactiveTask => Sources}/Info.plist (100%) rename {ReactiveTask => Sources}/ReactiveTask.h (100%) rename {ReactiveTask => Sources}/Task.swift (100%) rename {ReactiveTaskTests => Tests/ReactiveTaskTests}/Info.plist (100%) rename {ReactiveTaskTests => Tests/ReactiveTaskTests}/TaskSpec.swift (100%) diff --git a/.gitignore b/.gitignore index d571cb2..006a3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ -15,7 +17,7 @@ DerivedData !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata +xcuserdata/ ## Other *.xccheckout @@ -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/ diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..b502146 --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +3.0.2 diff --git a/.travis.yml b/.travis.yml index 2e88d9e..77a16dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..eac5e3f --- /dev/null +++ b/Package.swift @@ -0,0 +1,8 @@ +import PackageDescription + +let package = Package( + name: "ReactiveTask", + dependencies: [ + .Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", majorVersion: 1), + ] +) diff --git a/ReactiveTask.xcodeproj/project.pbxproj b/ReactiveTask.xcodeproj/project.pbxproj index 87caa94..e2aae50 100644 --- a/ReactiveTask.xcodeproj/project.pbxproj +++ b/ReactiveTask.xcodeproj/project.pbxproj @@ -115,7 +115,8 @@ D0BFEA9F1A2D212000E23194 /* Task.swift */, D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */, ); - path = ReactiveTask; + name = ReactiveTask; + path = Sources; sourceTree = ""; }; D0BFEA5B1A2D1E5E00E23194 /* Supporting Files */ = { @@ -134,7 +135,8 @@ D0BFEAA11A2D212800E23194 /* TaskSpec.swift */, D0BFEA681A2D1E5E00E23194 /* Supporting Files */, ); - path = ReactiveTaskTests; + name = ReactiveTaskTests; + path = Tests/ReactiveTaskTests; sourceTree = ""; }; D0BFEA681A2D1E5E00E23194 /* Supporting Files */ = { @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; @@ -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; diff --git a/ReactiveTask/Availability.swift b/Sources/Availability.swift similarity index 100% rename from ReactiveTask/Availability.swift rename to Sources/Availability.swift diff --git a/ReactiveTask/Errors.swift b/Sources/Errors.swift similarity index 100% rename from ReactiveTask/Errors.swift rename to Sources/Errors.swift diff --git a/ReactiveTask/Info.plist b/Sources/Info.plist similarity index 100% rename from ReactiveTask/Info.plist rename to Sources/Info.plist diff --git a/ReactiveTask/ReactiveTask.h b/Sources/ReactiveTask.h similarity index 100% rename from ReactiveTask/ReactiveTask.h rename to Sources/ReactiveTask.h diff --git a/ReactiveTask/Task.swift b/Sources/Task.swift similarity index 100% rename from ReactiveTask/Task.swift rename to Sources/Task.swift diff --git a/ReactiveTaskTests/Info.plist b/Tests/ReactiveTaskTests/Info.plist similarity index 100% rename from ReactiveTaskTests/Info.plist rename to Tests/ReactiveTaskTests/Info.plist diff --git a/ReactiveTaskTests/TaskSpec.swift b/Tests/ReactiveTaskTests/TaskSpec.swift similarity index 100% rename from ReactiveTaskTests/TaskSpec.swift rename to Tests/ReactiveTaskTests/TaskSpec.swift