Merge branch 'release/0.20.2' into develop

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.20.2
+
+* scrollToMark: a generic operation for scrolling to a mark in any
+  UIScrollView #368
+* Scroll to marked operations should descend to depth N #367 @JoeSSS
+
 ### 0.20.1
 
 This release contains no server changes.  The version has been bumped to keep

CONTRIBUTING.md

@@ -1,47 +1,43 @@
 ## Contributing
 
-***All pull requests should be based off the `develop` branch.***
+To avoid duplicates, please search existing issues before reporting a
+new one.
 
-The Calabash iOS Toolchain uses git-flow.
-
-See these links for information about git-flow and git best practices.
-
-Please see this [post](http://chris.beams.io/posts/git-commit/) for tips
-on how to make a good commit messages.
-
-##### Git Flow Step-by-Step guide
-
-* https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
-
-##### Git Best Practices
+Github Issues is intended for reporting bugs and feature suggestions. If
+you have a question or need support, please use [Stack
+Overflow](https://stackoverflow.com/questions/tagged/calabash) or join
+the conversation on [Gitter](https://gitter.im/calabash/calabash0x?utm_source=share-link&utm_medium=link&utm_campaign=share-link).
 
-* http://justinhileman.info/article/changing-history/
+## How to Contribute
 
-##### git-flow command line tool
+The Calabash iOS Toolchain uses git-flow.
 
-We don't use the git-flow tools, but this is useful anyway.
+* All pull requests should be based off the `develop` branch.
+* Contributors should never change the version of the product.
+* Contributors should never commit code signing changes.
 
-* http://danielkummer.github.io/git-flow-cheatsheet/
+### Best Practices
 
-## Start a Feature
+* [Good commit messages](http://chris.beams.io/posts/git-commit/)
+* [Git Flow:  Step-by-Step](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
+* [Git Best Practices](http://justinhileman.info/article/changing-history/)
 
-Start your work on a feature branch based off develop.
+## Etiquette and Code of Conduct
 
-```
-# If you don't already have the develop branch
-$ git fetch origin
-$ git co -t origin/develop
+All contributors must adhere to the [Microsoft Open Source Code of
+Conduct](https://opensource.microsoft.com/codeofconduct/). For more
+information see the [Code of Conduct
+FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact
+opencode@microsoft.com with any additional questions or comments.
 
-# If you already have the develop branch
-$ git co develop
-$ git pull origin develop
-$ git co -b feature/my-new-feature
+## Legal
 
-# Publish your branch and make a pull-request on `develop`
-$ git push -u origin feature/my-new-feature
-```
+Users who wish to contribute will be prompted to sign a Microsoft
+Contributor License Agreement (CLA). A copy of the CLA can be found at
+https://cla.microsoft.com/cladoc/microsoft-contribution-license-agreement.pdf.
 
-**Contributors should not change the version.**
+Please consult the LICENSE file in this project for copyright and
+license details.
 
 ## Testing
 
@@ -52,6 +48,11 @@ $ make xct
 # Building libraries.
 $ make all
 
+# Cucumber
+$ make app-cal
+$ cd cucumber
+$ be cucumber
+
 # Integration tests.
 $ scripts/test/run
 ```
@@ -67,18 +68,14 @@ After the release branch is created:
 
 The release pull request ***must*** be made against the _master_ branch.
 
-Be sure to check CI.
-
-* https://travis-ci.org/calabash/calabash\_ios\_server
-* http://calabash-ci.macminicolo.net:8080/  # Briar jobs.
 
 ```
 $ git co -b release/0.19.2
 
 1. Update the CHANGELOG.md.
 2. Bump the version in calabash/Classes/FranklyServer/Routes/LPVersionRoute.h
 3. **IMPORTANT** Bump the version in the README.md badge.
-3. Have a look at the README.md to see if it can be updated.
+4. Have a look at the README.md to see if it can be updated.
 
 $ git push -u origin release/0.19.2
 

README.md

@@ -1,6 +1,6 @@
 | master  | develop | [versioning](VERSIONING.md) | [license](LICENSE) | [contributing](CONTRIBUTING.md)|
 |---------|---------|-----------------------------|--------------------|--------------------------------|
-|[![Build Status](https://travis-ci.org/calabash/calabash-ios-server.svg?branch=master)](https://travis-ci.org/calabash/calabash-ios-server)| [![Build Status](https://travis-ci.org/calabash/calabash-ios-server.svg?branch=develop)](https://travis-ci.org/calabash/calabash-ios-server)| [![Version](https://img.shields.io/badge/version-0.20.1-green.svg)](https://img.shields.io/badge/version-0.20.1-green.svg) |[![License](https://img.shields.io/badge/licence-Eclipse-blue.svg)](http://opensource.org/licenses/EPL-1.0) | [![Contributing](https://img.shields.io/badge/contrib-gitflow-orange.svg)](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/)|
+|[![Build Status](https://travis-ci.org/calabash/calabash-ios-server.svg?branch=master)](https://travis-ci.org/calabash/calabash-ios-server)| [![Build Status](https://travis-ci.org/calabash/calabash-ios-server.svg?branch=develop)](https://travis-ci.org/calabash/calabash-ios-server)| [![Version](https://img.shields.io/badge/version-0.20.2-green.svg)](https://img.shields.io/badge/version-0.20.2-green.svg) |[![License](https://img.shields.io/badge/licence-Eclipse-blue.svg)](http://opensource.org/licenses/EPL-1.0) | [![Contributing](https://img.shields.io/badge/contrib-gitflow-orange.svg)](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/)|
 
 ## The Calabash iOS Server
 
@@ -68,7 +68,7 @@ See the calabash-ios/calabash-cucumber/Rakefile for more details.
 
 ```
 $ cd path/to/calabash-ios/calabash-cucumber
-$ be rake build\_server
+$ be rake build_server
 ```
 
 ### Testing

calabash/Classes/FranklyServer/Routes/LPVersionRoute.h

@@ -21,7 +21,7 @@
  Do not change the 'CALABASH VERSION' portion of the following constant without
  updating the ruby API.
  ******************/
-#define kLPCALABASHVERSION @"CALABASH VERSION: 0.20.1"
+#define kLPCALABASHVERSION @"CALABASH VERSION: 0.20.2"
 
 @interface LPVersionRoute : NSObject <LPRoute>