Skip to content
This repository has been archived by the owner on Oct 14, 2021. It is now read-only.

Commit

Permalink
Merge branch 'release-candidate' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Verkoeyen committed Dec 3, 2016
2 parents f422423 + df9ee04 commit 09dabc8
Show file tree
Hide file tree
Showing 20 changed files with 1,449 additions and 81 deletions.
4 changes: 2 additions & 2 deletions .arcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"arc.feature.start.default": "origin/develop",
"unit.xcode": {
"build": {
"workspace": "MaterialMotionObservable.xcworkspace",
"workspace": "IndefiniteObservable.xcworkspace",
"scheme": "UnitTests",
"configuration": "Debug",
"destination": "platform=iOS Simulator,name=iPhone 6s"
},
"coverage": {
"product": "MaterialMotionObservable.framework/MaterialMotionObservable"
"product": "IndefiniteObservable.framework/IndefiniteObservable"
},
"pre-build": "pod install"
}
Expand Down
10 changes: 5 additions & 5 deletions .jazzy.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module: MaterialMotionObservable
module: IndefiniteObservable
module_version: 1.0.0
sdk: iphonesimulator
xcodebuild_arguments:
- -workspace
- MaterialMotionObservable.xcworkspace
- IndefiniteObservable.xcworkspace
- -scheme
- MaterialMotionObservable
github_url: https://github.com/material-motion/observable-swift
github_file_prefix: https://github.com/material-motion/observable-swift/tree/v1.0.0
- IndefiniteObservable
github_url: https://github.com/material-motion/indefinite-observable-swift
github_file_prefix: https://github.com/material-motion/indefinite-observable-swift/tree/v1.0.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ before_install:
script:
- set -o pipefail
- arcanist/bin/arc unit --everything --trace
- xcodebuild build -workspace MaterialMotionObservable.xcworkspace -scheme Catalog -sdk "iphonesimulator10.1" -destination "name=iPhone 6s,OS=10.1" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
- xcodebuild build -workspace IndefiniteObservable.xcworkspace -scheme Catalog -sdk "iphonesimulator10.1" -destination "name=iPhone 6s,OS=10.1" ONLY_ACTIVE_ARCH=YES | xcpretty -c;
after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This is the list of Swift Observable authors for copyright purposes.
# This is the list of IndefiniteObservable.swift authors for copyright purposes.
#
# This does not necessarily list everyone who has contributed code, since in
# some cases, their employer may be the copyright holder. To see the full list
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# 1.0.0

Stable release of `IndefiniteObservable`.

## Source changes

* [Fix outdated reference in header docs.](https://github.com/material-motion/indefinite-observable-swift/commit/4f3b48a12f1e2a57d1b251db0c6a8a46f58e5e41) (Jeff Verkoeyen)
* [Initial commit of IndefiniteObservable.](https://github.com/material-motion/indefinite-observable-swift/commit/f64ea2a587f03ac898198710347f65c78788fb26) (Jeff Verkoeyen)

## API changes

Auto-generated by running:

apidiff origin/stable release-candidate swift IndefiniteObservable.xcworkspace IndefiniteObservable

## Subscription

*new* method: `unsubscribe()` in `Subscription`

*new* protocol: `Subscription`

## noUnsubscription

*new* global var: `noUnsubscription`

## Observer

*new* protocol: `Observer`

*new* method: `next(_:)` in `Observer`

## AnyObserver

*new* class: `AnyObserver`

*new* method: `next(_:)` in `AnyObserver`

## IndefiniteObservable

*new* method: `init(_:)` in `IndefiniteObservable`

*new* method: `subscribe(next:)` in `IndefiniteObservable`

*new* class: `IndefiniteObservable`
29 changes: 29 additions & 0 deletions IndefiniteObservable.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Pod::Spec.new do |s|
s.name = "IndefiniteObservable"
s.summary = "IndefiniteObservable.swift"
s.version = "1.0.0"
s.authors = "The Material Motion Authors"
s.license = "Apache 2.0"
s.homepage = "https://github.com/material-motion/indefinite-observable-swift"
s.source = { :git => "https://github.com/material-motion/indefinite-observable-swift.git", :tag => "v" + s.version.to_s }
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'
s.requires_arc = true
s.default_subspec = "lib"

s.subspec "lib" do |ss|
ss.source_files = "src/*.{swift}", "src/private/*.{swift}"
end

s.subspec "examples" do |ss|
ss.ios.source_files = "examples/*.{swift}", "examples/supplemental/*.{swift}"
ss.ios.exclude_files = "examples/TableOfContents.swift"
#ss.resources = "examples/supplemental/*.{xcassets}"
ss.dependency "IndefiniteObservable/lib"
end

#s.subspec "tests" do |ss|
# ss.source_files = "tests/src/*.{swift}", "tests/src/private/*.{swift}"
# ss.dependency "IndefiniteObservable/lib"
#end
end
28 changes: 0 additions & 28 deletions MaterialMotionObservable.podspec

This file was deleted.

11 changes: 7 additions & 4 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
workspace 'MaterialMotionObservable.xcworkspace'
workspace 'IndefiniteObservable.xcworkspace'
use_frameworks!

target "Catalog" do
pod 'CatalogByConvention'
pod 'MaterialMotionObservable/examples', :path => './'
pod 'IndefiniteObservable/examples', :path => './'
project 'examples/apps/Catalog/Catalog.xcodeproj'
end

target "UnitTests" do
abstract_target 'Tests' do
project 'examples/apps/Catalog/Catalog.xcodeproj'
pod 'MaterialMotionObservable/tests', :path => './'
pod 'IndefiniteObservable/lib', :path => './'

target "UnitTests"
target "OSXTests"
end

post_install do |installer|
Expand Down
22 changes: 22 additions & 0 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
PODS:
- CatalogByConvention (2.0.0)
- IndefiniteObservable/examples (1.0.0):
- IndefiniteObservable/lib
- IndefiniteObservable/lib (1.0.0)

DEPENDENCIES:
- CatalogByConvention
- IndefiniteObservable/examples (from `./`)
- IndefiniteObservable/lib (from `./`)

EXTERNAL SOURCES:
IndefiniteObservable:
:path: "./"

SPEC CHECKSUMS:
CatalogByConvention: be55c2263132e4f9f59299ac8a528ee8715b3275
IndefiniteObservable: b90809f2fa025e37124c14681192bc441b128625

PODFILE CHECKSUM: 3e4cdba95901e07a289159f0c5a8b830ecb1a5c8

COCOAPODS: 1.1.1
Loading

0 comments on commit 09dabc8

Please sign in to comment.