Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/3.0.1 #698

Merged
merged 7 commits into from
Sep 18, 2018
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Force Xcode environment
language: objective-c

osx_image: xcode9
osx_image: xcode10

before_script:
- scripts/ci/travis/instruments-auth.sh
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
## Change Log

### 3.0.1

* Core: default simulator for Xcode 10 is iPhone 10S #696

#### DeviceAgent 1.3.1

https://github.com/calabash/DeviceAgent.iOS/releases/tag/1.3.1

* Add new iPhone 10S, 10S Max, and 10R model numbers #296
* Server: add speech recognition alert texts #293
* Server: add new localizations for SB alerts #294

#### iOSDeviceManager 3.2.1

https://github.com/calabash/iOSDeviceManager/releases/tag/3.2.1

* Upload xctestconfig command requires file paths #320
* Frameworks: update FBSimControl related frameworks with new ios 12
device models #231

### 3.0.0

Built with Xcode 10 beta 6
Expand Down
19 changes: 5 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,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/run_loop
* http://ci.endoftheworl.de:8080/ # Briar jobs.

```
$ git co -b release/1.5.0
$ git co -b release/3.0.1

1. Update the CHANGELOG.
2. Bump the RunLoop::VERSION
3. Have a look at the README.md to see if it can be updated.
3. Review the README.md for content that can be updated.

$ git push -u origin release/1.5.0
$ git push -u origin release/3.0.1

**IMPORTANT**
1. Make a pull request on GitHub on the master branch.
Expand All @@ -77,15 +72,11 @@ $ git pull
$ gem update --system
$ rake release

$ git tag -a 1.5.0 -m"release/1.5.0"
$ git push origin 1.5.0

$ git co develop
$ git merge --no-ff release/1.5.0
$ git merge --no-ff release/3.0.1
$ git push

$ git branch -d release/1.5.0
$ git branch -d release/3.0.1

Announce the release on the public channels.
```

20 changes: 11 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@

### Requirements

* Xcode 7.
* ruby >= 2.0
* at least Xcode 9.4.1
* ruby 2.3.*; ruby > 2.3 is not supported.

The most recent versions of Xcode and ruby are strongly recommended.
The most recent version of Xcode is strong recommended.

### License

Expand Down Expand Up @@ -99,20 +99,22 @@ $ be rake integration
If you have alternative Xcode installs that look like this:

```
/Xcode/5.1/Xcode.app
/Xcode/5.1.1/Xcode.app
/Xcode/6.1.1/Xcode.app
/Xcode/6.2/Xcode-Beta.app
/Xcode/6.3/Xcode-Beta.app
/Xcode/9.4.1/Xcode.app
/Xcode/10.0/Xcode.app
/Xcode/10.1/Xcode.app
/Xcode/10.2/Xcode-Beta.app
```

the rspec tests will do regression testing against each version.

##### Guard

Requires MacOS Growl - available in the AppStore.
Guard requires terminal-notifier-guard

https://github.com/Codaisseur/terminal-notifier-guard

```
$ brew install terminal-notifier-guard
$ be guard
```

Expand Down
5 changes: 2 additions & 3 deletions lib/run_loop/core.rb
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,8 @@ def self.default_simulator(xcode=RunLoop::Xcode.new)
major = xcode_major + 2
minor = xcode_minor

# Early major Xcode beta releases do not have new hardware model numbers
if xcode.beta? && xcode_major == 10
model = xcode_major - 2
if xcode_major == 10
model = "XS"
else
model = xcode_major - 1
end
Expand Down
Binary file modified lib/run_loop/device_agent/Frameworks.zip
Binary file not shown.
Binary file modified lib/run_loop/device_agent/app/DeviceAgent-Runner.app.zip
Binary file not shown.
Binary file modified lib/run_loop/device_agent/bin/iOSDeviceManager
Binary file not shown.
Binary file modified lib/run_loop/device_agent/ipa/DeviceAgent-Runner.app.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/run_loop/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module RunLoop
VERSION = "3.0.0"
VERSION = "3.0.1"

# A model of a software release version that can be used to compare two versions.
#
Expand Down