Skip to content

Commit

Permalink
Merge pull request #186 from calabash/release/2.1.0
Browse files Browse the repository at this point in the history
Release/2.1.0
  • Loading branch information
jmoody committed Sep 20, 2017
2 parents a15a3c3 + 700c952 commit 0c54f5d
Show file tree
Hide file tree
Showing 64 changed files with 676 additions and 419 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### 2.1.0

Supports Xcode 9 GM.

Advancing the version to create a tag from which we can release
binaries built with Xcode 9 GM.

### 2.0.2

Really supports Xcode 9 beta 6.
Expand Down
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "erikdoe/ocmock" "e3151419df63a715764bab7dd4f09bc1831db532"
github "specta/expecta" "7c048e9af9c50cf8782e55abf57a9f4a48d8db1a"
github "specta/expecta" "7f270dd634f0bade3a2d9fb4faf4f17cd5e70e18"
github "specta/specta" "7aafaf73e95565585bb0738c450945d63a3c8a98"

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Frameworks/FBControlCore.framework/Versions/A/FBControlCore
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@ extern FBDeviceModel const FBDeviceModeliPhone6SPlus;
extern FBDeviceModel const FBDeviceModeliPhoneSE;
extern FBDeviceModel const FBDeviceModeliPhone7;
extern FBDeviceModel const FBDeviceModeliPhone7Plus;
extern FBDeviceModel const FBDeviceModeliPhone8;
extern FBDeviceModel const FBDeviceModeliPhone8Plus;
extern FBDeviceModel const FBDeviceModeliPhoneX;
extern FBDeviceModel const FBDeviceModeliPad2;
extern FBDeviceModel const FBDeviceModeliPadRetina;
extern FBDeviceModel const FBDeviceModeliPadAir;
extern FBDeviceModel const FBDeviceModeliPadAir2;
extern FBDeviceModel const FBDeviceModeliPadPro;
extern FBDeviceModel const FBDeviceModeliPadPro_9_7_Inch;
extern FBDeviceModel const FBDeviceModeliPadPro_10_5_Inch;
extern FBDeviceModel const FBDeviceModeliPadPro_12_9_Inch;
extern FBDeviceModel const FBDeviceModelAppleTV1080p;
extern FBDeviceModel const FBDeviceModelAppleWatch38mm;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0900</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013 Facebook, Inc. All rights reserved.</string>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
tBigY/f/6K29OHG5BuK66xwLsEg=
aN9Xr6cGKWH8Xe90K+ozAeShQQg=
</data>
</dict>
<key>files2</key>
Expand Down Expand Up @@ -255,11 +255,11 @@
<dict>
<key>hash</key>
<data>
j7Ml2jJRSyCWtTtgzT3PjGlcuI4=
oKJxkGtlxfCei3ydEmpgdJHk5ow=
</data>
<key>hash2</key>
<data>
XTbt9UH8Stv00yMqibtvMXYyYzVU8585SaJFxNC+iGk=
V6u8DbOaPkZfKw4dNHmhWB+ZUAtGkgS72pBJxI5LipA=
</data>
</dict>
<key>Headers/FBControlCoreError.h</key>
Expand Down Expand Up @@ -937,11 +937,11 @@
<dict>
<key>hash</key>
<data>
tBigY/f/6K29OHG5BuK66xwLsEg=
aN9Xr6cGKWH8Xe90K+ozAeShQQg=
</data>
<key>hash2</key>
<data>
wDn/+Rhlj1s1RYftdxcJZng6C9cSBprNYuBkMpupA8M=
1Vn02sNY6XC/0MuIF6qOD3e0+3hBz9vZe7KmO8Qwu0I=
</data>
</dict>
</dict>
Expand Down
Binary file modified Frameworks/FBDeviceControl.framework/Versions/A/FBDeviceControl
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0900</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013 Facebook, Inc. All rights reserved.</string>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
tBigY/f/6K29OHG5BuK66xwLsEg=
aN9Xr6cGKWH8Xe90K+ozAeShQQg=
</data>
</dict>
<key>files2</key>
Expand Down Expand Up @@ -255,11 +255,11 @@
<dict>
<key>hash</key>
<data>
j7Ml2jJRSyCWtTtgzT3PjGlcuI4=
oKJxkGtlxfCei3ydEmpgdJHk5ow=
</data>
<key>hash2</key>
<data>
XTbt9UH8Stv00yMqibtvMXYyYzVU8585SaJFxNC+iGk=
V6u8DbOaPkZfKw4dNHmhWB+ZUAtGkgS72pBJxI5LipA=
</data>
</dict>
<key>Headers/FBControlCoreError.h</key>
Expand Down Expand Up @@ -937,11 +937,11 @@
<dict>
<key>hash</key>
<data>
tBigY/f/6K29OHG5BuK66xwLsEg=
aN9Xr6cGKWH8Xe90K+ozAeShQQg=
</data>
<key>hash2</key>
<data>
wDn/+Rhlj1s1RYftdxcJZng6C9cSBprNYuBkMpupA8M=
1Vn02sNY6XC/0MuIF6qOD3e0+3hBz9vZe7KmO8Qwu0I=
</data>
</dict>
</dict>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0900</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013 Facebook, Inc. All rights reserved.</string>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
tBigY/f/6K29OHG5BuK66xwLsEg=
aN9Xr6cGKWH8Xe90K+ozAeShQQg=
</data>
</dict>
<key>files2</key>
Expand Down Expand Up @@ -255,11 +255,11 @@
<dict>
<key>hash</key>
<data>
j7Ml2jJRSyCWtTtgzT3PjGlcuI4=
oKJxkGtlxfCei3ydEmpgdJHk5ow=
</data>
<key>hash2</key>
<data>
XTbt9UH8Stv00yMqibtvMXYyYzVU8585SaJFxNC+iGk=
V6u8DbOaPkZfKw4dNHmhWB+ZUAtGkgS72pBJxI5LipA=
</data>
</dict>
<key>Headers/FBControlCoreError.h</key>
Expand Down Expand Up @@ -937,11 +937,11 @@
<dict>
<key>hash</key>
<data>
tBigY/f/6K29OHG5BuK66xwLsEg=
aN9Xr6cGKWH8Xe90K+ozAeShQQg=
</data>
<key>hash2</key>
<data>
wDn/+Rhlj1s1RYftdxcJZng6C9cSBprNYuBkMpupA8M=
1Vn02sNY6XC/0MuIF6qOD3e0+3hBz9vZe7KmO8Qwu0I=
</data>
</dict>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0900</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013 Facebook, Inc. All rights reserved.</string>
</dict>
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
OUv2BiiNITCA67/7JaXfci/zGno=
aPeigowHeIeBM3YkDNoPfx3re0c=
</data>
<key>Resources/libMaculator.dylib</key>
<data>
Expand All @@ -32,7 +32,7 @@
<dict>
<key>cdhash</key>
<data>
AQeP6KwioGy5RPTwPX2scjD71Tw=
mHuWucFYimxBNHNgx/OJLGb4BYI=
</data>
<key>requirement</key>
<string>identifier "com.facebook.FBControlCore" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Karl Krukow (YTTN6Y2QS9)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
Expand Down Expand Up @@ -536,11 +536,11 @@
<dict>
<key>hash</key>
<data>
OUv2BiiNITCA67/7JaXfci/zGno=
aPeigowHeIeBM3YkDNoPfx3re0c=
</data>
<key>hash2</key>
<data>
4HteKPfpmwWlcCfNNGRCrX7ChQk0PIh1QEH8mbXK+wk=
i7kcrHLWoVbDFqNgkP1Y2E9ZKjsZNS/3kvBsxaEuKN4=
</data>
</dict>
<key>Resources/libMaculator.dylib</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0900</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013 Facebook, Inc. All rights reserved.</string>
</dict>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
OO6aGuHZFV2Ff14yjtpWSx/khEY=
z/rc8jJwo3edDKeawMju07eQDrE=
</data>
<key>Resources/libShimulator.dylib</key>
<data>
Expand All @@ -28,7 +28,7 @@
<dict>
<key>cdhash</key>
<data>
AQeP6KwioGy5RPTwPX2scjD71Tw=
mHuWucFYimxBNHNgx/OJLGb4BYI=
</data>
<key>requirement</key>
<string>identifier "com.facebook.FBControlCore" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Karl Krukow (YTTN6Y2QS9)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
Expand All @@ -37,7 +37,7 @@
<dict>
<key>cdhash</key>
<data>
8m+EcYOHBI/7keQAocM8wtjFynw=
thsGN06+42bl3Q94Vao+NMQMmfs=
</data>
<key>requirement</key>
<string>identifier "com.facebook.XCTestBootstrap" and anchor apple generic and certificate leaf[subject.CN] = "Mac Developer: Karl Krukow (YTTN6Y2QS9)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
Expand Down Expand Up @@ -189,11 +189,11 @@
<dict>
<key>hash</key>
<data>
OO6aGuHZFV2Ff14yjtpWSx/khEY=
z/rc8jJwo3edDKeawMju07eQDrE=
</data>
<key>hash2</key>
<data>
R98N9ulJOXBBkvnazhL3ywvb4GwK1j8kimOpJwkwsR0=
2/ur6pMS5Z6i7kTR2K3swZBLjFE7Ad1N6kw+sfQ06PI=
</data>
</dict>
<key>Resources/libShimulator.dylib</key>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>16E185</string>
<string>17A360</string>
<key>DTSDKName</key>
<string>macosx10.12</string>
<string>macosx10.13</string>
<key>DTXcode</key>
<string>0833</string>
<string>0900</string>
<key>DTXcodeBuild</key>
<string>8E3004b</string>
<string>9A235</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2013 Facebook, Inc. All rights reserved.</string>
</dict>
Expand Down
Loading

0 comments on commit 0c54f5d

Please sign in to comment.