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

Commit aafdc73

Browse files
committed
Merge branch 'release/v2.0.1'
2 parents f0891f8 + 8cd7cb2 commit aafdc73

File tree

7 files changed

+64
-4
lines changed

7 files changed

+64
-4
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@ before_install:
2121
- git submodule update
2222
script:
2323
- set -o pipefail
24-
- xcodebuild -workspace examples/app/ScrollViewDelegateMultiplexerExample.xcworkspace -scheme ScrollViewDelegateMultiplexerExample -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build test | xcpretty -c;
25-
24+
- xcodebuild -workspace examples/app/ScrollViewDelegateMultiplexerExample.xcworkspace -scheme ScrollViewDelegateMultiplexerExample -sdk "$SDK" -destination "$DESTINATION" -configuration Debug GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ONLY_ACTIVE_ARCH=NO build test | xcpretty -c;
25+
after_success:
26+
- bash <(curl -s https://codecov.io/bash)

CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
## 2.0.1
2+
3+
##### Enhancements
4+
5+
* Updates podspec.
6+
* [Adds code coverage](https://github.com/material-foundation/material-scrollview-delegate-multiplexer-ios/issues/10). ([Sean O'Shea](https://github.com/seanoshea))
7+
8+
## 2.0.0
9+
10+
##### Breaking
11+
12+
* Renames all GOS prefixes to MDF
13+
14+
##### Bug Fixes
15+
16+
* Fixed test removeObserveringDelegate so it does not skip over indices
17+
18+
##### Enhancements
19+
20+
* Updates to readme.
21+
* Corrects typos.
22+
23+
## 1.0.1
24+
25+
##### Enhancements
26+
27+
* Updates readme combiner example.
28+
* Adds example using the combiner protocol.
29+
* Updates example to handle rotation
30+
* Update .jazzy.yaml
31+
* Link conventions to GOS-contributing repo.
32+
33+
## 1.0.0
34+
35+
Initial release.
36+
37+
## x.x.x
38+
39+
This is a template. When cutting a new release, rename "master" to the release number and create a
40+
new, empty "Master" section.
41+
42+
##### Breaking
43+
44+
##### Enhancements
45+
46+
##### Bug Fixes
47+
48+
* This is a template description
49+
[person responsible](https://github.com/...)
50+
[#xxx](github.com/google/material-scrollview-delegate-multiplexer-ios/issues/xxx)

MDFScrollViewDelegateMultiplexer.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "MDFScrollViewDelegateMultiplexer"
3-
s.version = "2.0.0"
3+
s.version = "2.0.1"
44
s.authors = { 'Chris Cox' => '[email protected]' }
55
s.summary = "A proxy object for UIScrollViewDelegate that forwards all received events to an ordered list of registered observers."
66
s.homepage = "https://github.com/material-foundation/material-scrollview-delegate-multiplexer-ios"

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# MDFScrollViewDelegateMultiplexer
22
[![Build Status](https://travis-ci.org/material-foundation/material-scrollview-delegate-multiplexer-ios.svg?branch=master)](https://travis-ci.org/material-foundation/material-scrollview-delegate-multiplexer-ios)
3+
[![Code Coverage](http://codecov.io/github/material-foundation/material-scrollview-delegate-multiplexer-ios/coverage.svg?branch=master)](http://codecov.io/github/material-foundation/material-scrollview-delegate-multiplexer-ios?branch=master)
34

45
This class acts as a proxy object for `UIScrollViewDelegate` events and forwards all received
56
events to an ordered list of registered observers.

codecov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
coverage:
2+
ignore:
3+
- tests/*
4+
- examples/*

examples/app/ScrollViewDelegateMultiplexerExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,8 @@
473473
isa = XCBuildConfiguration;
474474
buildSettings = {
475475
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
476+
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
477+
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
476478
INFOPLIST_FILE = ScrollViewDelegateMultiplexerExample/Info.plist;
477479
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
478480
PRODUCT_BUNDLE_IDENTIFIER = com.google.ScrollViewDelegateMultiplexerExample;
@@ -484,6 +486,7 @@
484486
isa = XCBuildConfiguration;
485487
buildSettings = {
486488
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
489+
CLANG_ENABLE_CODE_COVERAGE = NO;
487490
INFOPLIST_FILE = ScrollViewDelegateMultiplexerExample/Info.plist;
488491
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
489492
PRODUCT_BUNDLE_IDENTIFIER = com.google.ScrollViewDelegateMultiplexerExample;

examples/app/ScrollViewDelegateMultiplexerExample.xcodeproj/xcshareddata/xcschemes/ScrollViewDelegateMultiplexerExample.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES">
29+
shouldUseLaunchSchemeArgsEnv = "YES"
30+
codeCoverageEnabled = "YES">
3031
<Testables>
3132
<TestableReference
3233
skipped = "NO">

0 commit comments

Comments
 (0)