Skip to content
This repository has been archived by the owner on Dec 5, 2019. It is now read-only.

Update for ReactiveCocoa 6.0, Swift 3.2 #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveCocoa/ReactiveCocoa" "v3.0-alpha.3"
github "ReactiveCocoa/ReactiveCocoa" "6.0.0-alpha.1"
7 changes: 4 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
github "LlamaKit/LlamaKit" "v0.6.0"
github "jspahrsummers/xcconfigs" "0.7.2"
github "ReactiveCocoa/ReactiveCocoa" "ad02d8356b43e2c38f3d4d87ea0127c5f8572668"
github "ReactiveCocoa/ReactiveCocoa" "6.0.0-alpha.1"
github "ReactiveCocoa/ReactiveSwift" "2.0.0-alpha.2"
github "antitypical/Result" "3.2.3"
github "jspahrsummers/xcconfigs" "0.10"
1 change: 0 additions & 1 deletion Carthage/Checkouts/LlamaKit
Submodule LlamaKit deleted from e28d7f
2 changes: 1 addition & 1 deletion Carthage/Checkouts/ReactiveCocoa
Submodule ReactiveCocoa updated 477 files
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

#### Checklist
- [ ] Updated CHANGELOG.md.
30 changes: 30 additions & 0 deletions Carthage/Checkouts/ReactiveSwift/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# macOS
.DS_Store

# Xcode
build/*
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
!default.xcworkspace
xcuserdata
profile
*.moved-aside
PlaygroundUtility.remap
*.xctimeline
*.xcscmblueprint

# SwiftPM
.build
Packages

# Carthage
Carthage/Build

# Jazzy
docs
12 changes: 12 additions & 0 deletions Carthage/Checkouts/ReactiveSwift/.gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[submodule "Carthage/Checkouts/Nimble"]
path = Carthage/Checkouts/Nimble
url = https://github.com/Quick/Nimble.git
[submodule "Carthage/Checkouts/Quick"]
path = Carthage/Checkouts/Quick
url = https://github.com/Quick/Quick.git
[submodule "Carthage/Checkouts/xcconfigs"]
path = Carthage/Checkouts/xcconfigs
url = https://github.com/jspahrsummers/xcconfigs.git
[submodule "Carthage/Checkouts/Result"]
path = Carthage/Checkouts/Result
url = https://github.com/antitypical/Result.git
87 changes: 87 additions & 0 deletions Carthage/Checkouts/ReactiveSwift/.jazzy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
custom_categories:
- name: Getting Started
children:
- ReactivePrimitives
- BasicOperators
- Example.OnlineSearch
- RxComparison
- name: Advanced Topics
children:
- APIContracts
- DebuggingTechniques
- name: Signal
children:
- Signal
- SignalProtocol
- FlattenStrategy
- name: SignalProducer
children:
- SignalProducer
- SignalProducerProtocol
- name: Property
children:
- Property
- PropertyProtocol
- MutableProperty
- MutablePropertyProtocol
- ValidatingProperty
- name: Action
children:
- Action
- ActionError
- name: Bindings
children:
- BindingSource
- BindingTarget
- BindingTargetProvider
- name: Scheduler Protocols
children:
- DateScheduler
- Scheduler
- name: Schedulers
children:
- ImmediateScheduler
- QueueScheduler
- TestScheduler
- UIScheduler
- name: Reactive Extensions
children:
- Reactive
- ReactiveExtensionsProvider
- name: Lifetime
children:
- Lifetime
- name: Disposable
children:
- AnyDisposable
- ActionDisposable
- Disposable
- CompositeDisposable
- ScopedDisposable
- SerialDisposable
- SimpleDisposable
- +=(_:_:)
- name: Debugging
children:
- EventLogger
- LoggingEvent
- name: Utilities
children:
- Atomic
- Bag
- Optional
- OptionalProtocol
theme: fullwidth
skip_undocumented: true
readme: README.md
documentation: Documentation/*.md
hide_documentation_coverage: true
xcodebuild_arguments:
- -workspace
- ReactiveSwift.xcworkspace
- -scheme
- ReactiveSwift-macOS
author: ReactiveCocoa
author_url: https://reactivecocoa.io/
github_url: https://github.com/ReactiveCocoa/ReactiveSwift/
dash_url: http://reactivecocoa.io/reactiveswift/docs/ReactiveSwift.xml
1 change: 1 addition & 0 deletions Carthage/Checkouts/ReactiveSwift/.swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1
110 changes: 110 additions & 0 deletions Carthage/Checkouts/ReactiveSwift/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
language: objective-c
osx_image: xcode8.3
before_install:
- brew uninstall carthage
- HOMEBREW_NO_AUTO_UPDATE=1 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/6ae4f69a652fb0ecb102b0c9216378679a4f1b92/Formula/carthage.rb # 0.22.0
install: true
branches:
only:
- master
# Credit: @Omnikron13, https://github.com/mojombo/semver/issues/32
- /^(\d+\.\d+\.\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/
- /^hotfix-(\d+\.\d+\.\d+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?$/
script:
- script/build
xcode_workspace: ReactiveSwift.xcworkspace
cache:
directories: Carthage/Build
jobs:
include:
- xcode_scheme: ReactiveSwift-macOS
env:
- XCODE_SDK=macosx
- XCODE_ACTION="build test"
- XCODE_DESTINATION="arch=x86_64"
- XCODE_PLAYGROUND_TARGET="x86_64-apple-macosx10.10"
- xcode_scheme: ReactiveSwift-iOS
env:
- XCODE_SDK=iphonesimulator
- XCODE_ACTION="build-for-testing test-without-building"
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s"
- xcode_scheme: ReactiveSwift-iOS
env:
- XCODE_SDK=iphonesimulator
- XCODE_ACTION="build-for-testing test-without-building"
- XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 5"
- xcode_scheme: ReactiveSwift-tvOS
env:
- XCODE_SDK=appletvsimulator
- XCODE_ACTION="build-for-testing test-without-building"
- XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV 1080p"
- xcode_scheme: ReactiveSwift-watchOS
env:
- XCODE_SDK=watchsimulator
- XCODE_ACTION=build
- XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch - 38mm,OS=2.2"
- script:
- pod repo update --silent
- pod lib lint ReactiveSwift.podspec
env:
- JOB=PODSPEC
- script:
- swift --version
- swift build
- SWIFTPM_TEST_ReactiveSwift=YES swift test
git:
submodules: false
env:
- JOB=SWIFTPM_DARWIN
- before_install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
script:
- swift --version
- swift build
- SWIFTPM_TEST_ReactiveSwift=YES swift test
git:
submodules: false
env:
- JOB=SWIFT_4
- SWIFT_VERSION=4.0-DEVELOPMENT-SNAPSHOT-2017-06-06-a
- os: linux
language: generic
sudo: required
dist: trusty
before_install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
script:
- swift --version
- swift build
- SWIFTPM_TEST_ReactiveSwift=YES swift test
git:
submodules: false
env: JOB=SWIFTPM_LINUX
- stage: prepare carthage cache
script: carthage build --cache-builds
- stage: carthage
script:
- carthage build --cache-builds --no-skip-current --platform mac
- script:
- carthage build --cache-builds --no-skip-current --platform iOS
- script:
- carthage build --cache-builds --no-skip-current --platform tvOS
- script:
- carthage build --cache-builds --no-skip-current --platform watchOS
- stage: deploy
before_install: true
script: skip
deploy:
provider: script
script: script/gen-docs
on:
repo: ReactiveCocoa/ReactiveSwift
tags: true
env:
- JOB=JAZZY_DOCS_GEN
- secure: "FZmWA8jEF1nNYEeolK+bDT/n+AJtQGa9/s5SXYg05Zs4GWReDimqo41y2UBJxdeaeixHab4N14sR5OL6R2pf4ZE0LVq4Ln17nsIPTRvMQeH74apJ/+d8y9pzQuyw8MsPeV9VwWAbhie+fjOKFEoqwo98junGJFFqNVKhZX3AdDgB50jNffEqzG7qedwHX5oM+Me8T7oq0UWblGe4CppCXEvDshIKPXxIC1foiVyJoK31WRLIX7c1m99ECFjfqqopal5EUtvgCabZkRBilsYB8rAngrpTg5NpHSPxV3VAiheCmXs12txHek8fPUNIjPf8dhP5QfwK3VUUCS4VcSOJSoTP3HzAn1OirYOhpnmrymLw2TCo4kzPGhpF+58cQQcjbO7TxA1KgLvTtLfSc2MSQTUniPC0jOzl42q5PVttxkE2wDcGBiraxVa++uGWGbjyfJBXVXNz2KnvmVmxn9YMNw2kGbptZrBQw73tHuA0w8cfK+AqckpuY2XDZEzjcumTb5Tr1AC2KWNP3sjsVVlE0yShQDyqVrHE2XP2UPKux04ZgaEciVnBisAN9c4Tm5RjbDw7EOqpy583bxtIvWkAY1rkf4+SXyfNWcHqGWkANGcgeSe9k7C6hwEWb9v90iMrD/D7hzvhioUBfgRhlrbvnAtA9K3fH2VvKGIkTj/blcY="
- secure: "sisLYdFh8r7WHW3c5sPhuIuuQucAeH66Hx/D8M9Ax9bZthITrw4JGyC+sfnLRLM4rCYrVSBAj6kiJTxK5aWjYEijKZoMf1o5/6s6IkKZv7ocaoIbIF8tVCf9uEIwzoQlStz7wRngz5Qi2PDoeuB9j/p98GV24+/09BVPSnDQ968bPrze1hJTj6xjOz3/A891rNp43g3+mA+mtnEDPmF57f51LWoJRMSdv/IlYKbJxNjKH/xWTufCfHkyKWoPWiSHiloaqWWj0MU8QNxhGHFl/gLa2ljNgSE0cEO1769v6uFK/3PJugjRAqZCs8ssbmtRBikV56LUKcF9TqQVMn5Pu08aHexnsa5P9S2+LAHGjA54rhHiJJaQB58y9UXRUTpZIx7BSajZi1+D507stWfrNB6dl1rt6txNidXDNGPF27WiViwYuET9eLrraPpzdMQzxBn0QYSfbadORwDwUP0hDOS9LC8HQMN8ECRc4mOHgoXfC2qYeKfadFpwBlRYgWKH2S+O3AcwCPUdvxe98EGLR7U5/YeHawu32qm3M1QJHeW0lvHIEnRzV7vQzrOFPO6JjKCpsObsHniy0PSfaLL3NajXBQiiYiR+qTAOT5fRuUNV6ZR648w+y1dto1Bykb+h2Z2B0/sgXQNsl4IcAfJjo7xUNh2F75PQeh7u55aDXyY="
notifications:
email: false
slack:
secure: C9QTry5wUG9CfeH3rm3Z19R5rDWqDO7EhHAqHDXBxT6CpGRkTPFliJexpjBYB4sroJ8CiY5ZgTI2sjRBiAdGoE5ZQkfnwSoKQhWXkwo19TnbSnufr3cKO2SZkUhBqOlZcA+mgfjZ7rm2wm7RhpCR/4z8oBXDN4/xv0U5R2fLCLE=
Loading