Merge pull request #297 from calabash/release/1.3.1

Release/1.3.1

AppStub/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>1.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.3.1
+
+* Add new iPhone 10S, 10S Max, and 10R model numbers #296
+
 ### 1.3.0
 
 * Server: add speech recognition alert texts #293

CONTRIBUTING.md

@@ -39,3 +39,50 @@ https://cla.microsoft.com/cladoc/microsoft-contribution-license-agreement.pdf.
 Please consult the LICENSE file in this project for copyright and
 license details.
 
+## Releasing
+
+After the release branch is created:
+
+* No more features can be added.
+* All in-progress features and un-merged pull-requests must wait for the next release.
+* You can, and should, make changes to the documentation.
+
+The release pull request ***must*** be made against the _master_ branch.
+
+```
+$ git co -b release/1.3.2
+
+1. Update the CHANGELOG.md.
+2. **IMPORTANT** Bump the version in AppStub/Info.plist
+3. **IMPORTANT** Bump the version in the README.md badges.
+4. Review the README.md and update content as necessary.
+
+$ git push -u origin release/1.3.2
+
+**IMPORTANT**
+
+1. Make a pull request on GitHub on the master branch.
+2. Wait for CI to finish.
+3. Merge pull request.
+
+$ git co master
+$ git pull
+$ bin/git-tag.sh
+
+$ git co develop
+$ git merge --no-ff release/1.3.2
+$ git push
+
+$ git branch -d release/1.3.2
+
+Announce the release on the public channels.
+```
+
+## Deploying to Test Cloud
+
+Maintainers will be given a script to publish DeviceAgent-Runner.ipa to
+S3.
+
+```
+$ bin/s3-publish.sh {release | adhoc}
+```

Jenkinsfile

@@ -73,7 +73,7 @@ pipeline {
         stage('unit + cucumber') {
           steps {
             sh 'gtimeout --foreground --signal SIGKILL 60m make unit-tests'
-            sh 'bundle exec bin/ci/cucumber.rb'
+            sh 'gtimeout --foreground --signal SIGKILL 60m bin/ci/cucumber.rb'
           }
         }
         stage('appcenter') {

LICENSE

@@ -1,7 +1,6 @@
-DeviceAgent.iOS software
-Copyright (c) Microsoft Corporation
-All rights reserved.
+The MIT License (MIT)
 
+Copyright (c) Microsoft Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,13 +1,13 @@
 | develop | [versioning](VERSIONING.md) | [license](LICENSE) | [contributing](CONTRIBUTING.md)|
-|---------|---------|-----------------------------|--------------------|--------------------------------|
-|[![Build Status](https://calabash-ci.xyz/buildStatus/icon?job=DeviceAgent.iOS/develop)](https://calabash-ci.xyz/job/DeviceAgent.iOS/develop) | [![Version](https://img.shields.io/badge/version-1.3.0-green.svg)](https://img.shields.io/badge/version-1.3.0-green.svg) |[![License](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](LICENSE) | [![Contributing](https://img.shields.io/badge/contrib-gitflow-orange.svg)](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/)|
+|---------|-----------------------------|--------------------|--------------------------------|
+|[![Build Status](https://calabash-ci.xyz/buildStatus/icon?job=DeviceAgent.iOS/develop)](https://calabash-ci.xyz/job/DeviceAgent.iOS/develop) | [![Version](https://img.shields.io/badge/version-1.3.1-green.svg)](https://img.shields.io/badge/version-1.3.1-green.svg) |[![License](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](LICENSE) | [![Contributing](https://img.shields.io/badge/contrib-gitflow-orange.svg)](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow/)|
 
 ## DeviceAgent.iOS
 
 ### Requirements
 
 * Xcode >= 9.4.1
-* ruby 2.3.x - ruby > 2.4 is not supported.
+* ruby 2.3.x.  ruby > 2.4 is not supported.
 
 ### Code Signing
 
@@ -64,7 +64,7 @@ $ be cucumber
 To build with an alternative Xcode:
 
 ```
-$ DEVELOPER_DIR=/Xcode/10.0/Xcode-beta.app make < rule >
+$ DEVELOPER_DIR=/Xcode/10.1/Xcode-beta.app/Contents/Developer make < rule >
 ```
 
 If you have build errors, see the xcpretty section below.

Server/Utilities/CBXDevice.m

@@ -244,14 +244,19 @@ - (NSDictionary *)formFactorMap {
       @"iPhone9,2" : @"iphone 6+",
       @"iPhone9,4" : @"iphone 6+",
 
-      // iPhone 8/8+/X - derived from Simulator
+      // iPhone 8/8+/X
       @"iPhone10,1" : @"iphone 6",
       @"iPhone10,4" : @"iphone 6",
       @"iPhone10,5" : @"iphone 6+",
       @"iPhone10,2" : @"iphone 6+",
       @"iPhone10,3" : @"iphone 10",
       @"iPhone10,6" : @"iphone 10",
 
+      // iPhone XS/XS Max/XR - derived from Simulator
+      @"iPhone11,2" : @"iphone 10",
+      @"iPhone11,4" : @"iphone 10s max",
+      @"iPhone11,8" : @"iphone 10r",
+
       // iPad Pro 13in
       @"iPad6,7" : @"ipad pro",
       @"iPad6,8" : @"ipad pro",

VERSIONING.md

@@ -1,16 +1,5 @@
 ## Versioning
 
-Calabash tries very hard to comply with Semantic Versioning [1] rules.
-
-However, the semantic versioning spec is incompatible with RubyGem's patterns for pre-release gems.
-
-> "But returning to the practical: No release version of SemVer is compatible with Rubygems." - _David Kellum_ [2]
-
-Calabash version numbers will be in this form:
-
-```
-<major>.<minor>.<patch>[.pre<N>]
-```
+This project uses Semantic Versioning [1] rules.
 
 - [1] http://semver.org/
-- [2] http://gravitext.com/2012/07/22/versioning.html

bin/ci/cucumber.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
-require "luffa"
-require "bundler"
-
 this_dir = File.expand_path(File.dirname(__FILE__))
 working_directory = File.expand_path(File.join(this_dir, "..", "..", "cucumber"))
 
+require "bundler"
+
 Bundler.with_clean_env do
   Dir.chdir(working_directory) do
 
@@ -53,6 +52,6 @@
 
 
     RunLoop.log_unix_cmd(args.join(" "))
-    system(env, *args)
+    Process.exec(env, *args)
   end
 end